Fix python test, fix mkl download URL typo, restrict numpy to v1.x

isl-org · Jul 9, 2024 · 9a50aff · 9a50aff
1 parent 8b2bbc5
commit 9a50aff
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/3rdparty/mkl/mkl.cmake b/3rdparty/mkl/mkl.cmake
@@ -7,12 +7,13 @@
 #
 # The name "STATIC" is used to avoid naming collisions for other 3rdparty CMake
 # files (e.g. PyTorch) that also depends on MKL.
+# FIXME: anaconda.org URLs don't work anymore.
 
 include(ExternalProject)
 
 if(WIN32)
     set(MKL_INCLUDE_URL
-        https://github.com/isl-org/Open3D/releases/download/v0.12.0/mkl-include-2020.1-intel_216-win-64.tar.bz2W
+        https://github.com/isl-org/Open3D/releases/download/v0.12.0/mkl-include-2020.1-intel_216-win-64.tar.bz2
         https://anaconda.org/intel/mkl-include/2020.1/download/win-64/mkl-include-2020.1-intel_216.tar.bz2
     )
     set(MKL_INCLUDE_SHA256 65cedb770358721fd834224cd8be1fe1cc10b37ef2a1efcc899fc2fefbeb5b31)

diff --git a/python/requirements.txt b/python/requirements.txt
@@ -1,4 +1,4 @@
-numpy>=1.18.0
+numpy>=1.18.0,<2.0.0
 dash>=2.6.0
 werkzeug>=2.2.3
 nbformat>=5.7.0

diff --git a/python/test/t/geometry/test_trianglemesh.py b/python/test/t/geometry/test_trianglemesh.py
@@ -1353,7 +1353,7 @@ def test_remove_non_manifold_edges(device, int_t, float_t):
 
     # allow boundary edges
     expected_edges = test_box_legacy.get_non_manifold_edges()
-    np.testing.assert_allclose(test_box.get_non_manifold_edges().numpy(),
+    np.testing.assert_allclose(test_box.get_non_manifold_edges().cpu().numpy(),
                                np.asarray(expected_edges))
     # disallow boundary edges
     # MSVC produces edges in a different order, so compare sorted legacy results
@@ -1368,7 +1368,7 @@ def test_remove_non_manifold_edges(device, int_t, float_t):
         [6, 8],
         [6, 8],
     ])
-    edges = np.sort(test_box.get_non_manifold_edges(False).numpy(), axis=0)
+    edges = np.sort(test_box.get_non_manifold_edges(False).cpu().numpy(), axis=0)
     np.testing.assert_allclose(edges, expected_edges)
 
     test_box.remove_non_manifold_edges()