Skip to content

fix continuous integration with numpy types #154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
teseoch merged 8 commits into from
Jan 6, 2023
Merged

fix continuous integration with numpy types #154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3967da9
Update README.md
jiangzhongshi Jan 5, 2023
5d3499f
deprecate np.float
jiangzhongshi Jan 5, 2023
06054d7
deprecate np.int
jiangzhongshi Jan 5, 2023
6110669
updated deprecated package in setup
Jan 6, 2023
0faf42d
fixed types in tests
Jan 6, 2023
9321eb3
install packaging
jiangzhongshi Jan 6, 2023
46596a8
added default dtype
Jan 6, 2023
4f8b2a3
Merge branch 'patch-2' of github.com:jiangzhongshi/libigl-python-bind…
Jan 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,3 @@ To run the tests:
python setup.py test
```


1 change: 1 addition & 0 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ jobs:
python -m pip install --upgrade pip
pip install numpy
pip install scipy
pip install packaging
displayName: 'Install dependencies'

- script: |
Expand Down
6 changes: 3 additions & 3 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import platform
import subprocess

from distutils.version import LooseVersion
from packaging.version import Version
from setuptools import setup, Extension, find_packages
from setuptools.command.build_ext import build_ext

Expand All @@ -24,8 +24,8 @@ def run(self):

# self.debug = True

cmake_version = LooseVersion(re.search(r'version\s*([\d.]+)', out.decode()).group(1))
if cmake_version < '3.2.0':
cmake_version = Version(re.search(r'version\s*([\d.]+)', out.decode()).group(1))
if cmake_version < Version('3.2.0'):
raise RuntimeError("CMake >= 3.2.0 is required")

for ext in self.extensions:
Expand Down
72 changes: 38 additions & 34 deletions tests/test_basic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import igl
import numpy as np
import scipy as sp
import scipy.sparse.csc as csc
import scipy.sparse as csc
import math


Expand All @@ -32,6 +32,9 @@ def setUp(self):
self.f = np.random.randint(0, 10, size=(20, 3), dtype=self.f1.dtype)
self.g = np.random.randint(0, 10, size=(20, 4), dtype="int32")

self.default_int = np.array(range(2)).dtype
self.default_float = np.zeros((2,2)).dtype

def tearDown(self):
vv1, ff1 = igl.read_triangle_mesh(
os.path.join(self.test_path, "bunny_small.off"))
Expand Down Expand Up @@ -140,8 +143,8 @@ def test_massmatrix(self):
self.v, self.f, type=igl.MASSMATRIX_TYPE_BARYCENTRIC)
self.assertTrue(a.shape == (self.v.shape[0], self.v.shape[0]))
self.assertTrue(b.shape == (self.v.shape[0], self.v.shape[0]))
self.assertTrue(b.dtype == np.float64)
self.assertTrue(a.dtype == np.float64)
self.assertTrue(b.dtype == self.v.dtype)
self.assertTrue(a.dtype == self.v.dtype)
self.assertTrue(type(a) == type(b) == csc.csc_matrix)

def test_massmatrix_intrinsic(self):
Expand All @@ -151,8 +154,8 @@ def test_massmatrix_intrinsic(self):
el, self.f, type=igl.MASSMATRIX_TYPE_BARYCENTRIC)
self.assertTrue(a.shape == (self.v.shape[0], self.v.shape[0]))
self.assertTrue(b.shape == (self.v.shape[0], self.v.shape[0]))
self.assertTrue(b.dtype == np.float64)
self.assertTrue(a.dtype == np.float64)
self.assertTrue(b.dtype == el.dtype)
self.assertTrue(a.dtype == el.dtype)
self.assertTrue(type(a) == type(b) == csc.csc_matrix)

def test_principal_curvature(self):
Expand All @@ -164,12 +167,12 @@ def test_principal_curvature(self):
self.assertTrue(pv1.shape == qv1.shape == pv2.shape ==
qv2.shape == (self.v.shape[0],))
self.assertTrue(pd1.dtype == pd2.dtype ==
pv1.dtype == pv2.dtype == np.float64)
pv1.dtype == pv2.dtype == self.v.dtype)
v = self.v.copy()

pd1, pd2, pv1, pv2 = igl.principal_curvature(v, self.f)
self.assertTrue(pd1.dtype == pd2.dtype ==
pv1.dtype == pv2.dtype == np.float64)
pv1.dtype == pv2.dtype == v.dtype)
self.assertTrue(type(pd1) == type(pd2) == type(pv1)
== type(pv2) == np.ndarray)
self.assertTrue(pd1.flags.c_contiguous)
Expand All @@ -186,7 +189,7 @@ def test_read_obj(self):
self.assertTrue(type(v) == type(f) == type(n) == np.ndarray)
self.assertTrue(v.shape == (25905, 3) and n.shape ==
(0, 0) and f.shape == (51712, 3))
self.assertTrue(v.dtype == np.float64)
self.assertTrue(v.dtype == self.default_float)
self.assertTrue(f.dtype == self.f.dtype)
v, _, n, f, _, _ = igl.read_obj(
self.test_path + "face.obj", dtype="float32")
Expand All @@ -202,7 +205,7 @@ def test_read_off(self):
self.assertTrue(type(v) == type(f) == type(n) == np.ndarray)
self.assertTrue(v.shape == (3485, 3) and n.shape ==
(0, 0) and f.shape == (6966, 3))
self.assertTrue(v.dtype == np.float64)
self.assertTrue(v.dtype == self.default_float)
v, f, n = igl.read_off(
self.test_path + "bunny_small.off", read_normals=False, dtype="float32")
self.assertTrue(v.shape == (3485, 3) and n.shape ==
Expand All @@ -220,7 +223,7 @@ def test_read_mesh(self):
self.assertTrue(t.flags.c_contiguous)
self.assertTrue(f.flags.c_contiguous)

self.assertTrue(v.dtype == np.float64)
self.assertTrue(v.dtype == self.default_float)
self.assertTrue(t.dtype == self.f1.dtype)
self.assertTrue(f.dtype == self.f1.dtype)

Expand Down Expand Up @@ -751,12 +754,12 @@ def test_marching_cubes(self):
self.assertEqual(V.shape, (0, 3))
self.assertEqual(F.shape, (0, 3))

#test marching over a sphere
sphereField = np.linalg.norm(pts, axis=1) - 1
#test marching over a sphere
sphereField = np.linalg.norm(pts, axis=1) - 1
V,F = igl.marching_cubes(sphereField, pts, n, n, n, 0.0)

self.assertTrue(V.dtype == pts.dtype)
self.assertTrue(F.dtype == np.int)
self.assertTrue(F.dtype == self.default_int)

self.assertNotEqual(V.shape, (0,3))
self.assertNotEqual(F.shape, (0,3))
Expand Down Expand Up @@ -1233,7 +1236,7 @@ def test_signed_distance(self):
self.assertTrue(i.flags.c_contiguous)
self.assertTrue(c.flags.c_contiguous)

self.assertTrue(s.dtype == np.float64)
self.assertTrue(s.dtype == self.v1.dtype)
self.assertTrue(c.dtype == self.v1.dtype)
self.assertTrue(i.dtype == self.f1.dtype)

Expand All @@ -1242,7 +1245,7 @@ def test_signed_distance(self):
p, self.v1, self.f1, return_normals=True)
self.assertEqual(n.shape, p.shape)
self.assertTrue(n.flags.c_contiguous)
self.assertTrue(n.dtype == np.float64)
self.assertTrue(n.dtype == self.v1.dtype)

# ensure error raised when trying param other than pseudonormal for normals
with self.assertRaises(ValueError):
Expand Down Expand Up @@ -1717,15 +1720,16 @@ def test_edges_to_path(self):
self.assertTrue(k.dtype == e.dtype)

def test_path_to_edges(self):
e1 = igl.path_to_edges(np.array(range(20)), False)
e2 = igl.path_to_edges(np.array(range(20)), True)
r2 = np.vstack([np.array(range(20)), np.array(range(1, 21))]).T
v_indices = np.array(range(20))
e1 = igl.path_to_edges(v_indices, False)
e2 = igl.path_to_edges(v_indices, True)
r2 = np.vstack([v_indices, np.array(range(1, 21))]).T
r2[19, 1] = 0
self.assertTrue(np.allclose(e2, r2))
self.assertTrue(e1.flags.c_contiguous)
self.assertTrue(e2.flags.c_contiguous)
self.assertTrue(e1.dtype == np.int)
self.assertTrue(e2.dtype == np.int)
self.assertTrue(e1.dtype == v_indices.dtype)
self.assertTrue(e2.dtype == v_indices.dtype)

def test_exterior_edges(self):
e = igl.exterior_edges(self.f1)
Expand Down Expand Up @@ -2097,7 +2101,7 @@ def test_read_msh(self):
self.assertTrue(v.flags.c_contiguous)
self.assertTrue(t.flags.c_contiguous)

self.assertTrue(v.dtype == np.float64)
self.assertTrue(v.dtype == self.default_float)
self.assertTrue(t.dtype == self.f1.dtype)

def test_two_axis_valuator_fixed_up(self):
Expand Down Expand Up @@ -2287,20 +2291,20 @@ def test_quad_grid(self):
self.assertTrue(q.shape == (2*2, 4))
self.assertTrue(v.flags.c_contiguous)
self.assertTrue(q.flags.c_contiguous)
self.assertTrue(v.dtype == np.float)
self.assertTrue(q.dtype == np.int)
self.assertTrue(e.dtype == np.int)
self.assertTrue(v.dtype == self.default_float)
self.assertTrue(q.dtype == self.default_int)
self.assertTrue(e.dtype == self.default_int)

def test_sparse_voxel_grid(self):
def sphere1(point):
return np.sqrt(point[0]**2 + point[1]**2 + point[2]**2) - 1.0
point = np.array([1.0, 0.0, 0.0])
cs, cv, ci = igl.sparse_voxel_grid(point, sphere1, 1.0, 100)
self.assertTrue(cv.flags.c_contiguous)
self.assertTrue(cv.dtype == np.float)
self.assertTrue(cv.dtype == self.default_float)
self.assertTrue(cv.shape == (len(cs), 3))
self.assertTrue(ci.flags.c_contiguous)
self.assertTrue(ci.dtype == np.int)
self.assertTrue(ci.dtype == self.default_int)
self.assertTrue(ci.shape[1] == 8)

def test_topological_hole_fill(self):
Expand All @@ -2310,7 +2314,7 @@ def test_topological_hole_fill(self):
ff = igl.topological_hole_fill(f, b, h)
self.assertTrue(ff.flags.c_contiguous)
self.assertTrue(ff.shape[1] == 3)
self.assertTrue(ff.dtype == np.int)
self.assertTrue(ff.dtype == f.dtype)
self.assertTrue(ff.shape[0] != f.shape[0])

def test_triangulated_grid(self):
Expand All @@ -2319,8 +2323,8 @@ def test_triangulated_grid(self):
self.assertTrue(f.shape == (162, 3))
self.assertTrue(f.flags.c_contiguous)
self.assertTrue(v.flags.c_contiguous)
self.assertTrue(v.dtype == np.float)
self.assertTrue(f.dtype == np.int)
self.assertTrue(v.dtype == self.default_float)
self.assertTrue(f.dtype == self.default_int)

def test_unproject_on_line(self):
pos = np.array([10., 10.])
Expand All @@ -2332,7 +2336,7 @@ def test_unproject_on_line(self):

self.assertTrue(z.flags.c_contiguous)
self.assertTrue(z.shape == (3, ))
self.assertTrue(z.dtype == np.float)
self.assertTrue(z.dtype == pos.dtype)

def test_unproject_on_plane(self):
pos = np.array([10., 10.])
Expand All @@ -2343,7 +2347,7 @@ def test_unproject_on_plane(self):

self.assertTrue(z.flags.c_contiguous)
self.assertTrue(z.shape == (3, ))
self.assertTrue(z.dtype == np.float)
self.assertTrue(z.dtype == pos.dtype)

def test_fast_winding_number_for_points(self):
xs = np.linspace(-5.0, 5.0, 10)
Expand All @@ -2355,7 +2359,7 @@ def test_fast_winding_number_for_points(self):
wn = igl.fast_winding_number_for_points(self.v1, n, a, grid)
self.assertTrue(wn.flags.c_contiguous)
self.assertTrue(wn.shape == (grid.shape[0], ))
self.assertTrue(wn.dtype == np.float)
self.assertTrue(wn.dtype == self.v1.dtype)

def test_fast_winding_number_for_meshes(self):
xs = np.linspace(-5.0, 5.0, 10)
Expand All @@ -2365,7 +2369,7 @@ def test_fast_winding_number_for_meshes(self):
wn = igl.fast_winding_number_for_meshes(self.v1, self.f1, grid)
self.assertTrue(wn.flags.c_contiguous)
self.assertTrue(wn.shape == (grid.shape[0], ))
self.assertTrue(wn.dtype == np.float)
self.assertTrue(wn.dtype == self.v1.dtype)

def test_flip_avoiding_line_search(self):
def fun(v):
Expand All @@ -2387,7 +2391,7 @@ def test_edge_flaps(self):
self.assertTrue(ef.flags.c_contiguous)
self.assertTrue(ei.flags.c_contiguous)
self.assertTrue(e.dtype == emap.dtype ==
ef.dtype == ei.dtype == np.int)
ef.dtype == ei.dtype == self.f2.dtype)

def test_circulation(self):
pass
Expand Down