Changeset 2042 for trunk


Ignore:
Timestamp:
Jul 22, 2014 6:38:37 AM (5 years ago)
Author:
forrest
Message:

fix pragmas

Location:
trunk/Clp/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp/src/AbcSimplexDual.cpp

    r2024 r2042  
    594594    const int * COIN_RESTRICT which=array.getIndices();
    595595    double * COIN_RESTRICT reducedCost=abcDj_;
    596 #pragma cilk_grainsize=128
     596#pragma cilk grainsize=128
    597597    cilk_for (int i = 0; i < number; i++) {
    598598      //for (int i = 0; i < number; i++) {
  • trunk/Clp/src/CoinAbcHelperFunctions.cpp

    r1990 r2042  
    357357// was #pragma simd
    358358#endif
    359 #pragma cilk_grainsize=CILK_FOR_GRAINSIZE
     359#pragma cilk grainsize=CILK_FOR_GRAINSIZE
    360360  cilk_for (int i=0;i<size;i++) {
    361361    region[i] *= multiplier;
     
    370370// was #pragma simd
    371371#endif
    372 #pragma cilk_grainsize=CILK_FOR_GRAINSIZE
     372#pragma cilk grainsize=CILK_FOR_GRAINSIZE
    373373  cilk_for (int i=0;i<size;i++) {
    374374    double value=fabs(region[i]);
     
    411411// was #pragma simd
    412412#endif
    413 #pragma cilk_grainsize=CILK_FOR_GRAINSIZE
     413#pragma cilk grainsize=CILK_FOR_GRAINSIZE
    414414     cilk_for (int i = 0; i < size; i++)
    415415          region[i] = value;
     
    560560// was #pragma simd
    561561#endif
    562 #pragma cilk_grainsize=CILK_FOR_GRAINSIZE
     562#pragma cilk grainsize=CILK_FOR_GRAINSIZE
    563563  cilk_for (int i=0;i<number;i++) {
    564564    int k=index[i];
     
    575575// was #pragma simd
    576576#endif
    577 #pragma cilk_grainsize=CILK_FOR_GRAINSIZE
     577#pragma cilk grainsize=CILK_FOR_GRAINSIZE
    578578  cilk_for (int i=0;i<number;i++) {
    579579    int k=index[i];
     
    590590// was #pragma simd
    591591#endif
    592 #pragma cilk_grainsize=CILK_FOR_GRAINSIZE
     592#pragma cilk grainsize=CILK_FOR_GRAINSIZE
    593593  cilk_for (int i=0;i<number;i++) {
    594594    int k=index[i];
     
    621621// was #pragma simd
    622622#endif
    623 #pragma cilk_grainsize=CILK_FOR_GRAINSIZE
     623#pragma cilk grainsize=CILK_FOR_GRAINSIZE
    624624  cilk_for (int i = 0; i < n; i++)
    625625    array[i] = 1.0 / sqrt(array[i]);
     
    633633// was #pragma simd
    634634#endif
    635 #pragma cilk_grainsize=CILK_FOR_GRAINSIZE
     635#pragma cilk grainsize=CILK_FOR_GRAINSIZE
    636636  cilk_for (int i = 0; i < n; i++)
    637637    array[i] = 1.0 / input[i];
  • trunk/Clp/src/CoinAbcHelperFunctions.hpp

    r1910 r2042  
    9696    region[iRow1] = regionValue1 - value1 * pivotValue;
    9797    number-=2;
    98   }
    99 #pragma cilk_grainsize=CILK_FOR_GRAINSIZE
    100   for (CoinBigIndex j=number-1 ; j >=0; j-=4 ) {
     98  } 
     99#pragma cilk grainsize=CILK_FOR_GRAINSIZE
     100  cilk_for (CoinBigIndex j=number-1 ; j >=0; j-=4 ) {
    101101    CoinSimplexInt iRow0 = thisIndex[j];
    102102    CoinSimplexInt iRow1 = thisIndex[j-1];
     
    336336  }
    337337#else
    338 #pragma cilk_grainsize=CILK_FOR_GRAINSIZE
    339   for (CoinBigIndex j=number-1 ; j >=0; j-=4 ) {
     338#pragma cilk grainsize=CILK_FOR_GRAINSIZE
     339  cilk_for (CoinBigIndex j=number-1 ; j >=0; j-=4 ) {
    340340    CoinSimplexInt iRow0 = thisIndex[j];
    341341    CoinSimplexInt iRow1 = thisIndex[j-1];
Note: See TracChangeset for help on using the changeset viewer.