Merge pull request #65 from junghans/collected-small-changes (ad47b64c) · Commits · 郑智淋 / lammps

cmake/Modules/Packages/GPU.cmake

+6 −10

Original line number	Diff line number	Diff line
		@@ -99,9 +99,6 @@ if(GPU_API STREQUAL "CUDA")
		add_library(gpu STATIC ${GPU_LIB_SOURCES} ${GPU_LIB_CUDPP_SOURCES} ${GPU_OBJS})
		target_link_libraries(gpu PRIVATE ${CUDA_LIBRARIES} ${CUDA_CUDA_LIBRARY})
		target_include_directories(gpu PRIVATE ${LAMMPS_LIB_BINARY_DIR}/gpu ${CUDA_INCLUDE_DIRS})
		if(NOT BUILD_MPI)
		target_include_directories(gpu PRIVATE ${LAMMPS_SOURCE_DIR}/STUBS)
		endif()
		target_compile_definitions(gpu PRIVATE -D_${GPU_PREC_SETTING} -DMPI_GERYON -DUCL_NO_EXIT ${GPU_CUDA_MPS_FLAGS})
		if(CUDPP_OPT)
		target_include_directories(gpu PRIVATE ${LAMMPS_LIB_SOURCE_DIR}/gpu/cudpp_mini)
		@@ -180,9 +177,6 @@ elseif(GPU_API STREQUAL "OPENCL")
		add_library(gpu STATIC ${GPU_LIB_SOURCES})
		target_link_libraries(gpu PRIVATE OpenCL::OpenCL)
		target_include_directories(gpu PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/gpu)
		if(NOT BUILD_MPI)
		target_include_directories(gpu PRIVATE ${LAMMPS_SOURCE_DIR}/STUBS)
		endif()
		target_compile_definitions(gpu PRIVATE -D_${GPU_PREC_SETTING} -D${OCL_TUNE}_OCL -DMPI_GERYON -DUCL_NO_EXIT)
		target_compile_definitions(gpu PRIVATE -DUSE_OPENCL)

		@@ -286,9 +280,6 @@ elseif(GPU_API STREQUAL "HIP")

		hip_add_library(gpu STATIC ${GPU_LIB_SOURCES})
		target_include_directories(gpu PRIVATE ${LAMMPS_LIB_BINARY_DIR}/gpu)
		if(NOT BUILD_MPI)
		target_include_directories(gpu PRIVATE ${LAMMPS_SOURCE_DIR}/STUBS)
		endif()
		target_compile_definitions(gpu PRIVATE -D_${GPU_PREC_SETTING} -DMPI_GERYON -DUCL_NO_EXIT)
		target_compile_definitions(gpu PRIVATE -DUSE_HIP)

		@@ -368,7 +359,12 @@ RegisterStylesExt(${GPU_SOURCES_DIR} gpu GPU_SOURCES)

		get_property(GPU_SOURCES GLOBAL PROPERTY GPU_SOURCES)

		if(NOT BUILD_MPI)
		# mpistubs is aliased to MPI::MPI_CXX, but older versions of cmake won't work forward the include path
		target_link_libraries(gpu PRIVATE mpi_stubs)
		else()
		target_link_libraries(gpu PRIVATE MPI::MPI_CXX)
		endif()
		if(NOT BUILD_SHARED_LIBS)
		install(TARGETS gpu EXPORT LAMMPS_Targets LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
		endif()

Admin message