fixed a point type problem that doesn't compile on a Cray

SKA-ScienceDataProcessor · Aug 7, 2015 · b68ae98 · b68ae98
1 parent aff3607
commit b68ae98
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 12 deletions.
diff --git a/AdiosStManScaColumn.cc b/AdiosStManScaColumn.cc
@@ -79,43 +79,43 @@ namespace casacore {
     // put
     void AdiosStManScaColumn::putBoolV (uInt rownr, const Bool* dataPtr){
         itsStManPtr->adiosWriteOpen();
-        adios_write_byid(itsStManPtr->getAdiosFile(), itsAdiosWriteIDs[rownr] , dataPtr);
+        adios_write_byid(itsStManPtr->getAdiosFile(), itsAdiosWriteIDs[rownr] , (void*)dataPtr);
     }
     void AdiosStManScaColumn::putuCharV (uInt rownr, const uChar* dataPtr){
         itsStManPtr->adiosWriteOpen();
-        adios_write_byid(itsStManPtr->getAdiosFile(), itsAdiosWriteIDs[rownr] , dataPtr);
+        adios_write_byid(itsStManPtr->getAdiosFile(), itsAdiosWriteIDs[rownr] , (void*)dataPtr);
     }
     void AdiosStManScaColumn::putShortV (uInt rownr, const Short* dataPtr){
         itsStManPtr->adiosWriteOpen();
-        adios_write_byid(itsStManPtr->getAdiosFile(), itsAdiosWriteIDs[rownr] , dataPtr);
+        adios_write_byid(itsStManPtr->getAdiosFile(), itsAdiosWriteIDs[rownr] , (void*)dataPtr);
     }
     void AdiosStManScaColumn::putuShortV (uInt rownr, const uShort* dataPtr){
         itsStManPtr->adiosWriteOpen();
-        adios_write_byid(itsStManPtr->getAdiosFile(), itsAdiosWriteIDs[rownr] , dataPtr);
+        adios_write_byid(itsStManPtr->getAdiosFile(), itsAdiosWriteIDs[rownr] , (void*)dataPtr);
     }
     void AdiosStManScaColumn::putIntV (uInt rownr, const Int* dataPtr){
         itsStManPtr->adiosWriteOpen();
-        adios_write_byid(itsStManPtr->getAdiosFile(), itsAdiosWriteIDs[rownr] , dataPtr);
+        adios_write_byid(itsStManPtr->getAdiosFile(), itsAdiosWriteIDs[rownr] , (void*)dataPtr);
     }
     void AdiosStManScaColumn::putuIntV (uInt rownr, const uInt* dataPtr){
         itsStManPtr->adiosWriteOpen();
-        adios_write_byid(itsStManPtr->getAdiosFile(), itsAdiosWriteIDs[rownr] , dataPtr);
+        adios_write_byid(itsStManPtr->getAdiosFile(), itsAdiosWriteIDs[rownr] , (void*)dataPtr);
     }
     void AdiosStManScaColumn::putfloatV (uInt rownr, const float* dataPtr){
         itsStManPtr->adiosWriteOpen();
-        adios_write_byid(itsStManPtr->getAdiosFile(), itsAdiosWriteIDs[rownr] , dataPtr);
+        adios_write_byid(itsStManPtr->getAdiosFile(), itsAdiosWriteIDs[rownr] , (void*)dataPtr);
     }
     void AdiosStManScaColumn::putdoubleV (uInt rownr, const double* dataPtr){
         itsStManPtr->adiosWriteOpen();
-        adios_write_byid(itsStManPtr->getAdiosFile(), itsAdiosWriteIDs[rownr] , dataPtr);
+        adios_write_byid(itsStManPtr->getAdiosFile(), itsAdiosWriteIDs[rownr] , (void*)dataPtr);
     }
     void AdiosStManScaColumn::putComplexV (uInt rownr, const Complex* dataPtr){
         itsStManPtr->adiosWriteOpen();
-        adios_write_byid(itsStManPtr->getAdiosFile(), itsAdiosWriteIDs[rownr] , dataPtr);
+        adios_write_byid(itsStManPtr->getAdiosFile(), itsAdiosWriteIDs[rownr] , (void*)dataPtr);
     }
     void AdiosStManScaColumn::putDComplexV (uInt rownr, const DComplex* dataPtr){
         itsStManPtr->adiosWriteOpen();
-        adios_write_byid(itsStManPtr->getAdiosFile(), itsAdiosWriteIDs[rownr] , dataPtr);
+        adios_write_byid(itsStManPtr->getAdiosFile(), itsAdiosWriteIDs[rownr] , (void*)dataPtr);
     }
     void AdiosStManScaColumn::putStringV (uInt rownr, const String* dataPtr){
         cout << "AdiosStManColumn Error: Sorry, AdiosStMan does not support string type at the moment!" << endl;

diff --git a/benchmark/ms_read_column.sh b/benchmark/ms_read_column.sh
@@ -1,8 +1,17 @@
 #!/bin/bash
+
+if [ "$JOBSCHEDULER" == "slurm" ]; then
+    JOBID=$SLURM_JOBID
+    JOBDIR=$SLURM_SUBMIT_DIR
+else
+    JOBID=$PBS_JOBID
+    JOBDIR=$PBS_O_WORKDIR
+fi
+
 if [ "$VENDOR" == "cray" ]; then
-    aprun -n1 -N1 $SLURM_SUBMIT_DIR/ms_read_column $DATADIR/chiles_original.ms $DATADIR/chiles_adios_agg.ms
+    aprun -n1 -N1 $JOBDIR/ms_read_column $DATADIR/chiles_original.ms $DATADIR/chiles_adios_agg.ms
 else
-    mpirun ${PBS_O_WORKDIR}/ms_read_column $DATADIR/chiles_original.ms $DATADIR/chiles_adios_agg.ms
+    mpirun $JOBDIR/ms_read_column $DATADIR/chiles_original.ms $DATADIR/chiles_adios_agg.ms
 fi