--- a/python/test/unit/la/test_vector.py +++ b/python/test/unit/la/test_vector.py @@ -22,6 +22,7 @@ import pytest import numpy from copy import copy +from ctypes import c_long from dolfin import * from dolfin_utils.test import * @@ -398,17 +399,21 @@ xfail_type = pytest.mark.xfail(strict=True, raises=TypeError) xfail_type_py3 = pytest.mark.xfail(strict=True, raises=TypeError) - + # some systems (32 bit arches) do not have numpy.float128 + try: + test_float128 = numpy.float128(42.0) + except AttributeError: + test_float128 = numpy.longdouble(42.0) @pytest.mark.parametrize("operand", - [int(42), 42.0, numpy.sin(1.0), numpy.float(42.0), - numpy.float64(42.0), numpy.float_(42.0), - numpy.int(42.0), numpy.long(42.0), + [int(42), 42.0, numpy.sin(1.0), float(42.0), + numpy.float64(42.0), + int(42.0), c_long(42).value, numpy.float16(42.0), numpy.float16(42.0), - numpy.float32(42.0), numpy.float128(42.0), - numpy.longfloat(42.0), numpy.int8(42.0), + numpy.float32(42.0), test_float128, + numpy.longdouble(42.0), numpy.int8(42.0), numpy.int16(42.0), numpy.int32(42.0), numpy.intc(42.0), numpy.longdouble(42.0), - numpy.int0(42.0), numpy.int64(42.0), + numpy.intp(42.0), numpy.int64(42.0), numpy.int_(42.0), numpy.longlong(42.0), ]) def test_vector_type_priority_with_numpy(self, any_backend, operand): --- a/python/test/unit/la/test_la_basic.py +++ b/python/test/unit/la/test_la_basic.py @@ -89,8 +89,8 @@ def test_vector(self, any_backend): self.backend, self.sub_backend = any_backend from numpy import ndarray, linspace, array, fromiter - from numpy import int,int0,int16,int32,int64 - from numpy import uint,uint0,uint16,uint32,uint64 + from numpy import intp,int16,int32,int64 + from numpy import uint,uintp,uint16,uint32,uint64 mesh = UnitSquareMesh(3, 3) v, w = assemble_vectors(mesh) @@ -102,8 +102,8 @@ # Test set and access with different integers lind = 2 - for T in [int,int16,int32,int64,uint,uint0,uint16,uint32,uint64,\ - int0]: + for T in [int,int16,int32,int64,uint,uintp,uint16,uint32,uint64,\ + intp]: v[T(lind)] = 2.0 assert round(v[T(lind)] - 2.0, 7) == 0 --- a/python/test/unit/function/test_expression.py +++ b/python/test/unit/function/test_expression.py @@ -22,7 +22,7 @@ import pytest from dolfin import * from math import sin, cos, exp, tan -from numpy import array, zeros, float_ +from numpy import array, zeros import numpy as np from dolfin_utils.test import fixture, skip_in_parallel