faster cylinder

Author: aghaeifar

CMakeLists.txt

@@ -11,6 +11,8 @@ find_package(OpenMP REQUIRED)
 find_package(Boost COMPONENTS program_options log log_setup REQUIRED)
 # FindCUDA module
 find_package(CUDA)
+# Find TBB
+find_package(TBB REQUIRED)
 
 # Check for CUDA-capable GPU
 if(CUDA_FOUND)
@@ -30,30 +32,23 @@ else()
 endif()
 
 set(CMAKE_CXX_STANDARD 20)
-set(CMAKE_CXX_FLAGS "-lboost_program_options")
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
+set(CMAKE_CXX_FLAGS "-lboost_program_options")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
 set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_EXE_LINKER_FLAGS}")
 set(Boost_USE_STATIC_LIBS OFF)
 
 # Add Boost and CUDA include directories
 include_directories(${Boost_INCLUDE_DIRS} ${HDF5_INCLUDE_DIRS} ./include ./src ./src/shapes)
 # Add the executable
-add_executable(spinwalk ./src/spinwalk.cu ./src/kernels.cu ./src/file_utils.cpp ./src/shapes/shape_base.cpp ./src/shapes/cylinder.cpp ./src/shapes/sphere.cpp)
+add_executable(spinwalk ./src/spinwalk.cu ./src/kernels.cu ./src/file_utils.cpp ./src/shapes/shape_base.cu ./src/shapes/cylinder.cu ./src/shapes/sphere.cu)
 # Link CUDA and OpenMP libraries
-if (UNIX)
-# Find TBB
-    find_package(TBB REQUIRED)
-    target_link_libraries(spinwalk ${CUDA_LIBRARIES} ${OpenMP_CXX_LIBRARIES} ${Boost_LIBRARIES} ${HDF5_CXX_LIBRARIES} TBB::tbb)
-    install(TARGETS spinwalk DESTINATION bin) 
-elseif (WIN32)
-IF(MSVC)
-    ADD_DEFINITIONS("/EHsc")
-ENDIF(MSVC)
-    target_link_libraries(spinwalk ${CUDA_LIBRARIES} ${OpenMP_CXX_LIBRARIES} ${Boost_LIBRARIES} ${HDF5_CXX_LIBRARIES})
-endif()
 
+target_link_libraries(spinwalk ${CUDA_LIBRARIES} ${OpenMP_CXX_LIBRARIES} ${Boost_LIBRARIES} ${HDF5_CXX_LIBRARIES} TBB::tbb)
 
+if (UNIX)
+install(TARGETS spinwalk DESTINATION bin) 
+endif()
 
 # cmake ..
 # cmake --build . --config Release