From f63eec695395f2e649ddfe95d053d91c80ceb76e Mon Sep 17 00:00:00 2001 From: Richard Berger Date: Mon, 6 Mar 2023 09:48:54 -0700 Subject: [PATCH] gpu: drop hcc as platform and inherit compile defs hip::host already adds the __HIP_PLATFORM_AMD__ definition See https://github.com/ROCm-Developer-Tools/hipamd/blob/develop/hip-config.cmake.in#L180 --- cmake/Modules/Packages/GPU.cmake | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/cmake/Modules/Packages/GPU.cmake b/cmake/Modules/Packages/GPU.cmake index 21d046606f..7317ae1c20 100644 --- a/cmake/Modules/Packages/GPU.cmake +++ b/cmake/Modules/Packages/GPU.cmake @@ -285,7 +285,7 @@ elseif(GPU_API STREQUAL "HIP") set(ENV{HIP_PLATFORM} ${HIP_PLATFORM}) - if(HIP_PLATFORM STREQUAL "hcc" OR HIP_PLATFORM STREQUAL "amd") + if(HIP_PLATFORM STREQUAL "amd") set(HIP_ARCH "gfx906" CACHE STRING "HIP target architecture") elseif(HIP_PLATFORM STREQUAL "spirv") set(HIP_ARCH "spirv" CACHE STRING "HIP target architecture") @@ -358,7 +358,7 @@ elseif(GPU_API STREQUAL "HIP") set(CUBIN_FILE "${LAMMPS_LIB_BINARY_DIR}/gpu/${CU_NAME}.cubin") set(CUBIN_H_FILE "${LAMMPS_LIB_BINARY_DIR}/gpu/${CU_NAME}_cubin.h") - if(HIP_PLATFORM STREQUAL "hcc" OR HIP_PLATFORM STREQUAL "amd") + if(HIP_PLATFORM STREQUAL "amd") configure_file(${CU_FILE} ${CU_CPP_FILE} COPYONLY) if(HIP_COMPILER STREQUAL "clang") @@ -472,12 +472,6 @@ elseif(GPU_API STREQUAL "HIP") target_compile_definitions(hip_get_devices PRIVATE -D__HIP_PLATFORM_NVCC__) target_include_directories(hip_get_devices PRIVATE ${CUDA_INCLUDE_DIRS}) target_link_libraries(hip_get_devices PRIVATE ${CUDA_LIBRARIES} ${CUDA_CUDA_LIBRARY}) - elseif(HIP_PLATFORM STREQUAL "hcc") - target_compile_definitions(gpu PRIVATE -D__HIP_PLATFORM_HCC__) - target_compile_definitions(hip_get_devices PRIVATE -D__HIP_PLATFORM_HCC__) - elseif(HIP_PLATFORM STREQUAL "amd") - target_compile_definitions(gpu PRIVATE -D__HIP_PLATFORM_AMD__) - target_compile_definitions(hip_get_devices PRIVATE -D__HIP_PLATFORM_AMD__) endif() target_link_libraries(lammps PRIVATE gpu)