FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Fixup testing 0.10.9 · freephys/xtensor-python@bbaa902 · GitHub

  1. freephys
  2. xtensor-python

Repository navigation

Commit bbaa902

Browse files
SylvainCorlay
committed
Fixup testing 0.10.9
1 parent 9ed2bfd commit bbaa902

4 files changed

Lines changed: 14 additions & 14 deletions

File tree

‎.appveyor.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ install:
2323
- conda update -q conda
2424
- conda info -a
2525
- conda install gtest cmake -c conda-forge
26-
- conda install xtensor==0.10.2 pytest numpy pybind11==2.1.1 -c conda-forge
26+
- conda install xtensor==0.10.9 pytest numpy pybind11==2.1.1 -c conda-forge
2727
- "set PYTHONHOME=%MINICONDA%"
2828
- cmake -G "NMake Makefiles" -D CMAKE_INSTALL_PREFIX=%MINICONDA%\\Library -D BUILD_TESTS=ON -D PYTHON_EXECUTABLE=%MINICONDA%\\python.exe .
2929
- nmake test_xtensor_python

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ install:
9494
- conda update -q conda
9595
# Useful for debugging any issues with conda
9696
- conda info -a
97-
- conda install xtensor==0.10.2 pytest numpy pybind11==2.1.1 -c conda-forge
97+
- conda install xtensor==0.10.9 pytest numpy pybind11==2.1.1 -c conda-forge
9898
- conda install cmake gtest -c conda-forge
9999
- cmake -D BUILD_TESTS=ON -D CMAKE_INSTALL_PREFIX=$HOME/miniconda .
100100
- make -j2 test_xtensor_python

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ from the `docs` subdirectory.
189189

190190
| `xtensor-python` | `xtensor` | `pybind11` |
191191
|-------------------|------------|-------------|
192-
| master | ^0.10.2 | ^2.1.0 |
192+
| master | ^0.10.9 | ^2.1.0 |
193193
| 0.12.x | ^0.10.2 | ^2.1.0 |
194194
| 0.11.x | ^0.10.0 | ^2.1.0 |
195195
| 0.10.x | ^0.9.0 | ^2.1.0 |

‎test/test_common.hpp‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ namespace xt
318318
vec.reshape(rm.m_shape, layout_type::row_major);
319319
assign_array(vec, rm.m_assigner);
320320
EXPECT_TRUE(std::equal(vec.data().cbegin(), vec.data().cend(), rm.m_data.cbegin()));
321-
EXPECT_EQ(vec(2, 1, 0), vec(2, 1));
321+
EXPECT_EQ(vec(0, 1, 1), vec(1, 1));
322322
EXPECT_EQ(vec(2, 1, 3), vec(2, 2, 2, 1, 3));
323323
test_bound_check(vec);
324324
}
@@ -329,7 +329,7 @@ namespace xt
329329
vec.reshape(cm.m_shape, layout_type::column_major);
330330
assign_array(vec, cm.m_assigner);
331331
EXPECT_TRUE(std::equal(vec.data().cbegin(), vec.data().cend(), cm.m_data.cbegin()));
332-
EXPECT_EQ(vec(2, 1, 0), vec(2, 1));
332+
EXPECT_EQ(vec(0, 1, 1), vec(1, 1));
333333
EXPECT_EQ(vec(2, 1, 3), vec(2, 2, 2, 1, 3));
334334
test_bound_check(vec);
335335
}
@@ -340,7 +340,7 @@ namespace xt
340340
vec.reshape(cem.m_shape, cem.m_strides);
341341
assign_array(vec, cem.m_assigner);
342342
EXPECT_TRUE(std::equal(vec.data().cbegin(), vec.data().cend(), cem.m_data.cbegin()));
343-
EXPECT_EQ(vec(2, 1, 0), vec(2, 1));
343+
EXPECT_EQ(vec(0, 1, 1), vec(1, 1));
344344
EXPECT_EQ(vec(2, 1, 3), vec(2, 2, 2, 1, 3));
345345
test_bound_check(vec);
346346
}
@@ -351,7 +351,7 @@ namespace xt
351351
vec.reshape(usr.m_shape, layout_type::row_major);
352352
assign_array(vec, usr.m_assigner);
353353
EXPECT_TRUE(std::equal(vec.data().cbegin(), vec.data().cend(), usr.m_data.cbegin()));
354-
EXPECT_EQ(vec(2, 0, 0), vec(2, 0));
354+
EXPECT_EQ(vec(0, 1, 0), vec(1, 0));
355355
EXPECT_EQ(vec(2, 0, 3), vec(2, 2, 2, 0, 3));
356356
test_bound_check(vec);
357357
}
@@ -379,15 +379,15 @@ namespace xt
379379
template <class V, class C = std::vector<std::size_t>>
380380
void test_indexed_access(V& vec)
381381
{
382-
xindex index1 = { 2, 1 };
383-
xindex index2 = { 2, 2, 2, 1, 3};
382+
xindex index1 = {1, 1};
383+
xindex index2 = {2, 2, 2, 1, 3};
384384
{
385385
SCOPED_TRACE("row_major access");
386386
row_major_result<C> rm;
387387
vec.reshape(rm.m_shape, layout_type::row_major);
388388
indexed_assign_array(vec, rm.m_assigner);
389389
EXPECT_TRUE(std::equal(vec.data().cbegin(), vec.data().cend(), rm.m_data.cbegin()));
390-
EXPECT_EQ(vec(2, 1, 0), vec[index1]);
390+
EXPECT_EQ(vec(0, 1, 1), vec[index1]);
391391
EXPECT_EQ(vec(2, 1, 3), vec[index2]);
392392
}
393393

@@ -397,7 +397,7 @@ namespace xt
397397
vec.reshape(cm.m_shape, layout_type::column_major);
398398
indexed_assign_array(vec, cm.m_assigner);
399399
EXPECT_TRUE(std::equal(vec.data().cbegin(), vec.data().cend(), cm.m_data.cbegin()));
400-
EXPECT_EQ(vec(2, 1, 0), vec[index1]);
400+
EXPECT_EQ(vec(0, 1, 1), vec[index1]);
401401
EXPECT_EQ(vec(2, 1, 3), vec[index2]);
402402
}
403403

@@ -407,7 +407,7 @@ namespace xt
407407
vec.reshape(cem.m_shape, cem.m_strides);
408408
indexed_assign_array(vec, cem.m_assigner);
409409
EXPECT_TRUE(std::equal(vec.data().cbegin(), vec.data().cend(), cem.m_data.cbegin()));
410-
EXPECT_EQ(vec(2, 1, 0), vec[index1]);
410+
EXPECT_EQ(vec(0, 1, 1), vec[index1]);
411411
EXPECT_EQ(vec(2, 1, 3), vec[index2]);
412412
}
413413

@@ -417,9 +417,9 @@ namespace xt
417417
vec.reshape(usr.m_shape, layout_type::row_major);
418418
indexed_assign_array(vec, usr.m_assigner);
419419
EXPECT_TRUE(std::equal(vec.data().cbegin(), vec.data().cend(), usr.m_data.cbegin()));
420-
xindex id1 = { 2, 0 };
420+
xindex id1 = { 1, 0 };
421421
xindex id2 = { 2, 2, 2, 0, 3 };
422-
EXPECT_EQ(vec(2, 0, 0), vec[id1]);
422+
EXPECT_EQ(vec(0, 1, 0), vec[id1]);
423423
EXPECT_EQ(vec(2, 0, 3), vec[id2]);
424424
}
425425
}

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL