Changeset 331


Ignore:
Timestamp:
Jul 2, 2012 8:46:39 AM (8 years ago)
Author:
kulshres
Message:

remove remnants of openmp testing

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/ADOL-C/src/sparse/sparsedrivers.cpp

    r324 r331  
    318318        {
    319319          g->GenerateSeedJacobian(&(sJinfos.Seed), &(sJinfos.seed_rows),
    320                                   &(sJinfos.seed_clms), "SMALLEST_LAST","ROW_PARTIAL_DISTANCE_TWO_OMP");
     320                                  &(sJinfos.seed_clms), "SMALLEST_LAST","ROW_PARTIAL_DISTANCE_TWO");
    321321          sJinfos.seed_clms = indep;
    322322          ret_val = sJinfos.seed_rows;
     
    325325        {
    326326          g->GenerateSeedJacobian(&(sJinfos.Seed), &(sJinfos.seed_rows),
    327                                 &(sJinfos.seed_clms), "SMALLEST_LAST","COLUMN_PARTIAL_DISTANCE_TWO_OMP");
     327                                &(sJinfos.seed_clms), "SMALLEST_LAST","COLUMN_PARTIAL_DISTANCE_TWO");
    328328          sJinfos.seed_rows = depen;
    329329          ret_val = sJinfos.seed_clms;
     
    384384      // call usermem versions
    385385      if (options[3] == 1)
    386        jr1d->RecoverD2Row_CoordinateFormat_usermem_OMP(g, sJinfos.B, sJinfos.JP, rind, cind, values);
     386       jr1d->RecoverD2Row_CoordinateFormat_usermem(g, sJinfos.B, sJinfos.JP, rind, cind, values);
    387387     else
    388        jr1d->RecoverD2Cln_CoordinateFormat_usermem_OMP(g, sJinfos.B, sJinfos.JP, rind, cind, values);
     388       jr1d->RecoverD2Cln_CoordinateFormat_usermem(g, sJinfos.B, sJinfos.JP, rind, cind, values);
    389389    } else {
    390390      // at least one of rind cind values is not allocated, deallocate others
     
    397397          free(*cind);
    398398      if (options[3] == 1)
    399        jr1d->RecoverD2Row_CoordinateFormat_unmanaged_OMP(g, sJinfos.B, sJinfos.JP, rind, cind, values);
     399       jr1d->RecoverD2Row_CoordinateFormat_unmanaged(g, sJinfos.B, sJinfos.JP, rind, cind, values);
    400400     else
    401        jr1d->RecoverD2Cln_CoordinateFormat_unmanaged_OMP(g, sJinfos.B, sJinfos.JP, rind, cind, values);
     401       jr1d->RecoverD2Cln_CoordinateFormat_unmanaged(g, sJinfos.B, sJinfos.JP, rind, cind, values);
    402402    }
    403403
     
    613613       hr->IndirectRecover_CoordinateFormat_usermem(g, sHinfos.Hcomp, sHinfos.HP, rind, cind, values);
    614614     else
    615        hr->DirectRecover_CoordinateFormat_usermem_OMP(g, sHinfos.Hcomp, sHinfos.HP, rind, cind, values);
     615       hr->DirectRecover_CoordinateFormat_usermem(g, sHinfos.Hcomp, sHinfos.HP, rind, cind, values);
    616616    } else {
    617617      // at least one of rind cind values is not allocated, deallocate others
     
    626626       hr->IndirectRecover_CoordinateFormat_unmanaged(g, sHinfos.Hcomp, sHinfos.HP, rind, cind, values);
    627627     else
    628        hr->DirectRecover_CoordinateFormat_unmanaged_OMP(g, sHinfos.Hcomp, sHinfos.HP, rind, cind, values);
     628       hr->DirectRecover_CoordinateFormat_unmanaged(g, sHinfos.Hcomp, sHinfos.HP, rind, cind, values);
    629629    }
    630630    return ret_val;
Note: See TracChangeset for help on using the changeset viewer.