Skip to content
Snippets Groups Projects
Commit 1f65150e authored by Steven J. Plimpton's avatar Steven J. Plimpton
Browse files

60 -> sm_60 for GPU_ARCH

parent 9c3748e0
No related branches found
No related tags found
No related merge requests found
...@@ -834,7 +834,7 @@ if(PKG_GPU) ...@@ -834,7 +834,7 @@ if(PKG_GPU)
endif() endif()
option(CUDPP_OPT "Enable CUDPP_OPT" ON) option(CUDPP_OPT "Enable CUDPP_OPT" ON)
set(GPU_ARCH "30" CACHE STRING "LAMMPS GPU CUDA SM architecture (e.g. 60)") set(GPU_ARCH "sm_30" CACHE STRING "LAMMPS GPU CUDA SM architecture (e.g. sm_60)")
file(GLOB GPU_LIB_CU ${LAMMPS_LIB_SOURCE_DIR}/gpu/*.cu ${CMAKE_CURRENT_SOURCE_DIR}/gpu/*.cu) file(GLOB GPU_LIB_CU ${LAMMPS_LIB_SOURCE_DIR}/gpu/*.cu ${CMAKE_CURRENT_SOURCE_DIR}/gpu/*.cu)
list(REMOVE_ITEM GPU_LIB_CU ${LAMMPS_LIB_SOURCE_DIR}/gpu/lal_pppm.cu) list(REMOVE_ITEM GPU_LIB_CU ${LAMMPS_LIB_SOURCE_DIR}/gpu/lal_pppm.cu)
...@@ -848,10 +848,10 @@ if(PKG_GPU) ...@@ -848,10 +848,10 @@ if(PKG_GPU)
endif() endif()
cuda_compile_cubin(GPU_GEN_OBJS ${GPU_LIB_CU} OPTIONS cuda_compile_cubin(GPU_GEN_OBJS ${GPU_LIB_CU} OPTIONS
-DUNIX -O3 -Xptxas -v --use_fast_math -DNV_KERNEL -DUCL_CUDADR -arch=sm_${GPU_ARCH} -D_${GPU_PREC_SETTING}) -DUNIX -O3 -Xptxas -v --use_fast_math -DNV_KERNEL -DUCL_CUDADR -arch=${GPU_ARCH} -D_${GPU_PREC_SETTING})
cuda_compile(GPU_OBJS ${GPU_LIB_CUDPP_CU} OPTIONS $<$<BOOL:${BUILD_SHARED_LIBS}>:-Xcompiler=-fPIC> cuda_compile(GPU_OBJS ${GPU_LIB_CUDPP_CU} OPTIONS $<$<BOOL:${BUILD_SHARED_LIBS}>:-Xcompiler=-fPIC>
-DUNIX -O3 -Xptxas -v --use_fast_math -DUCL_CUDADR -arch=sm_${GPU_ARCH} -D_${GPU_PREC_SETTING}) -DUNIX -O3 -Xptxas -v --use_fast_math -DUCL_CUDADR -arch=${GPU_ARCH} -D_${GPU_PREC_SETTING})
foreach(CU_OBJ ${GPU_GEN_OBJS}) foreach(CU_OBJ ${GPU_GEN_OBJS})
get_filename_component(CU_NAME ${CU_OBJ} NAME_WE) get_filename_component(CU_NAME ${CU_OBJ} NAME_WE)
...@@ -1160,7 +1160,7 @@ endif() ...@@ -1160,7 +1160,7 @@ endif()
if(PKG_GPU) if(PKG_GPU)
message(STATUS "GPU Api: ${GPU_API}") message(STATUS "GPU Api: ${GPU_API}")
if(GPU_API_DEFINE STREQUAL "CUDA") if(GPU_API_DEFINE STREQUAL "CUDA")
message(STATUS "GPU Arch: sm_${GPU_ARCH}") message(STATUS "GPU Arch: ${GPU_ARCH}")
elseif(GPU_API_DEFINE STREQUAL "OPENCL") elseif(GPU_API_DEFINE STREQUAL "OPENCL")
message(STATUS "OCL Tune: ${OCL_TUNE}") message(STATUS "OCL Tune: ${OCL_TUNE}")
endif() endif()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment