Commit 50f544ee authored by fwinkler's avatar fwinkler

Modified regression tests.

parent 7b2e4ecf
#!/bin/bash #!/bin/bash
PIKA_ACCOUNT=zihforschung PIKA_ACCOUNT=zihforschung
PIKA_RESERVATION=Prope PIKA_RESERVATION=zihforschung_407
PIKA_PARTITION=haswell64 PIKA_PARTITION=haswell64
PIKA_NODE=taurusi4040 PIKA_NODE=taurusi5396
PIKA_CORES=24 PIKA_CORES=24
JOB_CHECK="bash /sw/taurus/tools/pika/test/job_regression_tests/check_pika.sh" JOB_CHECK="bash /sw/taurus/tools/pika/test/job_regression_tests/check_pika.sh"
\ No newline at end of file JOB_SCRIPT=check_pika.sh
...@@ -8,11 +8,11 @@ ...@@ -8,11 +8,11 @@
##SBATCH --mem=8000 ##SBATCH --mem=8000
#SBATCH --time=60 #SBATCH --time=60
#SBATCH --reservation=Prope #SBATCH --reservation=zihforschung_407
#SBATCH --partition=haswell64 #SBATCH --partition=haswell64
##SBATCH --exclusive ##SBATCH --exclusive
##SBATCH -w taurusi4040 ##SBATCH -w taurusi5396
##SBATCH --comment=no_monitoring ##SBATCH --comment=no_monitoring
......
#!/bin/bash
#SBATCH -A PIKA_ACCOUNT
#SBATCH --job-name=Pika-ON
#SBATCH --ntasks=1 #MPI processes
#SBATCH --nodes=1
#SBATCH --tasks-per-node=1
##SBATCH --mem=8000
#SBATCH --time=60
#SBATCH --reservation=PIKA_RESERVATION
#SBATCH --partition=PIKA_PARTITION
##SBATCH --exclusive
##SBATCH -w PIKA_NODE
##SBATCH --comment=no_monitoring
bash /sw/taurus/tools/pika/test/job_regression_tests/JOB_SCRIPT
...@@ -8,11 +8,11 @@ ...@@ -8,11 +8,11 @@
##SBATCH --mem=8000 ##SBATCH --mem=8000
#SBATCH --time=60 #SBATCH --time=60
#SBATCH --reservation=Prope #SBATCH --reservation=zihforschung_407
#SBATCH --partition=haswell64 #SBATCH --partition=haswell64
##SBATCH --exclusive ##SBATCH --exclusive
##SBATCH -w taurusi4040 ##SBATCH -w taurusi5396
##SBATCH --comment=no_monitoring ##SBATCH --comment=no_monitoring
......
#!/bin/bash
#SBATCH -A PIKA_ACCOUNT
#SBATCH --job-name=Pika-ON
#SBATCH --ntasks=1 #MPI processes
#SBATCH --nodes=1
#SBATCH --tasks-per-node=1
##SBATCH --mem=8000
#SBATCH --time=60
#SBATCH --reservation=PIKA_RESERVATION
#SBATCH --partition=PIKA_PARTITION
##SBATCH --exclusive
##SBATCH -w PIKA_NODE
##SBATCH --comment=no_monitoring
srun -n 1 bash /sw/taurus/tools/pika/test/job_regression_tests/JOB_SCRIPT
...@@ -8,11 +8,11 @@ ...@@ -8,11 +8,11 @@
##SBATCH --mem=8000 ##SBATCH --mem=8000
#SBATCH --time=60 #SBATCH --time=60
#SBATCH --reservation=Prope #SBATCH --reservation=zihforschung_407
#SBATCH --partition=haswell64 #SBATCH --partition=haswell64
#SBATCH --exclusive #SBATCH --exclusive
##SBATCH -w taurusi4040 ##SBATCH -w taurusi5396
#SBATCH --comment=no_monitoring #SBATCH --comment=no_monitoring
......
#!/bin/bash
#SBATCH -A PIKA_ACCOUNT
#SBATCH --job-name=Pika-OFF
#SBATCH --ntasks=1 #MPI processes
#SBATCH --nodes=1
#SBATCH --tasks-per-node=1
##SBATCH --mem=8000
#SBATCH --time=60
#SBATCH --reservation=PIKA_RESERVATION
#SBATCH --partition=PIKA_PARTITION
#SBATCH --exclusive
##SBATCH -w PIKA_NODE
#SBATCH --comment=no_monitoring
bash /sw/taurus/tools/pika/test/job_regression_tests/JOB_SCRIPT
...@@ -8,11 +8,11 @@ ...@@ -8,11 +8,11 @@
##SBATCH --mem=8000 ##SBATCH --mem=8000
#SBATCH --time=60 #SBATCH --time=60
#SBATCH --reservation=Prope #SBATCH --reservation=zihforschung_407
#SBATCH --partition=haswell64 #SBATCH --partition=haswell64
#SBATCH --exclusive #SBATCH --exclusive
##SBATCH -w taurusi4040 ##SBATCH -w taurusi5396
#SBATCH --comment=no_monitoring #SBATCH --comment=no_monitoring
......
#!/bin/bash
#SBATCH -A PIKA_ACCOUNT
#SBATCH --job-name=Pika-OFF
#SBATCH --ntasks=1 #MPI processes
#SBATCH --nodes=1
#SBATCH --tasks-per-node=1
##SBATCH --mem=8000
#SBATCH --time=60
#SBATCH --reservation=PIKA_RESERVATION
#SBATCH --partition=PIKA_PARTITION
#SBATCH --exclusive
##SBATCH -w PIKA_NODE
#SBATCH --comment=no_monitoring
srun -n 1 bash /sw/taurus/tools/pika/test/job_regression_tests/JOB_SCRIPT
#!/bin/bash #!/bin/bash
function wait() function wait()
{ {
RUNNING_JOB=$(squeue -u $USER | grep $1) RUNNING_JOB=$(squeue -u $USER | grep $1)
...@@ -17,12 +16,21 @@ function wait() ...@@ -17,12 +16,21 @@ function wait()
function run_job() function run_job()
{ {
echo $1 echo $1
JOB_ID=$(sbatch $1) cp ${1}_template.sh ${1}.sh
sed -i "s/PIKA_ACCOUNT/${PIKA_ACCOUNT}/" ${1}.sh
sed -i "s/PIKA_RESERVATION/${PIKA_RESERVATION}/" ${1}.sh
sed -i "s/PIKA_PARTITION/${PIKA_PARTITION}/" ${1}.sh
sed -i "s/PIKA_NODE/${PIKA_NODE}/" ${1}.sh
sed -i "s/JOB_SCRIPT/${JOB_SCRIPT}/" ${1}.sh
JOB_ID=$(sbatch ${1}.sh)
JOB_ID=`echo $JOB_ID | cut -d ' ' -f 4` JOB_ID=`echo $JOB_ID | cut -d ' ' -f 4`
wait $JOB_ID wait $JOB_ID
} }
run_job job_monitoring_no_srun.sh source /sw/taurus/tools/pika/test/job_regression_tests/job.conf
run_job job_monitoring_srun.sh
run_job job_no_monitoring_no_srun.sh run_job job_monitoring_no_srun
run_job job_no_monitoring_srun.sh run_job job_monitoring_srun
run_job job_no_monitoring_no_srun
run_job job_no_monitoring_srun
...@@ -8,22 +8,22 @@ srun --pty -n ${PIKA_CORES} -w ${PIKA_NODE} -A ${PIKA_ACCOUNT} --reservation=${P ...@@ -8,22 +8,22 @@ srun --pty -n ${PIKA_CORES} -w ${PIKA_NODE} -A ${PIKA_ACCOUNT} --reservation=${P
#interactive no monitoring #interactive no monitoring
echo "srun without monitoring" echo "srun without monitoring"
srun --pty -n ${PIKA_CORES} -w ${PIKA_NODE} -A ${PIKA_ACCOUNT} --reservation=Prope --comment=no_monitoring -p ${PIKA_PARTITION} --exclusive --comment=no_monitoring --time=0:00:05 ${JOB_CHECK} srun --pty -n ${PIKA_CORES} -w ${PIKA_NODE} -A ${PIKA_ACCOUNT} --reservation=${PIKA_RESERVATION} --comment=no_monitoring -p ${PIKA_PARTITION} --exclusive --comment=no_monitoring --time=0:00:05 ${JOB_CHECK}
#salloc monitoring #salloc monitoring
echo "salloc with monitoring" echo "salloc with monitoring"
salloc -n ${PIKA_CORES} -w ${PIKA_NODE} -A ${PIKA_ACCOUNT} --reservation=Prope -p ${PIKA_PARTITION} --time=0:00:05 ${JOB_CHECK} salloc -n ${PIKA_CORES} -w ${PIKA_NODE} -A ${PIKA_ACCOUNT} --reservation=${PIKA_RESERVATION} -p ${PIKA_PARTITION} --time=0:00:05 ${JOB_CHECK}
#salloc monitoring and srun #salloc monitoring and srun
echo "salloc with monitoring and srun" echo "salloc with monitoring and srun"
salloc -n ${PIKA_CORES} -w ${PIKA_NODE} -A ${PIKA_ACCOUNT} --reservation=Prope -p ${PIKA_PARTITION} --time=0:00:05 srun -n 1 ${JOB_CHECK} salloc -n ${PIKA_CORES} -w ${PIKA_NODE} -A ${PIKA_ACCOUNT} --reservation=${PIKA_RESERVATION} -p ${PIKA_PARTITION} --time=0:00:05 srun -n 1 ${JOB_CHECK}
#salloc no monitoring #salloc no monitoring
echo "salloc without monitoring" echo "salloc without monitoring"
salloc -n ${PIKA_CORES} -w ${PIKA_NODE} -A ${PIKA_ACCOUNT} --reservation=Prope -p ${PIKA_PARTITION} --exclusive --comment=no_monitoring --comment=no_monitoring --time=0:00:05 ${JOB_CHECK} salloc -n ${PIKA_CORES} -w ${PIKA_NODE} -A ${PIKA_ACCOUNT} --reservation=${PIKA_RESERVATION} -p ${PIKA_PARTITION} --exclusive --comment=no_monitoring --comment=no_monitoring --time=0:00:05 ${JOB_CHECK}
#salloc no monitoring #salloc no monitoring
echo "salloc without monitoring and srun" echo "salloc without monitoring and srun"
salloc -n ${PIKA_CORES} -w ${PIKA_NODE} -A ${PIKA_ACCOUNT} --reservation=Prope -p ${PIKA_PARTITION} --exclusive --comment=no_monitoring --comment=no_monitoring --time=0:00:05 srun -n 1 ${JOB_CHECK} salloc -n ${PIKA_CORES} -w ${PIKA_NODE} -A ${PIKA_ACCOUNT} --reservation=${PIKA_RESERVATION} -p ${PIKA_PARTITION} --exclusive --comment=no_monitoring --comment=no_monitoring --time=0:00:05 srun -n 1 ${JOB_CHECK}
...@@ -3,24 +3,3 @@ Run: ...@@ -3,24 +3,3 @@ Run:
./job_regression_testing.sh ./job_regression_testing.sh
./job_regression_testing_2.sh ./job_regression_testing_2.sh
Errors:
1)
#SBATCH --ntasks=1 #MPI processes
#SBATCH --nodes=1
#SBATCH --tasks-per-node=1
-->
--tasks-per-node=1 causes error:
Error: Traceback (most recent call last):
File "/sw/taurus/tools/pika/job_control/slurm/taurus/pika_slurm_env_redis.py", line 197, in <module>
force=args.force)
File "/sw/taurus/tools/pika/job_control/slurm/taurus/pika_slurm_env_redis.py", line 77, in main
save_job_env(env_file, slurm_env, connection, debug_file)
File "/sw/taurus/tools/pika/job_control/slurm/taurus/pika_slurm_env_redis.py", line 129, in save_job_env
for key, value in slurm_env['cpus_alloc_layout'].iteritems():
AttributeError: 'dict' object has no attribute 'iteritems'
2)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment