working cuda example

studouglas · Nov 17, 2015 · 716e5ff · 716e5ff
1 parent bea3b45
commit 716e5ff
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,7 +15,8 @@ G4STORK/Build-xcode
 G4STORK/Build-xcode-serial
 geant4.10.00.p02-build-xcode
 
-CUDA-test/bin
+CUDA_simpleTest/bin
+CUDA_Hadr04
 
 # Geant / G4STORK build files
 G4STORK/Build/*

diff --git a/CUDA-test/src/CMakeLists.txt → CUDA_simpleTest/src/CMakeLists.txt b/CUDA-test/src/CMakeLists.txt → CUDA_simpleTest/src/CMakeLists.txt
diff --git a/CUDA-test/src/DeviceMain.cu → CUDA_simpleTest/src/DeviceMain.cu b/CUDA-test/src/DeviceMain.cu → CUDA_simpleTest/src/DeviceMain.cu
diff --git a/CUDA-test/src/DeviceMain.h → CUDA_simpleTest/src/DeviceMain.h b/CUDA-test/src/DeviceMain.h → CUDA_simpleTest/src/DeviceMain.h
diff --git a/CUDA-test/src/HostMain.cpp → CUDA_simpleTest/src/HostMain.cpp b/CUDA-test/src/HostMain.cpp → CUDA_simpleTest/src/HostMain.cpp
diff --git a/geant4.10.00.p02/source/processes/hadronic/models/neutron_hp/CMakeLists.txt b/geant4.10.00.p02/source/processes/hadronic/models/neutron_hp/CMakeLists.txt
@@ -11,7 +11,7 @@
 #
 #------------------------------------------------------------------------------
 
-add_subdirectory(cuda)
+#add_subdirectory(cuda)
 
 if(GEANT4_BUILD_GRANULAR_LIBS)
     include(Geant4MacroLibraryTargets)

diff --git a/geant4.10.00.p02/source/processes/hadronic/models/neutron_hp/cuda/CMakeLists.txt b/geant4.10.00.p02/source/processes/hadronic/models/neutron_hp/cuda/CMakeLists.txt
@@ -1,12 +1,10 @@
 cmake_minimum_required (VERSION 2.8)
-
 find_package (CUDA REQUIRED)
 
 include_directories(/usr/local/cuda/include)
 
 cuda_add_library (CUDA_G4NeutronHPVector SHARED CUDA_G4NeutronHPVector.h CUDA_G4NeutronHPVector.cu)
 
-#LIST(APPEND CMAKE_CXX_FLAGS "-std=c++0x -O3 -ffast-math -Wall")
 LIST(APPEND CUDA_NVCC_FLAGS --compiler-options -fno-strict-aliasing -lineinfo -use_fast_math -Xptxas -dlcm=cg)
 LIST(APPEND CUDA_NVCC_FLAGS -gencode arch=compute_30,code=sm_30)