Merge pull request #46 from porumbes/main

Fix build with updated cuCollections
owensgroup · Dec 25, 2024 · 23bd0f8 · 23bd0f8
2 parents 014dade + b8f60ad
commit 23bd0f8
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt
@@ -8,7 +8,7 @@ add_subdirectory(XPBD)
 #add_subdirectory(Simplification)
 add_subdirectory(SECHistogram)
 add_subdirectory(Remesh)
-#add_subdirectory(SECPriority)
+add_subdirectory(SECPriority)
 add_subdirectory(SurfaceTracking)
 add_subdirectory(SCP)
 add_subdirectory(ARAP)

diff --git a/apps/SECPriority/CMakeLists.txt b/apps/SECPriority/CMakeLists.txt
@@ -28,14 +28,13 @@ source_group(TREE ${CMAKE_CURRENT_LIST_DIR} PREFIX "SECPriority" FILES ${SOURCE_
 # NVIDIA.
 CPMAddPackage(
     NAME cuco
-    GITHUB_REPOSITORY andrewbriand/cuCollections
-    GIT_TAG d58dd9fedde721a264c8ae960f7393a3a3b08c58
+    GITHUB_REPOSITORY porumbes/cuCollections
+    GIT_TAG b857b47b812f6e618e5f4e3e3cdcbfa5a3764898
     OPTIONS
        "BUILD_TESTS OFF"
        "BUILD_BENCHMARKS OFF"
        "BUILD_EXAMPLES OFF"
 )
-
 target_link_libraries(SECPriority     
     PRIVATE RXMesh
     PRIVATE gtest_main	

diff --git a/apps/SECPriority/secp_kernels.cuh b/apps/SECPriority/secp_kernels.cuh
@@ -1,6 +1,6 @@
 #pragma once
 #include "rxmesh/cavity_manager.cuh"
-#include "../ShortestEdgeCollapse/link_condition.cuh"
+#include "../Remesh/link_condition.cuh"
 
 #include <cooperative_groups.h>
 #include <cuda_runtime.h>
@@ -55,7 +55,7 @@ __global__ static void secp(rxmesh::Context                   context,
 
     // 2a) check edge link condition.
     link_condition(block, cavity.patch_info(), ev_query, 
-                   edge_mask, v0_mask, v1_mask);
+                   edge_mask, v0_mask, v1_mask, 0, 1);
     block.sync();
 
     for_each_edge(cavity.patch_info(), [&](EdgeHandle eh) {

diff --git a/apps/SECPriority/secp_rxmesh.cuh b/apps/SECPriority/secp_rxmesh.cuh
@@ -10,7 +10,7 @@
 
 // Priority Queue related includes
 #include <cuco/priority_queue.cuh>
-#include <cuco/detail/pair.cuh>
+#include <cuco/pair.cuh>
 
 #include <thrust/device_vector.h>
 #include <thrust/host_vector.h>