fix missing dependency

xadupre · xadupre · commit cdfceb2742ae · 2024-08-30T16:20:29.000+02:00
diff --git a/_unittests/ut_array_api/test_hypothesis_array_api.py b/_unittests/ut_array_api/test_hypothesis_array_api.py
@@ -2,6 +2,7 @@
 import warnings
 from os import getenv
 from functools import reduce
+import packaging.version as pv
 import numpy as np
 from operator import mul
 from hypothesis import given
@@ -44,9 +45,12 @@ class TestHypothesisArraysApis(ExtTestCase):
 
     @classmethod
     def setUpClass(cls):
-        with warnings.catch_warnings():
-            warnings.simplefilter("ignore")
-            from numpy import array_api as xp
+        try:
+            import array_api_strict as xp
+        except ImportError:
+            with warnings.catch_warnings():
+                warnings.simplefilter("ignore")
+                from numpy import array_api as xp
 
         api_version = getenv(
             "ARRAY_API_TESTS_VERSION",
@@ -63,6 +67,9 @@ def test_strategies(self):
         self.assertNotEmpty(self.xps)
         self.assertNotEmpty(self.onxps)
 
+    @unittest.skipIf(
+        pv.Version(np.__version__) >= pv.Version("2.0"), reason="abandonned"
+    )
     def test_scalar_strategies(self):
         dtypes = dict(
             integer_dtypes=self.xps.integer_dtypes(),
@@ -139,6 +146,9 @@ def fctonx(x, kw):
         fctonx()
         self.assertEqual(len(args_onxp), len(args_np))
 
+    @unittest.skipIf(
+        pv.Version(np.__version__) >= pv.Version("2.0"), reason="abandonned"
+    )
     def test_square_sizes_strategies(self):
         dtypes = dict(
             integer_dtypes=self.xps.integer_dtypes(),
diff --git a/_unittests/ut_plotting/test_text_plot.py b/_unittests/ut_plotting/test_text_plot.py
@@ -94,6 +94,7 @@ def test_onnx_text_plot_tree_cls_2(self):
                +f 0:1 1:0 2:0
         """
         ).strip(" \n\r")
+        res = res.replace("np.float32(", "").replace(")", "")
         self.assertEqual(expected, res.strip(" \n\r"))
 
     @ignore_warnings((UserWarning, FutureWarning))
diff --git a/_unittests/ut_translate_api/test_translate_classic.py b/_unittests/ut_translate_api/test_translate_classic.py
@@ -221,12 +221,8 @@ def test_topk_reverse(self):
                     sorted=1
                 )
             )
-            outputs.append(
-                make_tensor_value_info('Values', TensorProto.FLOAT, shape=[])
-            )
-            outputs.append(
-                make_tensor_value_info('Indices', TensorProto.FLOAT, shape=[])
-            )
+            outputs.append(make_tensor_value_info('Values', TensorProto.FLOAT, shape=[]))
+            outputs.append(make_tensor_value_info('Indices', TensorProto.FLOAT, shape=[]))
             graph = make_graph(
                 nodes,
                 'light_api',
diff --git a/onnx_array_api/array_api/_onnx_common.py b/onnx_array_api/array_api/_onnx_common.py
@@ -4,11 +4,14 @@
 from onnx import TensorProto
 
 try:
+    import array_api_strict
+
+    Array = type(array_api_strict.ones((1,)))
+except ImportError:
     with warnings.catch_warnings():
         warnings.simplefilter("ignore")
         from numpy.array_api._array_object import Array
-except ImportError:
-    Array = None
+
 from ..npx.npx_types import (
     DType,
     ElemType,
diff --git a/pyproject.toml b/pyproject.toml
@@ -59,4 +59,5 @@ select = [
 "onnx_array_api/profiling.py" = ["E731"]
 "onnx_array_api/reference/__init__.py" = ["F401"]
 "_unittests/ut_npx/test_npx.py" = ["F821"]
+"_unittests/ut_translate_api/test_translate_classic.py" = ["E501"]
 
diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,5 @@
 array_api_compat
+array_api_strict
 numpy
 onnx>=1.15.0
 scipy
