Merge pull request #11 from streeve/kokkos_3.7

Require Kokkos 3.7 for the math namespace update
ECP-copa · Jun 8, 2023 · b9be8dd · b9be8dd
2 parents 3e27de7 + dc7181a
commit b9be8dd
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -23,7 +23,7 @@ jobs:
         uses: actions/[email protected]
         with:
           repository: kokkos/kokkos
-          ref: 3.6.01
+          ref: 3.7.01
           path: kokkos
       - name: Build kokkos
         working-directory: kokkos

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,6 +4,9 @@ project(HACCabana LANGUAGES CXX C)
 
 include(GNUInstallDirs)
 
-find_package(Cabana)
+find_package(Cabana REQUIRED)
+if(Kokkos_VERSION_MAJOR LESS 4 AND Kokkos_VERSION_MINOR LESS 7)
+  message( FATAL_ERROR "HACCabana requires Kokkos >= 3.7" )
+endif()
 
 add_subdirectory(src)
diff --git a/src/ParticleActions.cxx b/src/ParticleActions.cxx
@@ -115,7 +115,7 @@ void ParticleActions::updateVel(\
             if (dist2 < rmax2) 
             {
               const float dist2Err = dist2 + rsm2;
-              const float tmp =  1.0f/Kokkos::Experimental::sqrt(dist2Err*dist2Err*dist2Err) - FGridEvalPoly(dist2);
+              const float tmp =  1.0f/Kokkos::sqrt(dist2Err*dist2Err*dist2Err) - FGridEvalPoly(dist2);
               force[0] += dx * tmp;
               force[1] += dy * tmp;
               force[2] += dz * tmp;