Changeset 74e9b5f in sasmodels for sasmodels/kernel_header.c

Timestamp:

Oct 12, 2018 10:52:48 PM (6 years ago)

Author:

pkienzle

Branches:

master, core_shell_microgels, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

4de14584

Parents:

b0de252

Message:

autotag functions as device functions for cuda. Refs #1076.

File:

• sasmodels/kernel_header.c (modified) (5 diffs)

sasmodels/kernel_header.c

@@ -5 +5 @@
 #elif defined(_OPENMP)
 # define USE_OPENMP
-#elif defined(__CUDACC__)
-# define USE_CUDA
 #endif
 
@@ -17 +15 @@
 
    #define USE_GPU
+   #define pglobal global
+   #define pconstant constant
+
    typedef int int32_t;
-   #define global_par global
-   #define local_par local
-   #define constant_par constant
-   #define global_var global
-   #define local_var local
-   #define constant_var constant
-   #define __device__
 
    #if defined(USE_SINCOS)
@@ -45 +39 @@
 
    #define USE_GPU
-   #define global_par
-   #define local_par
-   #define constant_par const
-   #define global_var
-   #define local_var __shared__
-   #define constant_var __constant__
-
+   #define local __shared__
+   #define pglobal
+   #define constant __constant__
+   #define pconstant const
    #define kernel extern "C" __global__
 
@@ -67 +58 @@
 #else // !USE_OPENCL && !USE_CUDA
 
-   #define global_par
-   #define local_par
-   #define constant_par const
-   #define global_var
-   #define local_var
-   #define constant_var const
-   #define __device__
+   #define local
+   #define pglobal
+   #define constant const
+   #define pconstant const
 
    #ifdef __cplusplus
@@ -193 +181 @@
 #  define M_4PI_3 4.18879020478639
 #endif
-__device__
 inline double square(double x) { return x*x; }
-__device__
 inline double cube(double x) { return x*x*x; }
-__device__
 inline double sas_sinx_x(double x) { return x==0 ? 1.0 : sin(x)/x; }