Merge pull request #1393 from akohlmey/collected-small-changes (dd22b80a) · Commits · 郑智淋 / lammps

cmake/CMakeLists.txt

+5 −1

Original line number	Diff line number	Diff line
		@@ -1168,6 +1168,10 @@ if(PKG_GPU)
		message(FATAL_ERROR "Could not find bin2c, use -DBIN2C=/path/to/bin2c to help cmake finding it.")
		endif()
		option(CUDPP_OPT "Enable CUDPP_OPT" ON)
		option(CUDA_MPS_SUPPORT "Enable tweaks to support CUDA Multi-process service (MPS)" OFF)
		if(CUDA_MPS_SUPPORT)
		set(GPU_CUDA_MPS_FLAGS "-DCUDA_PROXY")
		endif()

		set(GPU_ARCH "sm_30" CACHE STRING "LAMMPS GPU CUDA SM primary architecture (e.g. sm_60)")

		@@ -1231,7 +1235,7 @@ if(PKG_GPU)
		add_library(gpu STATIC ${GPU_LIB_SOURCES} ${GPU_LIB_CUDPP_SOURCES} ${GPU_OBJS})
		target_link_libraries(gpu ${CUDA_LIBRARIES} ${CUDA_CUDA_LIBRARY})
		target_include_directories(gpu PRIVATE ${LAMMPS_LIB_BINARY_DIR}/gpu ${CUDA_INCLUDE_DIRS})
		target_compile_definitions(gpu PRIVATE -D_${GPU_PREC_SETTING} -DMPI_GERYON -DUCL_NO_EXIT)
		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)
		target_compile_definitions(gpu PRIVATE -DUSE_CUDPP)

+10 −0

Original line number	Diff line number	Diff line
		@@ -1503,6 +1503,16 @@ target API.
		</dl>
		</td>
		</tr>
		<tr>
		<td><code>CUDA_MPS_SUPPORT</code> (CUDA only)</td>
		<td>Enable tweaks for running with Nvidia CUDA Multi-process services daemon</td>
		<td>
		<dl>
		<dt><code>on</code></dt>
		<dt><code>off</code> (default)</dt>
		</dl>
		</td>
		</tr>
		<tr>
		<td><code>BIN2C</code> (CUDA only)</td>
		<td>Path to bin2c executable, will automatically pick up the first one in your $PATH.</td>

+1 −1

+13 −11

Original line number	Diff line number	Diff line
		@@ -92,7 +92,9 @@ which GPU hardware to build for.
		# default is Cuda-compiler dependent, but typically sm_20
		-D CUDPP_OPT=value # optimization setting for GPU_API=cuda
		# enables CUDA Performance Primitives Optimizations
		# yes (default) or no :pre
		# value = yes (default) or no
		-D CUDA_MPS_SUPPORT=value # enables some tweaks required to run with active nvidia-cuda-mps daemon
		# value = yes or no (default) :pre

		GPU_ARCH settings for different GPU hardware is as follows:

+3 −0