Merge branch 'cuda_on_cpu'

CMakeLists.txt

@@ -27,6 +27,8 @@ set(METIS_DIR ${METIS_ROOT})
 set(PARMETIS_DIR ${PARMETIS_ROOT})
 set(OPENBLAS_ROOT CACHE PATH "Root path for blas library")
 set(SuiteSparse_ROOT ${SUITESPARSE_ROOT})
+set(ALPAKA_ROOT CACHE PATH "Alpaka root path")
+set(CUDA_ON_CPU CACHE BOOL "Make Cuda work on heap")
 
 set (CMAKE_CXX_STANDARD 14)
 set (CMAKE_CUDA_STANDARD 14)
@@ -63,7 +65,7 @@ if(ENABLE_GPU)
         endif()
 endif()
 
-find_package(Boost 1.72.0 REQUIRED COMPONENTS unit_test_framework iostreams program_options)
+find_package(Boost 1.72.0 REQUIRED COMPONENTS unit_test_framework iostreams program_options fiber)
 find_package(MPI REQUIRED)
 find_package(PETSc)
 find_package(HDF5)

src/CMakeLists.txt

@@ -3,6 +3,15 @@ cmake_minimum_required(VERSION 3.8 FATAL_ERROR)
 ########################### Executables
 
 
+if (CUDA_ON_CPU)
+        add_definitions(-DCUDA_ON_CPU)
+        set_source_files_properties(${CUDA_SOURCES} PROPERTIES LANGUAGE CXX)
+        set_source_files_properties(${CUDA_SOURCES} PROPERTIES COMPILE_FLAGS "-D__NVCC__ -DCUDA_GPU -DCUDART_VERSION=11000")
+        if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+                add_definitions("-x c++")
+        endif()
+endif()
+
 if (CUDA_FOUND)
 	set(CUDA_SOURCES Operators/Vector/vector_dist_operators_unit_tests.cu
 					 Operators/Vector/vector_dist_operators_apply_kernel_unit_tests.cu)
@@ -19,12 +28,11 @@ add_executable(numerics ${OPENFPM_INIT_FILE} ${CUDA_SOURCES}
 						FiniteDifference/eq_unit_test.cpp  
 						Operators/Vector/vector_dist_operators_unit_tests.cpp 
 						Operators/Vector/vector_dist_operators_apply_kernel_unit_tests.cpp
-						../../openfpm_vcluster/src/VCluster/VCluster.cpp 
-						../../openfpm_devices/src/memory/CudaMemory.cu  
-						../../openfpm_devices/src/memory/HeapMemory.cpp 
-						../../openfpm_devices/src/memory/PtrMemory.cpp 
 						../../src/lib/pdata.cpp)
 
+add_dependencies(numerics ofpmmemory)
+add_dependencies(numerics vcluster)
+
 ###########################
 
 if ( CMAKE_COMPILER_IS_GNUCC )
@@ -55,6 +63,7 @@ target_include_directories (numerics PUBLIC ${HDF5_ROOT}/include)
 target_include_directories (numerics PUBLIC ${LIBHILBERT_INCLUDE_DIRS})
 target_include_directories (numerics PUBLIC ${Boost_INCLUDE_DIRS})
 target_include_directories (numerics PUBLIC ${Vc_INCLUDE_DIR})
+target_include_directories (numerics PUBLIC ${ALPAKA_ROOT}/include)
 if(EIGEN3_FOUND)
 	target_include_directories (numerics PUBLIC ${EIGEN3_INCLUDE_DIR})
 endif()
@@ -69,6 +78,8 @@ if(PETSC_FOUND)
 	target_include_directories (numerics PUBLIC ${PETSC_INCLUDES})
 	target_link_libraries(numerics ${PETSC_LIBRARIES})
 endif()
+target_link_libraries(numerics vcluster)
+target_link_libraries(numerics ofpmmemory)
 
 if(SuiteSparse_FOUND)
 	target_include_directories (numerics PUBLIC ${SuiteSparse_INCLUDE_DIRS})

src/Operators/Vector/vector_dist_operators_functions.hpp

@@ -9,7 +9,6 @@
 #define OPENFPM_NUMERICS_SRC_OPERATORS_VECTOR_VECTOR_DIST_OPERATORS_FUNCTIONS_HPP_
 
 #ifdef __NVCC__
-#include "util/cuda/moderngpu/kernel_reduce.hxx"
 #include "cuda/vector_dist_operators_cuda.cuh"
 #endif