Ignore:
Timestamp:
Nov 11, 2013 12:27:32 PM (6 years ago)
Author:
forrest
Message:

Minor stability fixes and an option to allow perturbation after presolve

File:
1 edited

Legend:

Unmodified
Added
Removed
  • stable/1.15/Clp/src/CoinAbcHelperFunctions.cpp

    r1910 r1989  
    262262{
    263263#ifndef INTEL_COMPILER
    264 #pragma simd
     264// was #pragma simd
    265265#endif
    266266#if UNROLL_MULTIPLY_ADD==0
     
    282282{
    283283#ifndef INTEL_COMPILER
    284 #pragma simd
     284// was #pragma simd
    285285#endif
    286286#if UNROLL_MULTIPLY_ADD==0
     
    303303     //printf("a\n");
    304304#ifndef INTEL_COMPILER
    305 #pragma simd
     305// was #pragma simd
    306306#endif
    307307     /*cilk_*/ for (int i = 0; i < size; i++)
     
    317317  //printf("b\n");
    318318#ifndef INTEL_COMPILER
    319 #pragma simd
     319// was #pragma simd
    320320#endif
    321321     /*cilk_*/ for (int i=0;i<size;i++) {
     
    337337  //printf("c\n");
    338338#ifndef INTEL_COMPILER
    339 #pragma simd
     339// was #pragma simd
    340340#endif
    341341     /*cilk_*/ for (int i=0;i<size;i++) {
     
    355355  // used printf("d\n");
    356356#ifndef INTEL_COMPILER
    357 #pragma simd
     357// was #pragma simd
    358358#endif
    359359#pragma cilk_grainsize=CILK_FOR_GRAINSIZE
     
    368368     // used printf("e\n");
    369369#ifndef INTEL_COMPILER
    370 #pragma simd
     370// was #pragma simd
    371371#endif
    372372#pragma cilk_grainsize=CILK_FOR_GRAINSIZE
     
    394394  //printf("f\n");
    395395#ifndef INTEL_COMPILER
    396 #pragma simd
     396// was #pragma simd
    397397#endif
    398398     /*cilk_*/ for (int i=0;i<size;i++) {
     
    409409     printf("g\n");
    410410#ifndef INTEL_COMPILER
    411 #pragma simd
     411// was #pragma simd
    412412#endif
    413413#pragma cilk_grainsize=CILK_FOR_GRAINSIZE
     
    424424          if (multiplier2 == 1.0) {
    425425#ifndef INTEL_COMPILER
    426 #pragma simd
     426// was #pragma simd
    427427#endif
    428428               /*cilk_*/ for (int i = 0; i < size; i++)
     
    430430          } else if (multiplier2 == -1.0) {
    431431#ifndef INTEL_COMPILER
    432 #pragma simd
     432// was #pragma simd
    433433#endif
    434434               /*cilk_*/ for (int i = 0; i < size; i++)
     
    436436          } else if (multiplier2 == 0.0) {
    437437#ifndef INTEL_COMPILER
    438 #pragma simd
     438// was #pragma simd
    439439#endif
    440440               /*cilk_*/ for (int i = 0; i < size; i++)
     
    442442          } else {
    443443#ifndef INTEL_COMPILER
    444 #pragma simd
     444// was #pragma simd
    445445#endif
    446446               /*cilk_*/ for (int i = 0; i < size; i++)
     
    450450          if (multiplier2 == 1.0) {
    451451#ifndef INTEL_COMPILER
    452 #pragma simd
     452// was #pragma simd
    453453#endif
    454454               /*cilk_*/ for (int i = 0; i < size; i++)
     
    456456          } else if (multiplier2 == -1.0) {
    457457#ifndef INTEL_COMPILER
    458 #pragma simd
     458// was #pragma simd
    459459#endif
    460460               /*cilk_*/ for (int i = 0; i < size; i++)
     
    462462          } else if (multiplier2 == 0.0) {
    463463#ifndef INTEL_COMPILER
    464 #pragma simd
     464// was #pragma simd
    465465#endif
    466466               /*cilk_*/ for (int i = 0; i < size; i++)
     
    468468          } else {
    469469#ifndef INTEL_COMPILER
    470 #pragma simd
     470// was #pragma simd
    471471#endif
    472472               /*cilk_*/ for (int i = 0; i < size; i++)
     
    478478          } else if (multiplier2 == -1.0) {
    479479#ifndef INTEL_COMPILER
    480 #pragma simd
     480// was #pragma simd
    481481#endif
    482482               /*cilk_*/ for (int i = 0; i < size; i++)
     
    484484          } else if (multiplier2 == 0.0) {
    485485#ifndef INTEL_COMPILER
    486 #pragma simd
     486// was #pragma simd
    487487#endif
    488488               /*cilk_*/ for (int i = 0; i < size; i++)
     
    490490          } else {
    491491#ifndef INTEL_COMPILER
    492 #pragma simd
     492// was #pragma simd
    493493#endif
    494494               /*cilk_*/ for (int i = 0; i < size; i++)
     
    498498          if (multiplier2 == 1.0) {
    499499#ifndef INTEL_COMPILER
    500 #pragma simd
     500// was #pragma simd
    501501#endif
    502502               /*cilk_*/ for (int i = 0; i < size; i++)
     
    504504          } else if (multiplier2 == -1.0) {
    505505#ifndef INTEL_COMPILER
    506 #pragma simd
     506// was #pragma simd
    507507#endif
    508508               /*cilk_*/ for (int i = 0; i < size; i++)
     
    510510          } else if (multiplier2 == 0.0) {
    511511#ifndef INTEL_COMPILER
    512 #pragma simd
     512// was #pragma simd
    513513#endif
    514514               /*cilk_*/ for (int i = 0; i < size; i++)
     
    516516          } else {
    517517#ifndef INTEL_COMPILER
    518 #pragma simd
     518// was #pragma simd
    519519#endif
    520520               /*cilk_*/ for (int i = 0; i < size; i++)
     
    530530     double value = 0.0;
    531531#ifndef INTEL_COMPILER
    532 #pragma simd
     532// was #pragma simd
    533533#endif
    534534     /*cilk_*/ for (int i = 0; i < size; i++)
     
    544544     norm2 = 0.0;
    545545#ifndef INTEL_COMPILER
    546 #pragma simd
     546// was #pragma simd
    547547#endif
    548548     /*cilk_*/ for (int i = 0; i < size; i++) {
     
    558558     // used printf("k\n");
    559559#ifndef INTEL_COMPILER
    560 #pragma simd
     560// was #pragma simd
    561561#endif
    562562#pragma cilk_grainsize=CILK_FOR_GRAINSIZE
     
    573573     // used printf("l\n");
    574574#ifndef INTEL_COMPILER
    575 #pragma simd
     575// was #pragma simd
    576576#endif
    577577#pragma cilk_grainsize=CILK_FOR_GRAINSIZE
     
    588588     // used printf("m\n");
    589589#ifndef INTEL_COMPILER
    590 #pragma simd
     590// was #pragma simd
    591591#endif
    592592#pragma cilk_grainsize=CILK_FOR_GRAINSIZE
     
    604604  //printf("n\n");
    605605#ifndef INTEL_COMPILER
    606 #pragma simd
     606// was #pragma simd
    607607#endif
    608608     /*cilk_*/ for (int i=0;i<number;i++) {
     
    619619     // used printf("o\n");
    620620#ifndef INTEL_COMPILER
    621 #pragma simd
     621// was #pragma simd
    622622#endif
    623623#pragma cilk_grainsize=CILK_FOR_GRAINSIZE
     
    631631     // used printf("p\n");
    632632#ifndef INTEL_COMPILER
    633 #pragma simd
     633// was #pragma simd
    634634#endif
    635635#pragma cilk_grainsize=CILK_FOR_GRAINSIZE
Note: See TracChangeset for help on using the changeset viewer.