Latest

CMakeLists.txt

@@ -3,6 +3,10 @@ project(openfpm_pdata LANGUAGES C CXX)
 
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake_modules/)
 
+if (POLICY CMP0074)
+  cmake_policy(SET CMP0074 NEW)
+endif()
+
 set(BOOST_INCLUDE ${Boost_INCLUDE_DIR} CACHE PATH "Include directory for BOOST")
 set(SE_CLASS1 CACHE BOOL "Activate compilation with SE_CLASS1")
 set(SE_CLASS2 CACHE BOOL "Activate compilation with SE_CLASS2")

src/CMakeLists.txt

@@ -24,7 +24,7 @@ if(CUDA_FOUND)
 	target_compile_options(vcluster_test PUBLIC $<$<COMPILE_LANGUAGE:CUDA>: ${WARNING_SUPPRESSION_AND_OPTION_NVCC} >)
 	target_include_directories (vcluster_test PUBLIC ${MPI_C_INCLUDE_DIRS})
         if (TEST_COVERAGE)
-                target_compile_options(mem PRIVATE $<$<COMPILE_LANGUAGE:CUDA>: -Xcompiler "-fprofile-arcs -ftest-coverage" >)
+                target_compile_options(vcluster_test PRIVATE $<$<COMPILE_LANGUAGE:CUDA>: -Xcompiler "-fprofile-arcs -ftest-coverage" >)
         endif()
 endif()
 

src/VCluster/VCluster_base.hpp

@@ -360,7 +360,14 @@ public:
 		bar_req = MPI_Request();
 		bar_stat = MPI_Status();
 
-		context = new mgpu::ofp_context_t(mgpu::gpu_context_opt::no_print_props,shmrank);
+#ifdef EXTERNAL_SET_GPU
+                int dev;
+                cudaGetDevice(&dev);
+                context = new mgpu::ofp_context_t(mgpu::gpu_context_opt::no_print_props,dev);
+#else
+                context = new mgpu::ofp_context_t(mgpu::gpu_context_opt::no_print_props,shmrank);
+#endif
+
 
 #if defined(PRINT_RANK_TO_GPU) && defined(CUDA_GPU)