Fix pybind defintion order

Author: zfergus

python/src/bindings.cpp

@@ -10,6 +10,9 @@ PYBIND11_MODULE(ipctk, m)
 
     m.doc() = "IPC Toolkit";
 
+    // define these early because they are used in other definitions
+    define_eigen_ext(m);
+
     // barrier
     define_barrier(m);
     define_adaptive_stiffness(m);
@@ -91,7 +94,7 @@ PYBIND11_MODULE(ipctk, m)
 
     // utils
     define_area_gradient(m);
-    define_eigen_ext(m);
+    // define_eigen_ext(m);
     define_interval(m);
     define_intersection(m);
     define_logger(m);

python/src/utils/eigen_ext.cpp

@@ -27,7 +27,8 @@ void define_eigen_ext(py::module_& m)
         m, "PSDProjectionMethod",
         "Enumeration of implemented PSD projection methods.")
         .value("NONE", PSDProjectionMethod::NONE, "No PSD projection")
-        .value("CLAMP", PSDProjectionMethod::CLAMP, "Clamp negative eigenvalues")
+        .value(
+            "CLAMP", PSDProjectionMethod::CLAMP, "Clamp negative eigenvalues")
         .value("ABS", PSDProjectionMethod::ABS, "Flip negative eigenvalues")
         .export_values();
 

python/tests/find_ipctk.py

@@ -3,6 +3,17 @@
 except ImportError:
     import sys
     import pathlib
-    sys.path.append(
-        str(pathlib.Path(__file__).parents[2] / "build" / "release" / "python"))
+    repo_root = pathlib.Path(__file__).parents[2]
+    possible_paths = [
+        pathlib.Path("python").resolve(),
+        repo_root / "build" / "python",
+        repo_root / "build" / "release" / "python",
+        repo_root / "build" / "debug" / "python",
+    ]
+    for path in possible_paths:
+        if path.exists():
+            sys.path.append(str(path))
+            break
+    else:
+        raise ImportError("Could not find the ipctk module")
     import ipctk  # Try again

src/ipc/potentials/distance_based_potential.cpp

@@ -181,8 +181,7 @@ void DistanceBasedPotential::shape_derivative(
     MatrixMax12d local_hess;
     if (!collision.is_mollified()) {
         // w ∇ₓ∇ᵤf = w ∇ᵤ²f
-        local_hess =
-            hessian(collision, positions, /*project_hessian_to_psd=*/PSDProjectionMethod::NONE);
+        local_hess = hessian(collision, positions, PSDProjectionMethod::NONE);
     } else {
         // d(x̄+u)
         const double d = collision.compute_distance(positions);