Changeset 74e9b5f in sasmodels for sasmodels/models/lib

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.

Location:

sasmodels/models/lib

Files:

• gauss76.c (modified) (2 diffs)
• polevl.c (modified) (2 diffs)
• sas_J1.c (modified) (12 diffs)

sasmodels/models/lib/gauss76.c

@@ -11 +11 @@
 
 // Gaussians
-constant_var double Gauss76Wt[76] = {
+constant double Gauss76Wt[76] = {
         .00126779163408536,             //0
         .00294910295364247,
@@ -90 +90 @@
 };
 
-constant_var double Gauss76Z[76] = {
+constant double Gauss76Z[76] = {
         -.999505948362153,              //0
         -.997397786355355,

sasmodels/models/lib/polevl.c

@@ -51 +51 @@
 */
 
-__device__ static
-double polevl( double x, constant_par double *coef, int N )
+static
+double polevl( double x, pconstant double *coef, int N )
 {
 
@@ -72 +72 @@
  */
 
-__device__ static
-double p1evl( double x, constant_par double *coef, int N )
+static
+double p1evl( double x, pconstant double *coef, int N )
 {
     int i=0;

sasmodels/models/lib/sas_J1.c

@@ -43 +43 @@
 //Cephes double pression function
 
-constant_var double RPJ1[8] = {
+constant double RPJ1[8] = {
     -8.99971225705559398224E8,
     4.52228297998194034323E11,
@@ -53 +53 @@
     0.0 };
 
-constant_var double RQJ1[8] = {
+constant double RQJ1[8] = {
     6.20836478118054335476E2,
     2.56987256757748830383E5,
@@ -64 +64 @@
     };
 
-constant_var double PPJ1[8] = {
+constant double PPJ1[8] = {
     7.62125616208173112003E-4,
     7.31397056940917570436E-2,
@@ -75 +75 @@
 
 
-constant_var double PQJ1[8] = {
+constant double PQJ1[8] = {
     5.71323128072548699714E-4,
     6.88455908754495404082E-2,
@@ -85 +85 @@
     0.0 };
 
-constant_var double QPJ1[8] = {
+constant double QPJ1[8] = {
     5.10862594750176621635E-2,
     4.98213872951233449420E0,
@@ -95 +95 @@
     2.52070205858023719784E1 };
 
-constant_var double QQJ1[8] = {
+constant double QQJ1[8] = {
     7.42373277035675149943E1,
     1.05644886038262816351E3,
@@ -105 +105 @@
     0.0 };
 
-__device__ static
+static
 double cephes_j1(double x)
 {
@@ -155 +155 @@
 #else
 //Single precission version of cephes
-constant_var float JPJ1[8] = {
+constant float JPJ1[8] = {
     -4.878788132172128E-009,
     6.009061827883699E-007,
@@ -166 +166 @@
     };
 
-constant_var float MO1J1[8] = {
+constant float MO1J1[8] = {
     6.913942741265801E-002,
     -2.284801500053359E-001,
@@ -177 +177 @@
     };
 
-constant_var float PH1J1[8] = {
+constant float PH1J1[8] = {
     -4.497014141919556E+001,
     5.073465654089319E+001,
@@ -188 +188 @@
     };
 
-__device__ static
+static
 float cephes_j1f(float xx)
 {
@@ -239 +239 @@
 
 //Finally J1c function that equals 2*J1(x)/x
-__device__ static
+static
 double sas_2J1x_x(double x)
 {