Changeset 12f4c19 in sasmodels


Ignore:
Timestamp:
Oct 26, 2018 11:58:21 AM (2 weeks ago)
Author:
Paul Kienzle <pkienzle@…>
Branches:
beta_approx, py3, ticket-1015-gpu-mem-error, ticket-1157, ticket-608-user-defined-weights, ticket_1156
Children:
d42dd4a
Parents:
869fd7b
Message:

remove cuda variable conflict errors

Location:
sasmodels
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • sasmodels/kernel_iq.c

    r07646b6 r12f4c19  
    471471#if defined(CALL_FQ) // COMPUTE_F1_F2 is true 
    472472  // unoriented 1D returning <F> and <F^2> 
     473  // Note that F1 and F2 are returned from CALL_FQ by reference, and the 
     474  // user of the CALL_KERNEL macro below is assuming that F1 and F2 are defined. 
    473475  double qk; 
    474476  double F1, F2; 
     
    480482#elif defined(CALL_FQ_A) 
    481483  // unoriented 2D return <F> and <F^2> 
     484  // Note that the CALL_FQ_A macro is computing _F1_slot and _F2_slot by 
     485  // reference then returning _F2_slot.  We are calling them _F1_slot and 
     486  // _F2_slot here so they don't conflict with _F1 and _F2 in the macro 
     487  // expansion, or with the use of F2 = CALL_KERNEL() when it is used below. 
    482488  double qx, qy; 
    483   double F1, F2; 
     489  double _F1_slot, _F2_slot; 
    484490  #define FETCH_Q() do { qx = q[2*q_index]; qy = q[2*q_index+1]; } while (0) 
    485491  #define BUILD_ROTATION() do {} while(0) 
    486492  #define APPLY_ROTATION() do {} while(0) 
    487   #define CALL_KERNEL() CALL_FQ_A(sqrt(qx*qx+qy*qy),F1,F2,local_values.table) 
     493  #define CALL_KERNEL() CALL_FQ_A(sqrt(qx*qx+qy*qy),_F1_slot,_F2_slot,local_values.table) 
    488494 
    489495#elif defined(CALL_IQ) 
  • sasmodels/models/vesicle.c

    re44432d r12f4c19  
    3636 
    3737{ 
    38     double vol,contrast,f,f2; 
     38    double vol,contrast,f; 
    3939 
    4040    // core first, then add in shell 
Note: See TracChangeset for help on using the changeset viewer.