Merge pull request #173 from libigl/alecjacobson/bump-libigl

bump libigl to current; increment version to 2.5.0dev
libigl · Feb 7, 2023 · 235cd02 · 235cd02
2 parents 59db1be + c034da0
commit 235cd02
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/cmake/PyiglDependencies.cmake b/cmake/PyiglDependencies.cmake
@@ -19,7 +19,7 @@ include(FetchContent)
 FetchContent_Declare(
     libigl
     GIT_REPOSITORY https://github.com/libigl/libigl.git
-    GIT_TAG 238a607032d725cbf1b99cad2077516b1ee066d8
+    GIT_TAG 4a91b88f81aa094d076ad4f1460ae663295ac518
 )
 FetchContent_GetProperties(libigl)
 FetchContent_MakeAvailable(libigl)

diff --git a/igl/_version.py b/igl/_version.py
@@ -1 +1 @@
-__version__ = "2.4.1"
+__version__ = "2.5.0dev"
diff --git a/src/exact_geodesic.cpp b/src/exact_geodesic.cpp
@@ -48,7 +48,7 @@ npe_begin_code()
   //assert_cols_equals(fs, 1, "fs");
   //assert_cols_equals(vt, 1, "vt");
   //assert_cols_equals(ft, 1, "ft");
-  EigenDenseLike<npe_Matrix_v> d;
+  Eigen::Matrix<typename npe_Matrix_v::Scalar,Eigen::Dynamic,1> d;
   igl::exact_geodesic(v, f, vs, fs, vt, ft, d);
   return npe::move(d);
 

diff --git a/src/vector_area_matrix.cpp b/src/vector_area_matrix.cpp
@@ -33,7 +33,7 @@ npe_arg(f, dense_int, dense_long, dense_longlong)
 npe_begin_code()
 
   assert_valid_tri_mesh_faces(f);
-  EigenSparseLike<npe_Matrix_f> a;
+  Eigen::SparseMatrix<double> a;
   igl::vector_area_matrix(f, a);
   return npe::move(a);
 

diff --git a/tests/test_basic.py b/tests/test_basic.py
@@ -495,6 +495,7 @@ def test_read_dmat(self):
     # sparse matrix, no flag attribute
     def test_vector_area_matrix(self):
         a = igl.vector_area_matrix(self.f)
+        self.assertEqual(a.dtype, "float64")
         self.assertEqual(a.shape[0], a.shape[1])
         self.assertEqual(a.shape[0], self.v.shape[0]*2)