Merge pull request #208 from libigl/alecjacobson/numpyeigen-fork [ci skip]

_int,_long,_longlong -> _int32,_int64,❌

Author: alecjacobson

cmake/PyiglDependencies.cmake

@@ -26,8 +26,8 @@ FetchContent_MakeAvailable(libigl)
 
 FetchContent_Declare(
   numpyeigen
-  GIT_REPOSITORY https://github.com/fwilliams/numpyeigen.git
-  GIT_TAG        e2ac64034fde35cb70da39aaefbf5331df6015f7)
+  GIT_REPOSITORY https://github.com/alecjacobson/numpyeigen.git
+  GIT_TAG        ef46595a8bf72f96301b4e92334b433fb1bd6c9e)
 # NumpyEigen's CMakeLists sets NPE_PYTHON_EXECUTABLE without a way to override,
 # so we must include directly rather that using FetchContent_MakeAvailable
 #FetchContent_MakeAvailable(numpyeigen)

igl/_version.py

@@ -5,4 +5,4 @@
 # This Source Code Form is subject to the terms of the Mozilla Public License
 # v. 2.0. If a copy of the MPL was not distributed with this file, You can
 # obtain one at http://mozilla.org/MPL/2.0/.
-__version__ = "2.5.4dev"
+__version__ = "2.5.5dev"

src/active_set.cpp

@@ -57,7 +57,7 @@ npe_function(active_set)
 npe_doc(ds_active_set)
 npe_arg(A, sparse_float, sparse_double)
 npe_arg(B, dense_float, dense_double)
-npe_arg(known, dense_int, dense_long, dense_longlong)
+npe_arg(known, dense_int32, dense_int64)
 npe_arg(Y, npe_matches(B))
 npe_arg(Aeq, npe_matches(A))
 npe_arg(Beq, npe_matches(B))

src/adjacency_list.cpp

@@ -37,7 +37,7 @@ Examples
 
 npe_function(adjacency_list)
 npe_doc(ds_adjacency_list)
-npe_arg(f, dense_int, dense_long, dense_longlong)
+npe_arg(f, dense_int32, dense_int64)
 npe_begin_code()
   assert_valid_tet_or_tri_mesh_faces(f, "f");
   std::vector<std::vector<npe_Scalar_f>> a;

src/adjacency_matrix.cpp

@@ -46,7 +46,7 @@ Examples
 
 npe_function(adjacency_matrix)
 npe_doc(ds_adjacency_matrix)
-npe_arg(f, dense_int, dense_long, dense_longlong)
+npe_arg(f, dense_int32, dense_int64)
 npe_begin_code()
 
   assert_valid_simplex_idxs(f, "f");

src/ambient_occlusion.cpp

@@ -42,7 +42,7 @@ npe_function(ambient_occlusion)
 npe_doc(ds_ambient_occlusion)
 
 npe_arg(v, dense_float, dense_double)
-npe_arg(f, dense_int, dense_long, dense_longlong)
+npe_arg(f, dense_int32, dense_int64)
 npe_arg(p, dense_float, dense_double)
 npe_arg(n, npe_matches(p))
 npe_arg(num_samples, int)

src/arap_linear_block.cpp

@@ -56,7 +56,7 @@ Examples
 npe_function(arap_linear_block)
 npe_doc(ds_arap_linear_block)
 npe_arg(v, dense_float, dense_double)
-npe_arg(f, dense_int, dense_long, dense_longlong)
+npe_arg(f, dense_int32, dense_int64)
 npe_arg(d, int)
 npe_arg(energy, int)
 npe_begin_code()
@@ -90,7 +90,7 @@ npe_end_code()
 npe_function(arap_linear_block_spokes)
 npe_doc(ds_arap_linear_block)
 npe_arg(v, dense_float, dense_double)
-npe_arg(f, dense_int, dense_long, dense_longlong)
+npe_arg(f, dense_int32, dense_int64)
 npe_arg(d, int)
 npe_begin_code()
 
@@ -108,7 +108,7 @@ npe_end_code()
 npe_function(arap_linear_block_spokes_and_rims)
 npe_doc(ds_arap_linear_block)
 npe_arg(v, dense_float, dense_double)
-npe_arg(f, dense_int, dense_long, dense_longlong)
+npe_arg(f, dense_int32, dense_int64)
 npe_arg(d, int)
 npe_begin_code()
 
@@ -127,7 +127,7 @@ npe_end_code()
 npe_function(arap_linear_block_elements)
 npe_doc(ds_arap_linear_block)
 npe_arg(v, dense_float, dense_double)
-npe_arg(f, dense_int, dense_long, dense_longlong)
+npe_arg(f, dense_int32, dense_int64)
 npe_arg(d, int)
 npe_begin_code()
 

src/arap_rhs.cpp

@@ -43,7 +43,7 @@ Examples
 npe_function(arap_rhs)
 npe_doc(ds_arap_rhs)
 npe_arg(v, dense_float, dense_double)
-npe_arg(f, dense_int, dense_long, dense_longlong)
+npe_arg(f, dense_int32, dense_int64)
 npe_arg(d, int)
 npe_arg(energy, int)
 npe_begin_code()

src/average_onto_faces.cpp

@@ -37,7 +37,7 @@ Examples
 npe_function(average_onto_faces)
 npe_doc(doccc_faces_avg)
 
-npe_arg(f, dense_int, dense_long, dense_longlong)
+npe_arg(f, dense_int32, dense_int64)
 npe_arg(s, dense_float, dense_double)
 
 

src/average_onto_vertices.cpp

@@ -38,7 +38,7 @@ Examples
 npe_function(average_onto_vertices)
 npe_doc(ds_average_onto_vertices)
 npe_arg(v, dense_float, dense_double)
-npe_arg(f, dense_int, dense_long, dense_longlong)
+npe_arg(f, dense_int32, dense_int64)
 npe_arg(s, dense_float, dense_double) // TODO: Maybe do a matches here
 npe_begin_code()
   assert_valid_tet_or_tri_mesh_23d(v, f);