fix python compilation

Author: Huangzizhou

.github/workflows/pypi.yml

@@ -2,16 +2,16 @@ name: PyPi Release
 
 on:
   workflow_dispatch:
-  # release:
-  #   types: [published]
-  # push:
-  #   branches:
-  #     - pypi
-  #     - main
-  #     - python
-  # pull_request:
-  #   branches:
-  #     - main
+  release:
+    types: [published]
+  push:
+    branches:
+      - pypi
+      - main
+      - python
+  pull_request:
+    branches:
+      - main
 
 jobs:
   build_wheels:

.github/workflows/python.yml

@@ -1,19 +1,19 @@
 name: Python
 
 on:
-  # push:
-  #   branches: [main]
-  # pull_request:
-  #   paths:
-  #     - '.github/workflows/python.yml'
-  #     - 'cmake/**'
-  #     - 'python/src/**'
-  #     - 'python/src/CMakeLists.txt'
-  #     - 'src/**'
-  #     - 'CMakeLists.txt'
-  #     - 'MANIFEST.in'
-  #     - 'pyproject.toml'
-  #     - 'setup.py'
+  push:
+    branches: [main]
+  pull_request:
+    paths:
+      - '.github/workflows/python.yml'
+      - 'cmake/**'
+      - 'python/src/**'
+      - 'python/src/CMakeLists.txt'
+      - 'src/**'
+      - 'CMakeLists.txt'
+      - 'MANIFEST.in'
+      - 'pyproject.toml'
+      - 'setup.py'
 
 jobs:
   Build:

python/src/barrier/adaptive_stiffness.cpp

@@ -72,7 +72,7 @@ void define_adaptive_stiffness(py::module_& m)
     m.def(
         "semi_implicit_stiffness",
         static_cast<double (*)(
-            const CollisionStencil&, Eigen::ConstRef<VectorMax12d>,
+            const CollisionStencil<4>&, Eigen::ConstRef<VectorMax12d>,
             Eigen::ConstRef<VectorMax4d>, Eigen::ConstRef<MatrixMax12d>,
             const double)>(&semi_implicit_stiffness),
         R"ipc_Qu8mg5v7(

python/src/bindings.hpp

@@ -7,7 +7,7 @@
 #include <ccd/bindings.hpp>
 #include <collisions/bindings.hpp>
 #include <distance/bindings.hpp>
-// #include <friction/bindings.hpp>
+#include <friction/bindings.hpp>
 #include <implicits/bindings.hpp>
 #include <potentials/bindings.hpp>
 #include <tangent/bindings.hpp>

python/src/candidates/candidates.cpp

@@ -53,7 +53,7 @@ void define_candidates(py::module_& m)
         .def("clear", &Candidates::clear)
         .def(
             "__getitem__",
-            [](Candidates& self, size_t i) -> CollisionStencil& {
+            [](Candidates& self, size_t i) -> CollisionStencil<4>& {
                 return self[i];
             },
             py::return_value_policy::reference)

python/src/candidates/edge_edge.cpp

@@ -7,7 +7,7 @@ using namespace ipc;
 
 void define_edge_edge_candidate(py::module_& m)
 {
-    py::class_<EdgeEdgeCandidate, CollisionStencil>(m, "EdgeEdgeCandidate")
+    py::class_<EdgeEdgeCandidate, CollisionStencil<4>>(m, "EdgeEdgeCandidate")
         .def(
             py::init<index_t, index_t>(), py::arg("edge0_id"),
             py::arg("edge1_id"))

python/src/candidates/edge_vertex.cpp

@@ -7,7 +7,7 @@ using namespace ipc;
 
 void define_edge_vertex_candidate(py::module_& m)
 {
-    py::class_<EdgeVertexCandidate, CollisionStencil>(m, "EdgeVertexCandidate")
+    py::class_<EdgeVertexCandidate, CollisionStencil<4>>(m, "EdgeVertexCandidate")
         .def(
             py::init<index_t, index_t>(), py::arg("edge_id"),
             py::arg("vertex_id"))

python/src/candidates/face_vertex.cpp

@@ -7,7 +7,7 @@ using namespace ipc;
 
 void define_face_vertex_candidate(py::module_& m)
 {
-    py::class_<FaceVertexCandidate, CollisionStencil>(m, "FaceVertexCandidate")
+    py::class_<FaceVertexCandidate, CollisionStencil<4>>(m, "FaceVertexCandidate")
         .def(
             py::init<index_t, index_t>(), py::arg("face_id"),
             py::arg("vertex_id"))

python/src/candidates/vertex_vertex.cpp

@@ -7,7 +7,7 @@ using namespace ipc;
 
 void define_vertex_vertex_candidate(py::module_& m)
 {
-    py::class_<VertexVertexCandidate, CollisionStencil>(
+    py::class_<VertexVertexCandidate, CollisionStencil<4>>(
         m, "VertexVertexCandidate")
         .def(
             py::init<index_t, index_t>(), py::arg("vertex0_id"),

python/src/collisions/normal/normal_collisions.cpp

@@ -22,7 +22,7 @@ void define_SmoothCollisions(py::module_& m, std::string name)
         .def(
             "build",
             py::overload_cast<
-                const CollisionMesh&, const Eigen::MatrixXd&, const ParameterType, const bool, const BroadPhaseMethod>(&SmoothCollisions<dim>::build),
+                const CollisionMesh&, Eigen::ConstRef<Eigen::MatrixXd>, const ParameterType, const bool, std::shared_ptr<BroadPhase>>(&SmoothCollisions<dim>::build),
             R"ipc_Qu8mg5v7(
             Initialize the set of collisions used to compute the barrier potential.
 
@@ -34,7 +34,7 @@ void define_SmoothCollisions(py::module_& m, std::string name)
                 broad_phase: Broad phase method.
             )ipc_Qu8mg5v7",
             py::arg("mesh"), py::arg("vertices"), py::arg("param"),
-            py::arg("use_adaptive_dhat") = false, py::arg("broad_phase") = DEFAULT_BROAD_PHASE_METHOD)
+            py::arg("use_adaptive_dhat") = false, py::arg("broad_phase") = make_default_broad_phase())
         .def(
             "compute_minimum_distance", &SmoothCollisions<dim>::compute_minimum_distance,
             R"ipc_Qu8mg5v7(