upd zpc

zenustech · Aug 23, 2024 · 4936feb · 4936feb
1 parent ce6a1b2
commit 4936feb
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/projects/CUDA/test.cu b/projects/CUDA/test.cu
@@ -80,7 +80,8 @@ struct ZSCULinkTest : INode {
     {
       zs::VdbGrid<3, float, zs::index_sequence<3, 4, 5>> ag;
       using TT = RM_CVREF_T(ag);
-      fmt::print("adaptive grid type: {}\n", zs::get_var_type_str(ag));
+      fmt::print("adaptive grid type: {}\n",
+                 zs::get_var_type_str(ag).asChars());
       // fmt::print("tile bits: {}\n", zs::get_type_str<TT::tile_bits_type>());
       // fmt::print("hierarchy bits: {}\n",
       // zs::get_type_str<TT::hierarchy_bits_type>());

diff --git a/projects/CUDA/utils/Primitives.cu b/projects/CUDA/utils/Primitives.cu
@@ -96,7 +96,7 @@ struct ZSParticlePerlinNoise : INode {
         auto &tv = zspars->getParticles();
 
         if (!tv.hasProperty(tag))
-            throw std::runtime_error(fmt::format("Attribute [{}] doesn't exist!", tag));
+            throw std::runtime_error(fmt::format("Attribute [{}] doesn't exist!", tag.asChars()));
         const int nchns = tv.getPropertySize(tag);
 
         auto pol = zs::cuda_exec();

diff --git a/projects/CUDA/utils/TopoUtils.cu b/projects/CUDA/utils/TopoUtils.cu
@@ -133,15 +133,15 @@ void update_surface_cell_normals(zs::CudaExecutionPolicy &pol, ZenoParticles::pa
     constexpr auto space = execspace_e::cuda;
 
     if (!verts.hasProperty(xTag))
-        throw std::runtime_error(fmt::format("missing property [{}] for vertex positions.", xTag));
+        throw std::runtime_error(fmt::format("missing property [{}] for vertex positions.", xTag.asChars()));
     if (!tris.hasProperty("inds"))
         throw std::runtime_error("missing property [inds] for surface triangles.");
     if (!lines.hasProperty("fe_inds") || !lines.hasProperty("inds"))
         throw std::runtime_error("missing property [fe_inds]/[inds] for surface edges.");
     if (!tris.hasProperty(triNrmTag))
-        throw std::runtime_error(fmt::format("missing property [{}] for surface triangles.", triNrmTag));
+        throw std::runtime_error(fmt::format("missing property [{}] for surface triangles.", triNrmTag.asChars()));
     if (!lines.hasProperty(biNrmTag))
-        throw std::runtime_error(fmt::format("missing property [{}] for surface edges.", biNrmTag));
+        throw std::runtime_error(fmt::format("missing property [{}] for surface edges.", biNrmTag.asChars()));
 
     pol(range(tris.size()), [verts = proxy<space>(verts), xOffset = verts.getPropertyOffset(xTag), vOffset = vOffset,
                              tris = proxy<space>({}, tris), triNrmTag] ZS_LAMBDA(int ti) mutable {

diff --git a/projects/CUDA/zpc b/projects/CUDA/zpc
+2 −2		include/zensim/container/DenseField.hpp
+1 −1		include/zensim/container/TileVector.hpp
+1 −1		include/zensim/resource/Resource.h
+10 −5		include/zensim/types/SmallVector.hpp
+2 −1		include/zensim/vulkan/VkContext.cpp
+1 −0		include/zensim/vulkan/VkModel.hpp
+4 −2		include/zensim/vulkan/VkSwapchain.cpp
+1 −1		include/zensim/zpc_tpls