User: knarf Date: 2011/04/20 09:51 AM

Modified: /release-info/ run_tests

Log: put OMP_NUM_THREADS into mpi environment on qb

File Changes:

Directory: /release-info/ =========================

File [modified]: run_tests Delta lines: +2 -2 =================================================================== --- release-info/run_tests 2011-04-20 13:43:08 UTC (rev 561) +++ release-info/run_tests 2011-04-20 14:51:38 UTC (rev 562) @@ -8,8 +8,6 @@ cd ET_2011_05

export CCTK_TESTSUITE_RUN_COMMAND="mpirun -np $nprocs $exe $parfile" -hostname | grep ^qb && - export CCTK_TESTSUITE_RUN_COMMAND="/usr/local/packages/mvapich2/1.4/intel-11.1/bin/mpirun_rsh -hostfile $PBS_NODEFILE -np $nprocs /bin/env MV2_ENABLE_AFFINITY=0 $exe $parfile" hostname | grep macbook-pro.local && export CCTK_TESTSUITE_RUN_COMMAND="openmpirun -np $nprocs $exe $parfile"

@@ -30,6 +28,8 @@ # makeing sure openmp is really used through an external script hostname | grep ^numrel && export CCTK_TESTSUITE_RUN_COMMAND="~/bin/mpirun$OMP_NUM_THREADS -np $nprocs $exe $parfile" + hostname | grep ^qb && + export CCTK_TESTSUITE_RUN_COMMAND="/usr/local/packages/mvapich2/1.4/intel-11.1/bin/mpirun_rsh -hostfile $PBS_NODEFILE -np $nprocs /bin/env MV2_ENABLE_AFFINITY=0 OMP_NUM_THREADS=$OMP_NUM_THREADS $exe $parfile" make sim-testsuite PROMPT=no mv TEST/sim/summary.log ../${HOSTNAME}__${CCTK_TESTSUITE_RUN_PROCESSORS}_${OMP_NUM_THREADS}.log done