Review update.

+ Change GINKGO_AMDGPU_FLAGS to GINKGO_AMD_ARCH_FLAGS + Add the flag to the proper information places (get_info.cmake, GinkgoConfig.cmake) + Shorten the HIP get_info.cmake + Update the CAS to properly detect SM architectures with CUDA >= 11.0 Co-authored-by: Yuhsiang Tsai <yhmtsai@gmail.com>
ginkgo-project · Feb 1, 2021 · 3dafe66 · 3dafe66
1 parent 9cef214
commit 3dafe66
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 25 deletions.
diff --git a/cmake/GinkgoConfig.cmake.in b/cmake/GinkgoConfig.cmake.in
@@ -72,6 +72,7 @@ set(GINKGO_HIP_CLANG_COMPILER_FLAGS @GINKGO_HIP_CLANG_COMPILER_FLAGS@)
 set(GINKGO_HIP_PLATFORM @GINKGO_HIP_PLATFORM@)
 set(GINKGO_HIP_AMDGPU @GINKGO_HIP_AMDGPU@)
 set(GINKGO_HIP_VERSION @GINKGO_HIP_VERSION@)
+set(GINKGO_AMD_ARCH_FLAGS @GINKGO_AMD_ARCH_FLAGS@)
 
 set(GINKGO_DPCPP_VERSION @GINKGO_DPCPP_VERSION@)
 set(GINKGO_DPCPP_FLAGS @GINKGO_DPCPP_FLAGS@)

diff --git a/hip/CMakeLists.txt b/hip/CMakeLists.txt
@@ -245,14 +245,14 @@ endif()
 # Thus, we need to pass the flags to `hip_add_library` itself
 if(GINKGO_HIP_AMDGPU)
     foreach(target ${GINKGO_HIP_AMDGPU})
-        list(APPEND GINKGO_AMDGPU_FLAGS --amdgpu-target=${target})
+        list(APPEND GINKGO_AMD_ARCH_FLAGS --amdgpu-target=${target})
     endforeach()
 endif()
 
 set(GINKGO_HIPCC_OPTIONS ${GINKGO_HIP_COMPILER_FLAGS})
 set(GINKGO_HIP_NVCC_OPTIONS ${GINKGO_HIP_NVCC_COMPILER_FLAGS} ${GINKGO_HIP_NVCC_ARCH} ${GINKGO_HIP_NVCC_ADDITIONAL_FLAGS})
-set(GINKGO_HIP_HCC_OPTIONS ${GINKGO_HIP_HCC_COMPILER_FLAGS} ${GINKGO_AMDGPU_FLAGS})
-set(GINKGO_HIP_CLANG_OPTIONS ${GINKGO_HIP_CLANG_COMPILER_FLAGS} ${GINKGO_AMDGPU_FLAGS})
+set(GINKGO_HIP_HCC_OPTIONS ${GINKGO_HIP_HCC_COMPILER_FLAGS} ${GINKGO_AMD_ARCH_FLAGS})
+set(GINKGO_HIP_CLANG_OPTIONS ${GINKGO_HIP_CLANG_COMPILER_FLAGS} ${GINKGO_AMD_ARCH_FLAGS})
 
 set_source_files_properties(${GINKGO_HIP_SOURCES} PROPERTIES HIP_SOURCE_PROPERTY_FORMAT TRUE)
 if (GINKGO_HIP_VERSION VERSION_GREATER_EQUAL "3.5")

diff --git a/hip/get_info.cmake b/hip/get_info.cmake
@@ -1,21 +1,14 @@
-set(log_types "detailed_log")
-foreach(log_type ${log_types})
-    ginkgo_print_module_header(${${log_type}} "HIP")
-    set(print_var "GINKGO_HIPCONFIG_PATH;GINKGO_HIP_AMDGPU;GINKGO_HIP_HCC_COMPILER_FLAGS;GINKGO_HIP_NVCC_COMPILER_FLAGS;GINKGO_HIP_THRUST_PATH"
-        )
-    foreach(var ${print_var})
-        ginkgo_print_variable(${${log_type}} ${var} )
-    endforeach()
-endforeach()
-foreach(log_type ${log_types})
-    ginkgo_print_module_footer(${${log_type}} "HIP variables:")
-    set(print_var "HIP_VERSION;HIP_COMPILER;HIP_PATH;ROCM_PATH;HIP_PLATFORM;HIP_ROOT_DIR;HCC_PATH;HIP_RUNTIME;HIPBLAS_PATH;HIPSPARSE_PATH;HIPRAND_PATH;ROCRAND_PATH;HIP_CLANG_INCLUDE_PATH;HIP_CLANG_PATH;HIP_HIPCC_EXECUTABLE;HIP_HIPCONFIG_EXECUTABLE;HIP_HOST_COMPILATION_CPP"
-        )
-    foreach(var ${print_var})
-        ginkgo_print_variable(${${log_type}} ${var} )
-    endforeach()
-    ginkgo_print_flags(${detailed_log} "HIP_HCC_FLAGS")
-    ginkgo_print_flags(${detailed_log} "HIP_HIPCC_FLAGS")
-    ginkgo_print_flags(${detailed_log} "HIP_NVCC_FLAGS")
-    ginkgo_print_module_footer(${detailed_log} "")
-endforeach()
+ginkgo_print_module_header(${detailed_log} "HIP")
+ginkgo_print_foreach_variable("GINKGO_HIPCONFIG_PATH;GINKGO_HIP_AMDGPU"
+    "GINKGO_HIP_HCC_COMPILER_FLAGS;GINKGO_HIP_NVCC_COMPILER_FLAGS"
+    "GINKGO_HIP_THRUST_PATH;GINKGO_AMD_ARCH_FLAGS")
+ginkgo_print_module_footer(${detailed_log} "HIP variables:")
+ginkgo_print_foreach_variable("HIP_VERSION;HIP_COMPILER;HIP_PATH;ROCM_PATH"
+    "HIP_PLATFORM;HIP_ROOT_DIR;HCC_PATH;HIP_RUNTIME;HIPBLAS_PATH;HIPSPARSE_PATH"
+    "HIPRAND_PATH;ROCRAND_PATH;HIP_CLANG_INCLUDE_PATH;HIP_CLANG_PATH"
+    "HIP_HIPCC_EXECUTABLE;HIP_HIPCONFIG_EXECUTABLE;HIP_HOST_COMPILATION_CPP")
+ginkgo_print_flags(${detailed_log} "HIP_HCC_FLAGS")
+ginkgo_print_flags(${detailed_log} "HIP_HIPCC_FLAGS")
+ginkgo_print_flags(${detailed_log} "HIP_NVCC_FLAGS")
+ginkgo_print_flags(${detailed_log} "HIP_CLANG_FLAGS")
+ginkgo_print_module_footer(${detailed_log} "")
diff --git a/third_party/CudaArchitectureSelector/CMakeLists.txt b/third_party/CudaArchitectureSelector/CMakeLists.txt
@@ -1,7 +1,7 @@
 message(STATUS "Configuring and building CAS")
 ginkgo_load_git_package(CudaArchitectureSelector
     "https://github.com/ginkgo-project/CudaArchitectureSelector.git"
-    "50277af53b8f02b49261ab62fb5bdcbab5c2e88c")
+    "46ac1ffa127f94225b9cc1ebb3ee179ec789c802")
 add_subdirectory(${CMAKE_CURRENT_BINARY_DIR}/src
     ${CMAKE_CURRENT_BINARY_DIR}/build EXCLUDE_FROM_ALL)
 set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" PARENT_SCOPE)