CMakefile update for ROCm 4.0 Starting with ROCm 4.0, the `hipconfig --platform` command will return `amd` (prior return value was `hcc`). Updating the CMakeLists.txt files in the test dirs to account for this change.
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index fa76347..59440cf 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt
@@ -431,7 +431,7 @@ execute_process(COMMAND ${HIP_PATH}/bin/hipconfig --platform OUTPUT_VARIABLE HIP_PLATFORM) - if (${HIP_PLATFORM} STREQUAL "hcc") + if ((${HIP_PLATFORM} STREQUAL "hcc") OR (${HIP_PLATFORM} STREQUAL "amd")) include_directories(${HIP_PATH}/include) @@ -439,7 +439,7 @@ ei_add_test(gpu_basic) unset(EIGEN_ADD_TEST_FILENAME_EXTENSION) - elseif (${HIP_PLATFORM} STREQUAL "nvcc") + elseif ((${HIP_PLATFORM} STREQUAL "nvcc") OR (${HIP_PLATFORM} STREQUAL "nvidia")) message(FATAL_ERROR "HIP_PLATFORM = nvcc is not supported within Eigen") else () message(FATAL_ERROR "Unknown HIP_PLATFORM = ${HIP_PLATFORM}")
diff --git a/unsupported/test/CMakeLists.txt b/unsupported/test/CMakeLists.txt index 298db04..4cb962a 100644 --- a/unsupported/test/CMakeLists.txt +++ b/unsupported/test/CMakeLists.txt
@@ -381,7 +381,7 @@ execute_process(COMMAND ${HIP_PATH}/bin/hipconfig --platform OUTPUT_VARIABLE HIP_PLATFORM) - if (${HIP_PLATFORM} STREQUAL "hcc") + if ((${HIP_PLATFORM} STREQUAL "hcc") OR (${HIP_PLATFORM} STREQUAL "amd")) include_directories(${CMAKE_CURRENT_BINARY_DIR}) include_directories(${HIP_PATH}/include) @@ -407,7 +407,7 @@ unset(EIGEN_ADD_TEST_FILENAME_EXTENSION) - elseif (${HIP_PLATFORM} STREQUAL "nvcc") + elseif ((${HIP_PLATFORM} STREQUAL "nvcc") OR (${HIP_PLATFORM} STREQUAL "nvidia")) message(FATAL_ERROR "HIP_PLATFORM = nvcc is not supported within Eigen") else () message(FATAL_ERROR "Unknown HIP_PLATFORM = ${HIP_PLATFORM}")