fix build

zenustech · Jul 2, 2024 · f619e0a · f619e0a
1 parent 3874253
commit f619e0a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/projects/CUDA/zpc b/projects/CUDA/zpc
diff --git a/projects/CuLagrange/pbd/ConstraintsBuilder.cu b/projects/CuLagrange/pbd/ConstraintsBuilder.cu
@@ -470,7 +470,7 @@ virtual void apply() override {
             rest_scale = rest_scale,
             eles = proxy<space>({},eles),
             verts = proxy<space>({},verts)] ZS_LAMBDA(auto ai,const auto& pair) mutable {
-                eles.tuple(dim_c<2>,"inds",ai) = pair.reinterpret_bits<float>();
+                eles.tuple(dim_c<2>,"inds",ai) = pair.template reinterpret_bits<float>();
                 auto v0 = verts.pack(dim_c<3>,"x",pair[0]);
                 auto v1 = verts.pack(dim_c<3>,"x",pair[1]);
                 eles("r",ai) = (v0 - v1).norm() * rest_scale;

diff --git a/projects/CuLagrange/pbd/constraint_function_kernel/constraint.cuh b/projects/CuLagrange/pbd/constraint_function_kernel/constraint.cuh
@@ -976,6 +976,7 @@ constexpr bool solve_BendTwistConstraint(
 }
 
 // ----------------------------------------------------------------------------------------------
+#if 0
 template<typename VECTOR3d,typename SCALER>
 constexpr bool solve_PerpendiculaBisectorConstraint(
     const VECTOR3d &p0, SCALER invMass0,
@@ -1002,6 +1003,7 @@ constexpr bool solve_PerpendiculaBisectorConstraint(
 
     return true;
 }
+#endif
 
 //     // ----------------------------------------------------------------------------------------------
 //     template<typename VECTOR3d,typename SCALER>
+5 −1		CMakeLists.txt
+91 −2		include/zensim/CMakeLists.txt
+30 −0		include/zensim/Platform.hpp
+24 −32		include/zensim/ZpcFunctional.hpp
+2 −1		include/zensim/ZpcImplPattern.cpp
+1 −1		include/zensim/ZpcImplPattern.hpp
+1 −1		include/zensim/ZpcIterator.hpp
+12 −15		include/zensim/ZpcMathUtils.hpp
+2 −2		include/zensim/ZpcMeta.hpp
+8 −8		include/zensim/ZpcReflection.hpp
+15 −10		include/zensim/ZpcResource.hpp
+0 −3		include/zensim/ZpcTuple.hpp
+2 −0		include/zensim/cuda/memory/Allocator.cpp
+3 −1		include/zensim/cuda/memory/Allocator.h
+2 −2		include/zensim/execution/ConcurrencyPrimitive.cpp
+76 −11		include/zensim/math/Rotation.hpp
+15 −15		include/zensim/math/Vec.h
+23 −2		include/zensim/math/VecInterface.hpp
+14 −13		include/zensim/math/matrix/Transform.hpp
+1 −0		include/zensim/memory/Allocator.cpp
+2 −0		include/zensim/memory/Allocator.h
+19 −45		include/zensim/memory/MemoryResource.h
+10 −1		include/zensim/physics/constitutive_models/AnisotropicArap.hpp
+4 −4		include/zensim/physics/constitutive_models/NeoHookean.hpp
+8 −0		include/zensim/py_interop/Clang.cpp
+3 −0		include/zensim/resource/Resource.cpp
+3 −0		include/zensim/resource/Resource.h
+4 −1		include/zensim/types/SmallVector.hpp
+1 −1		include/zensim/vulkan/VkSwapchain.cpp
+1 −1		include/zensim/zpc_tpls
+1 −1		test/CMakeLists.txt
+2 −2		test/cuda/main.cu
+181 −40		test/help_parser.cpp
+2 −2		test/parallel_primitives.cpp
+2 −2		test/utils/parallel_primitives.hpp
+1 −1		zpc_assets