Merge pull request #105 from SCOREC/ac/bug-fix

Small bug fixes
SCOREC · Nov 21, 2023 · 253b13e · 253b13e
2 parents 27865fa + 74497fa
commit 253b13e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.0.0)
 
-project(pumipic VERSION 2.0.1 LANGUAGES CXX)
+project(pumipic VERSION 2.0.2 LANGUAGES CXX)
 
 include(cmake/bob.cmake)
 
@@ -68,7 +68,7 @@ if(ENABLE_CABANA)
   bob_public_dep(Cabana)
   # }
   add_definitions(-DPP_ENABLE_CAB)
-  if(Cabana_VERSION VERSION_LESS 0.6.0)
+  if(Cabana_VERSION VERSION_LESS 0.6.0 OR Cabana_VERSION STREQUAL "1.0-dev")
     message(FATAL_ERROR "Cabana version >= 0.6.0 required.")
   endif()
 endif()

diff --git a/particle_structs/src/scs/SCS_sort.h b/particle_structs/src/scs/SCS_sort.h
@@ -15,6 +15,7 @@ namespace pumipic {
         index(i) = i;
       });
 
+      sigma = std::min(sigma, std::max(num_elems, 1));
       lid_t n_sigma = num_elems/sigma;
       Kokkos::parallel_for( PolicyType(n_sigma, 1), KOKKOS_LAMBDA(const TeamMem& t){
         lid_t start = t.league_rank() * sigma;

diff --git a/particle_structs/test/test_structure.cpp b/particle_structs/test/test_structure.cpp
@@ -117,7 +117,7 @@ PS* buildNextStructure(int num, lid_t num_elems, lid_t num_ptcls, kkLidView ppe,
       //Build SCS with C = 32, sigma = ne, V = 1024
       error_message = "SCS (C=32, sigma=ne, V=1024)";
       lid_t maxC = 32;
-      lid_t sigma = num_elems;
+      lid_t sigma = INT_MAX;
       lid_t V = 1024;
       Kokkos::TeamPolicy<ExeSpace> policy = pumipic::TeamPolicyAuto(4, maxC);
       name = "scs_C32_SMAX_V1024";