Fixing CUDA

CMakeLists.txt

@@ -35,7 +35,7 @@ if (ENABLE_GPU)
                 set(WARNING_SUPPRESSION_AND_OPTION_NVCC  -Xcudafe "--display_error_number --diag_suppress=2976 --diag_suppress=2977 --diag_suppress=2979 --diag_suppress=186" --expt-extended-lambda)
 elseif ( CUDA_VERSION_MAJOR EQUAL 11 AND CUDA_VERSION_MINOR EQUAL 0 )
                 message("CUDA is compatible")
-                set(WARNING_SUPPRESSION_AND_OPTION_NVCC  -Xcudafe "--display_error_number --diag_suppress=3059 --diag_suppress=3058 --diag_suppress=3057 --diag_suppress=3056 --diag_suppress=611 --diag_suppress=186" --expt-extended-lambda)
+                set(WARNING_SUPPRESSION_AND_OPTION_NVCC  -Xcudafe "--display_error_number --diag_suppress=3059 --diag_suppress=3058 --diag_suppress=3057 --diag_suppress=3056 --diag_suppress=611 --diag_suppress=186 --diag_suppress=128" --expt-extended-lambda)
 elseif ( CUDA_VERSION_MAJOR EQUAL 11 AND CUDA_VERSION_MINOR EQUAL 1 )
                 message("CUDA is compatible 11.1")
                 set(WARNING_SUPPRESSION_AND_OPTION_NVCC  -Xcudafe "--display_error_number --diag_suppress=3124 --diag_suppress=3126 --diag_suppress=3125 --diag_suppress=3123 --diag_suppress=611  --diag_suppress=186 --diag_suppress=128" --expt-extended-lambda)

src/CMakeLists.txt

@@ -24,21 +24,28 @@ if ( CMAKE_COMPILER_IS_GNUCC )
     endif()
 endif()
 
+###########################
+
 add_library(vcluster STATIC VCluster/VCluster.cpp)
 add_library(vcluster_dl SHARED VCluster/VCluster.cpp)
 
-add_dependencies(vcluster_test ofpmmemory)
-
-###########################
-
 if(CUDA_FOUND)
 	target_compile_options(vcluster_test PUBLIC $<$<COMPILE_LANGUAGE:CUDA>: ${WARNING_SUPPRESSION_AND_OPTION_NVCC} >)
+        target_compile_options(vcluster PUBLIC $<$<COMPILE_LANGUAGE:CUDA>: ${WARNING_SUPPRESSION_AND_OPTION_NVCC} >)
+        target_compile_options(vcluster_dl 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(vcluster_test PRIVATE $<$<COMPILE_LANGUAGE:CUDA>: -Xcompiler "-fprofile-arcs -ftest-coverage" >)
         endif()
+
+        if (NOT CUDA_ON_CPU)
+                set_source_files_properties(VCluster/VCluster.cpp PROPERTIES LANGUAGE CUDA)
+        endif()
 endif()
 
+
+add_dependencies(vcluster_test ofpmmemory)
+
 target_include_directories (vcluster_test PUBLIC ${CUDA_INCLUDE_DIRS})
 target_include_directories (vcluster_test PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 target_include_directories (vcluster_test PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../openfpm_devices/src/)

src/VCluster/VCluster.cpp

@@ -58,7 +58,7 @@ double time_spent = 0.0;
  * This function MUST be called before any other function
  *
  */
-void openfpm_init(int *argc, char ***argv)
+void openfpm_init_vcl(int *argc, char ***argv)
 {
 #ifdef HAVE_PETSC
 
@@ -118,6 +118,24 @@ void openfpm_init(int *argc, char ***argv)
 #endif
 }
 
+size_t openfpm_vcluster_compilation_mask()
+{
+	size_t compiler_mask = 0;
+
+	#ifdef CUDA_ON_CPU
+	compiler_mask |= 0x1;
+	#endif
+
+	#ifdef __NVCC__
+	compiler_mask |= 0x02;
+	#endif
+
+	#ifdef CUDA_GPU
+	compiler_mask |= 0x04;
+	#endif
+
+	return compiler_mask;
+}
 
 /*! \brief Finalize the library
  *

src/VCluster/VCluster.hpp

@@ -13,6 +13,7 @@
 #include "VCluster_base.hpp"
 #include "VCluster_meta_function.hpp"
 #include "util/math_util_complex.hpp"
+#include "memory/mem_conf.hpp"
 
 #ifdef CUDA_GPU
 extern CudaMemory mem_tmp;
@@ -1426,8 +1427,9 @@ static inline bool is_openfpm_init()
  * This function MUST be called before any other function
  *
  */
-void openfpm_init(int *argc, char ***argv);
+void openfpm_init_vcl(int *argc, char ***argv);
 
+size_t openfpm_vcluster_compilation_mask();
 
 /*! \brief Finalize the library
  *
@@ -1436,6 +1438,54 @@ void openfpm_init(int *argc, char ***argv);
  */
 void openfpm_finalize();
 
+static std::string get_link_lib(size_t opt)
+{
+	std::string op;
+
+	if (opt & 0x01)
+	{
+		return "_cuda_on_cpu";
+	}
+
+	if (opt & 0x04)
+	{
+		return "_cuda";
+	}
+
+	return "";
+}
+
+/*! \brief Initialize the library
+ *
+ * This function MUST be called before any other function
+ *
+ */
+static void openfpm_init(int *argc, char ***argv)
+{
+	openfpm_init_vcl(argc,argv);
+
+	size_t compiler_mask = 0;
+
+	#ifdef CUDA_ON_CPU
+	compiler_mask |= 0x1;
+	#endif
+
+	#ifdef __NVCC__
+	compiler_mask |= 0x02;
+	#endif
+
+	#ifdef CUDA_GPU
+	compiler_mask |= 0x04;
+	#endif
+
+	if (compiler_mask != openfpm_vcluster_compilation_mask() || compiler_mask != openfpm_ofpmmemory_compilation_mask())
+	{
+		std::cout << __FILE__ << ":" << __LINE__ << " Error: with the compilation options you are using you should linking with " <<
+		                                              get_link_lib(compiler_mask) << " but you are linking with " <<
+		                                              "-lvcluster_" << get_link_lib(openfpm_vcluster_compilation_mask()) << " and -lofpmmemory_" << 
+													  get_link_lib(openfpm_ofpmmemory_compilation_mask()) << std::endl;
+	}
+}
 
 #endif