Fix reviewer's comments

nliber · Jul 31, 2023 · 15a9c9c · 15a9c9c
1 parent a4f57aa
commit 15a9c9c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/cmake/kokkos_arch.cmake b/cmake/kokkos_arch.cmake
@@ -211,7 +211,7 @@ IF(KOKKOS_ENABLE_HIP)
   SET(AMDGPU_ARCH_FLAG "--offload-arch")
   IF(NOT KOKKOS_CXX_COMPILER_ID STREQUAL HIPCC)
     IF (NOT CMAKE_CXX_STANDARD)
-      MESSAGE(FATAL_ERROR "Set CMAKE_CXX_STANDARD to 17")
+      MESSAGE(FATAL_ERROR "Kokkos requires CMAKE_CXX_STANDARD to set to 17 or higher")
     ENDIF()
     GLOBAL_APPEND(KOKKOS_AMDGPU_OPTIONS -xhip)
     IF(DEFINED ENV{ROCM_PATH})

diff --git a/core/unit_test/TestMathematicalSpecialFunctions.hpp b/core/unit_test/TestMathematicalSpecialFunctions.hpp
@@ -1198,8 +1198,8 @@ struct TestComplexBesselI0K0Function {
 
     // FIXME_HIP Disable the test when using ROCm 5.5 and 5.6 due to a known
     // compiler bug
-#if (HIP_VERSION_MAJOR != 5) ||  \
-    ((HIP_VERSION_MAJOR == 5) && \
+#if !defined(KOKKOS_ENABLE_HIP) || (HIP_VERSION_MAJOR != 5) || \
+    ((HIP_VERSION_MAJOR == 5) &&                               \
      !((HIP_VERSION_MINOR == 5) || (HIP_VERSION_MINOR == 6)))
     for (int i = 0; i < N; i++) {
       EXPECT_LE(Kokkos::abs(h_cbi0(i) - h_ref_cbi0(i)),
@@ -1694,8 +1694,8 @@ struct TestComplexBesselH1Function {
 
     // FIXME_HIP Disable the test when using ROCm 5.5 and 5.6 due to a known
     // compiler bug
-#if (HIP_VERSION_MAJOR != 5) ||  \
-    ((HIP_VERSION_MAJOR == 5) && \
+#if !defined(KOKKOS_ENABLE_HIP) || (HIP_VERSION_MAJOR != 5) || \
+    ((HIP_VERSION_MAJOR == 5) &&                               \
      !((HIP_VERSION_MINOR == 5) || (HIP_VERSION_MINOR == 6)))
     EXPECT_EQ(h_ref_ch10(0), h_ch10(0));
     for (int i = 1; i < N; i++) {
@@ -1882,8 +1882,8 @@ struct TestComplexBesselH2Function {
 
     // FIXME_HIP Disable the test when using ROCm 5.5 and 5.6 due to a known
     // compiler bug
-#if (HIP_VERSION_MAJOR != 5) ||  \
-    ((HIP_VERSION_MAJOR == 5) && \
+#if !defined(KOKKOS_ENABLE_HIP) || (HIP_VERSION_MAJOR != 5) || \
+    ((HIP_VERSION_MAJOR == 5) &&                               \
      !((HIP_VERSION_MINOR == 5) || (HIP_VERSION_MINOR == 6)))
     EXPECT_EQ(h_ref_ch20(0), h_ch20(0));
     for (int i = 1; i < N; i++) {