update C++ standard for CUDA and HIP

ginkgo-project · May 1, 2024 · 6b2393e · 6b2393e
1 parent d67b426
commit 6b2393e
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/cmake/build_helpers.cmake b/cmake/build_helpers.cmake
@@ -21,8 +21,8 @@ function(ginkgo_compile_features name)
     target_compile_features("${name}" PUBLIC cxx_std_17)
     # we set these properties regardless of the enabled backends,
     # because unknown properties are ignored
-    set_target_properties("${name}" PROPERTIES HIP_STANDARD 14)
-    set_target_properties("${name}" PROPERTIES CUDA_STANDARD 14)
+    set_target_properties("${name}" PROPERTIES HIP_STANDARD 17)
+    set_target_properties("${name}" PROPERTIES CUDA_STANDARD 17)
     if(GINKGO_WITH_CLANG_TIDY AND GINKGO_CLANG_TIDY_PATH)
         set_property(TARGET "${name}" PROPERTY CXX_CLANG_TIDY "${GINKGO_CLANG_TIDY_PATH};-checks=*")
     endif()

diff --git a/cmake/create_test.cmake b/cmake/create_test.cmake
@@ -35,8 +35,8 @@ function(ginkgo_set_test_target_properties test_target_name test_library_suffix)
     target_compile_features(${test_target_name} PUBLIC cxx_std_14)
     # we set these properties regardless of the enabled backends,
     # because unknown properties are ignored
-    set_target_properties(${test_target_name} PROPERTIES HIP_STANDARD 14)
-    set_target_properties(${test_target_name} PROPERTIES CUDA_STANDARD 14)
+    set_target_properties(${test_target_name} PROPERTIES HIP_STANDARD 17)
+    set_target_properties(${test_target_name} PROPERTIES CUDA_STANDARD 17)
     target_include_directories(${test_target_name} PRIVATE ${Ginkgo_BINARY_DIR} ${set_properties_ADDITIONAL_INCLUDES})
     target_link_libraries(${test_target_name} PRIVATE ginkgo GTest::GTest ${set_properties_ADDITIONAL_LIBRARIES})
 endfunction()

diff --git a/cmake/hip.cmake b/cmake/hip.cmake
@@ -128,4 +128,4 @@ find_package(ROCTX)
 if(GINKGO_HIP_AMD_UNSAFE_ATOMIC AND GINKGO_HIP_VERSION VERSION_GREATER_EQUAL 5)
     set(CMAKE_HIP_FLAGS "${CMAKE_HIP_FLAGS} -munsafe-fp-atomics -Wno-unused-command-line-argument")
 endif()
-set(CMAKE_HIP_STANDARD 14)
+set(CMAKE_HIP_STANDARD 17)
diff --git a/examples/custom-matrix-format/CMakeLists.txt b/examples/custom-matrix-format/CMakeLists.txt
@@ -12,7 +12,7 @@ if(NOT (GINKGO_BUILD_CUDA AND GINKGO_BUILD_OMP))
         "This example needs Ginkgo built with CUDA and OpenMP support")
 endif()
 
-set(CMAKE_CUDA_STANDARD 14)
+set(CMAKE_CUDA_STANDARD 17)
 set(CMAKE_CUDA_STANDARD_REQUIRED ON)
 
 add_executable(custom-matrix-format custom-matrix-format.cpp stencil_kernel.cu)

diff --git a/test/test_install/CMakeLists.txt b/test/test_install/CMakeLists.txt
@@ -38,7 +38,7 @@ if(GINKGO_BUILD_CUDA)
     enable_language(CUDA)
     configure_file(test_install.cpp test_install.cu COPYONLY)
     add_executable(test_install_cuda ${CMAKE_CURRENT_BINARY_DIR}/test_install.cu)
-    set_target_properties(test_install_cuda PROPERTIES CUDA_STANDARD 14)
+    set_target_properties(test_install_cuda PROPERTIES CUDA_STANDARD 17)
     target_compile_definitions(test_install_cuda PRIVATE HAS_CUDA=1)
     target_compile_definitions(test_install_cuda PRIVATE HAS_REFERENCE=${HAS_REFERENCE})
     target_link_libraries(test_install_cuda PRIVATE Ginkgo::ginkgo)
@@ -49,7 +49,7 @@ if(GINKGO_BUILD_HIP)
     configure_file(test_install.cpp test_install.hip.cpp COPYONLY)
     set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/test_install.hip.cpp PROPERTIES LANGUAGE HIP)
     add_executable(test_install_hip ${CMAKE_CURRENT_BINARY_DIR}/test_install.hip.cpp)
-    set_target_properties(test_install_hip PROPERTIES HIP_STANDARD 14)
+    set_target_properties(test_install_hip PROPERTIES HIP_STANDARD 17)
 
     target_link_libraries(test_install_hip PRIVATE Ginkgo::ginkgo)
     target_compile_definitions(test_install_hip PRIVATE HAS_HIP=1)