Skip to content

Commit 2f67236

Browse files
committed
test: fix user_type for Windows
1 parent aed3cef commit 2f67236

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

unittest/python/test_user_type.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,21 @@
66
cols = 20
77

88
def test(dtype):
9-
mat = np.ones((rows,cols),dtype=dtype)
9+
mat = np.array(np.ones((rows,cols)).astype(np.intc),dtype=dtype)
1010
mat = np.random.rand(rows,cols).astype(dtype)
1111
mat_copy = mat.copy()
1212
assert (mat == mat_copy).all()
1313
assert not (mat != mat_copy).all()
1414

15-
# if version.parse(np.__version__) >= version.parse("1.21.0"): # check if it fixes for new versio of NumPy
15+
# if version.parse(np.__version__) >= version.parse("1.21.0"): # check if it fixes for new versio of NumPy
1616
# mat.fill(mat.dtype.type(20.))
1717
# mat_copy = mat.copy()
1818
# assert((mat == mat_copy).all())
1919
# assert(not (mat != mat_copy).all())
2020

2121
mat_op = mat + mat
2222
mat_op = mat.copy(order='F') + mat.copy(order='C')
23-
23+
2424
mat_op = mat - mat
2525
mat_op = mat * mat
2626
mat_op = mat.dot(mat.T)
@@ -45,7 +45,7 @@ def test_cast(from_dtype,to_dtype):
4545

4646
from_mat = np.zeros((rows,cols),dtype=from_dtype)
4747
to_mat = from_mat.astype(dtype=to_dtype)
48-
48+
4949
test(user_type.CustomDouble)
5050

5151
test_cast(user_type.CustomDouble,np.double)

unittest/user_type.cpp

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -198,12 +198,14 @@ BOOST_PYTHON_MODULE(user_type)
198198
eigenpy::registerCast<double,DoubleType>(true);
199199
eigenpy::registerCast<DoubleType,int32_t>(false);
200200
eigenpy::registerCast<int32_t,DoubleType>(true);
201-
eigenpy::registerCast<DoubleType,int64_t>(false);
202-
eigenpy::registerCast<int64_t,DoubleType>(true);
201+
eigenpy::registerCast<DoubleType,long long>(false);
202+
eigenpy::registerCast<long long,DoubleType>(true);
203203
eigenpy::registerCast<FloatType,double>(true);
204204
eigenpy::registerCast<double,FloatType>(false);
205-
eigenpy::registerCast<FloatType,int64_t>(false);
206-
eigenpy::registerCast<int64_t,FloatType>(true);
205+
eigenpy::registerCast<FloatType,long long>(false);
206+
eigenpy::registerCast<long long,FloatType>(true);
207+
eigenpy::registerCast<FloatType,int32_t>(false);
208+
eigenpy::registerCast<int32_t,FloatType>(true);
207209

208210
bp::implicitly_convertible<double,DoubleType>();
209211
bp::implicitly_convertible<DoubleType,double>();

0 commit comments

Comments
 (0)