update extern 'C'

milk-org · Sep 27, 2020 · 7c400da · 7c400da
1 parent 1fbbd66
commit 7c400da
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 6 deletions.
diff --git a/cudacomp_types.h b/cudacomp_types.h
@@ -24,7 +24,7 @@ inline int testing_malloc_cpu_internal(void **ptr, size_t size, const char *var,
   do {                                                                    \
     testing_malloc_cpu_internal((void **)&ptr, size * sizeof(type), #ptr, \
                                 __FUNCTION__, __FILE__, __LINE__);        \
-  } while (0);
+  } while (0)
 
 #define TESTING_FREE_CPU(ptr) free(ptr)
 
@@ -45,7 +45,7 @@ inline int testing_malloc_pin_internal(void **ptr, size_t size, const char *var,
   do {                                                                    \
     testing_malloc_pin_internal((void **)&ptr, size * sizeof(type), #ptr, \
                                 __FUNCTION__, __FILE__, __LINE__);        \
-  } while (0);
+  } while (0)
 
 inline int testing_free_pin_internal(void *ptr, const char *var,
                                      const char *func, const char *file,
@@ -61,7 +61,7 @@ inline int testing_free_pin_internal(void *ptr, const char *var,
 #define TESTING_FREE_PIN(ptr)                                               \
   do {                                                                      \
     testing_free_pin_internal(ptr, #ptr, __FUNCTION__, __FILE__, __LINE__); \
-  } while (0);
+  } while (0)
 
 /******************* GPU memory */
 inline int testing_malloc_dev_internal(void **ptr, size_t size, const char *var,
@@ -79,7 +79,7 @@ inline int testing_malloc_dev_internal(void **ptr, size_t size, const char *var,
   do {                                                                    \
     testing_malloc_dev_internal((void **)&ptr, size * sizeof(type), #ptr, \
                                 __FUNCTION__, __FILE__, __LINE__);        \
-  } while (0);
+  } while (0)
 
 inline int testing_free_dev_internal(void *ptr, const char *var,
                                      const char *func, const char *file,
@@ -95,7 +95,7 @@ inline int testing_free_dev_internal(void *ptr, const char *var,
 #define TESTING_FREE_DEV(ptr)                                               \
   do {                                                                      \
     testing_free_dev_internal(ptr, #ptr, __FUNCTION__, __FILE__, __LINE__); \
-  } while (0);
+  } while (0)
 
 #endif  // HAVE_CUDA
 

diff --git a/cusolver_compute_SVDpseudoInverse.c b/cusolver_compute_SVDpseudoInverse.c
@@ -21,7 +21,9 @@ typedef int errno_t;
 #include "COREMOD_tools/COREMOD_tools.h"
 #include "CommandLineInterface/timeutils.h"
 #include "cudacomp_types.h"
-#include "cusolver_symmetrize.h"
+
+extern void ssymmetrize_lower(float *dA, int ldda);
+extern void dsymmetrize_lower(double *dA, int ldda);
 
 static struct cusolver_compute_SVDpseudoInverse_data CUSOLVER_DATA = {
     .loop_iter = 0,

diff --git a/cusolver_symmetrize.cu b/cusolver_symmetrize.cu
@@ -1,3 +1,6 @@
+#include "cuda.h"
+#include "cuda_runtime.h"
+
 #include "cusolver_symmetrize.h"
 
 #define NB 64
@@ -40,6 +43,7 @@ __global__ void kern_fill_dsym_matrix(char src_uplo, double *data, int N,
   }
 }
 
+extern "C"
 void ssymmetrize_lower(float *dA, int ldda) {
   if (ldda == 0) return;
 
@@ -49,6 +53,7 @@ void ssymmetrize_lower(float *dA, int ldda) {
   kern_fill_ssym_matrix<<<grid, threads, 0>>>('L', dA, N, ldda);
 }
 
+extern "C"
 void dsymmetrize_lower(double *dA, int ldda) {
   if (ldda == 0) return;
 

diff --git a/cusolver_symmetrize.h b/cusolver_symmetrize.h
@@ -5,7 +5,13 @@
 
 #ifdef HAVE_CUDA
 
+#include "cuda.h"
+#include "cuda_runtime.h"
+
+extern "C"
 void ssymmetrize_lower(float *dA, int ldda);
+
+extern "C"
 void dsymmetrize_lower(double *dA, int ldda);
 
 #endif  // HAVE_CUDA