Merge branch 'ECP-copa:master' into master

ECP-copa · Aug 26, 2023 · 32333d6 · 32333d6
2 parents f1d6d1c + 0552086
commit 32333d6
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 11 deletions.
diff --git a/cajita/src/Cajita_SparseHalo.hpp b/cajita/src/Cajita_SparseHalo.hpp
@@ -1224,7 +1224,6 @@ class SparseHalo
     template <class Type, std::size_t M, std::size_t... Is>
     struct compute_member_extents_impl<Type, M, std::index_sequence<Is...>>
     {
-
         KOKKOS_FORCEINLINE_FUNCTION
         Kokkos::Array<std::size_t, M> operator()()
         {

diff --git a/cajita/unit_test/tstSparseHalo.hpp b/cajita/unit_test/tstSparseHalo.hpp
@@ -96,7 +96,6 @@ bool is_ghosted_by_neighbor( const std::array<int, 3> tile_id,
                              const std::array<int, 3> high_corner,
                              const int halo_tile_width )
 {
-
     if ( neighbor_id[0] == 0 && neighbor_id[1] == 0 && neighbor_id[2] == 0 )
         return false;
     std::array<int, 3> valid_low;

diff --git a/cmake/test_harness/test_harness.cmake b/cmake/test_harness/test_harness.cmake
@@ -102,13 +102,13 @@ macro(Cabana_add_tests)
         if(_device STREQUAL THREADS OR _device STREQUAL OPENMP)
           foreach(_thread ${CABANA_UNIT_TEST_NUMTHREADS})
             add_test(NAME ${_target}_nt_${_thread} COMMAND
-                    ${NONMPI_PRECOMMAND} $<TARGET_FILE:${_target}> ${gtest_args} --kokkos-threads=${_thread})
+                    ${NONMPI_PRECOMMAND} $<TARGET_FILE:${_target}> ${gtest_args} --kokkos-num-threads=${_thread})
             if(_device STREQUAL OPENMP)
               set_property(TEST ${_target}_nt_${_thread} PROPERTY ENVIRONMENT OMP_NUM_THREADS=${_thread})
             endif()
             if(VALGRIND_FOUND)
               add_test(NAME ${_target}_nt_${_thread}_valgrind COMMAND
-                ${NONMPI_PRECOMMAND} ${VALGRIND_EXECUTABLE} ${VALGRIND_ARGS} $<TARGET_FILE:${_target}> ${gtest_args} --kokkos-threads=${_thread})
+                ${NONMPI_PRECOMMAND} ${VALGRIND_EXECUTABLE} ${VALGRIND_ARGS} $<TARGET_FILE:${_target}> ${gtest_args} --kokkos-num-threads=${_thread})
               if(_device STREQUAL OPENMP)
                 set_property(TEST ${_target}_nt_${_thread}_valgrind PROPERTY ENVIRONMENT OMP_NUM_THREADS=${_thread})
               endif()

diff --git a/core/src/impl/Cabana_CartesianGrid.hpp b/core/src/impl/Cabana_CartesianGrid.hpp
@@ -154,13 +154,7 @@ class CartesianGrid
     KOKKOS_INLINE_FUNCTION
     int cellsBetween( const Real max, const Real min, const Real rdelta ) const
     {
-        // FIXME_SYCL (remove ifdef when newest Kokkos is required)
-#if ( defined __SYCL_DEVICE_ONLY__ )
-        using Kokkos::Experimental::floor;
-#elif !defined( __HIP_DEVICE_COMPILE__ )
-        using std::floor;
-#endif
-        return floor( ( max - min ) * rdelta );
+        return Kokkos::floor( ( max - min ) * rdelta );
     }
 };