updates for building with hip (d3017744) · Commits · 郑智淋 / lammps

cmake/Modules/Packages/GPU.cmake

+6 −4

Original line number	Diff line number	Diff line
		@@ -278,7 +278,7 @@ elseif(GPU_API STREQUAL "HIP")

		set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${LAMMPS_LIB_BINARY_DIR}/gpu/_cubin.h ${LAMMPS_LIB_BINARY_DIR}/gpu/.cu.cpp")

		hip_add_library(gpu STATIC ${GPU_LIB_SOURCES})
		add_library(gpu STATIC ${GPU_LIB_SOURCES})
		target_include_directories(gpu PRIVATE ${LAMMPS_LIB_BINARY_DIR}/gpu)
		target_compile_definitions(gpu PRIVATE -D_${GPU_PREC_SETTING} -DMPI_GERYON -DUCL_NO_EXIT)
		target_compile_definitions(gpu PRIVATE -DUSE_HIP)
		@@ -330,7 +330,7 @@ elseif(GPU_API STREQUAL "HIP")

		if(HIP_PLATFORM STREQUAL "nvcc")
		target_compile_definitions(gpu PRIVATE -D__HIP_PLATFORM_NVCC__)
		target_include_directories(gpu PRIVATE ${HIP_ROOT_DIR}/include)
		target_include_directories(gpu PRIVATE ${HIP_ROOT_DIR}/../include)
		target_include_directories(gpu PRIVATE ${CUDA_INCLUDE_DIRS})
		target_link_libraries(gpu PRIVATE ${CUDA_LIBRARIES} ${CUDA_CUDA_LIBRARY})

		@@ -339,9 +339,11 @@ elseif(GPU_API STREQUAL "HIP")
		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_include_directories(gpu PRIVATE ${HIP_ROOT_DIR}/../include)

		target_compile_definitions(hip_get_devices PRIVATE -D__HIP_PLATFORM_HCC__)
		target_include_directories(hip_get_devices PRIVATE ${HIP_ROOT_DIR}/include)
		target_include_directories(hip_get_devices PRIVATE ${HIP_ROOT_DIR}/../hsa/include)
		target_include_directories(hip_get_devices PRIVATE ${HIP_ROOT_DIR}/../include)
		endif()

		target_link_libraries(lammps PRIVATE gpu)

cmake/presets/hip.cmake

+4 −4

Original line number	Diff line number	Diff line
		# preset that will enable hcc plus gcc with support for MPI and OpenMP (on Linux boxes)
		# preset that will enable hipcc plus gcc with support for MPI and OpenMP (on Linux boxes)

		set(CMAKE_CXX_COMPILER "hcc" CACHE STRING "" FORCE)
		set(CMAKE_CXX_COMPILER "hipcc" CACHE STRING "" FORCE)
		set(CMAKE_C_COMPILER "gcc" CACHE STRING "" FORCE)
		set(CMAKE_CXX_FLAGS "-Wall -Wextra -g -O2 -DNDEBG" CACHE STRING "" FORCE)
		set(MPI_CXX "hcc" CACHE STRING "" FORCE)
		set(MPI_CXX "hipcc" CACHE STRING "" FORCE)
		set(MPI_CXX_COMPILER "mpicxx" CACHE STRING "" FORCE)
		unset(HAVE_OMP_H_INCLUDE CACHE)

		set(OpenMP_CXX "hcc" CACHE STRING "" FORCE)
		set(OpenMP_CXX "hipcc" CACHE STRING "" FORCE)
		set(OpenMP_CXX_FLAGS "-fopenmp" CACHE STRING "" FORCE)
		set(OpenMP_CXX_LIB_NAMES "omp" CACHE STRING "" FORCE)
		set(OpenMP_omp_LIBRARY "libomp.so" CACHE PATH "" FORCE)

Admin message