Commit acbc6031 authored by Christoph Junghans's avatar Christoph Junghans
Browse files

GPU: clean up part 2

parent e6f5f77e
Loading
Loading
Loading
Loading
+2 −3
Original line number Diff line number Diff line
@@ -427,11 +427,10 @@ if(ENABLE_GPU)
    endif()
    include_directories(${CUDA_TOOLKIT_INCLUDE})
    set(CUDA_BUILD_CUBIN ON)
    set(CUDA_GENERATED_OUTPUT_DIR ${LAMMPS_LIB_BINARY_DIR}/gpu)
    set(GPU_PREC "SINGLE_DOUBLE" CACHE STRING "Lammps gpu precision size")
    set_property(CACHE GPU_PREC PROPERTY STRINGS SINGLE_DOUBLE SINGLE_SINGLE DOUBLE_DOUBLE)
    add_definitions(-D_${GPU_PREC})
    add_definitions(-DNV_KERNEL -DUSE_CUDPP -DUCL_CUDADR -DCMAKE_GPU)
    add_definitions(-DNV_KERNEL -DUSE_CUDPP -DUCL_CUDADR)

    set(GPU_SOURCES_DIR ${LAMMPS_SOURCE_DIR}/GPU)
    set(GPU_SOURCES ${GPU_SOURCES_DIR}/gpu_extra.h)
@@ -444,7 +443,7 @@ if(ENABLE_GPU)
    get_property(GPU_SOURCES GLOBAL PROPERTY GPU_SOURCES)
    
    file(GLOB_RECURSE GPU_LIB_SOURCES ${LAMMPS_LIB_SOURCE_DIR}/gpu/*.cpp)
    file(GLOB_RECURSE GPU_LIB_CU ${LAMMPS_LIB_SOURCE_DIR}/gpu/*.cu)
    file(GLOB_RECURSE GPU_LIB_CU ${LAMMPS_LIB_SOURCE_DIR}/gpu/*.cu ${CMAKE_SOURCE_DIR}/gpu/*.cu)
    file(GLOB_RECURSE GPU_NOT_LIB_CU ${LAMMPS_LIB_SOURCE_DIR}/gpu/lal_pppm.cu)
    list(REMOVE_ITEM GPU_LIB_CU ${GPU_NOT_LIB_CU})
    add_custom_target(gpu_objs)
+0 −2
Original line number Diff line number Diff line
#ifdef CMAKE_GPU
#define grdtyp double
#define grdtyp4 double4
#endif

#include "lal_pppm.cu"
+0 −2
Original line number Diff line number Diff line
#ifdef CMAKE_GPU
#define grdtyp float
#define grdtyp4 float4
#endif

#include "lal_pppm.cu"