Merge pull request #17 from brettin/master

make explicit slurm directives

Author: j-woz

workflows/nt3_mlrMBO/swift/cori_workflow.sh

@@ -74,7 +74,7 @@ COMMON_DIR=$EMEWS_PROJECT_ROOT/../common/python
 export PYTHONPATH=$BENCHMARK_DIR:$COMMON_DIR:$EMEWS_PROJECT_ROOT/python
 export PYTHONHOME=/global/common/cori/software/python/2.7-anaconda/envs/deeplearning/
 
-export TURBINE_DIRECTIVE="#SBATCH --constraint=haswell\n#SBATCH --license=SCRATCH"
+export TURBINE_DIRECTIVE="#SBATCH --constraint=knl,quad,cache\n#SBATCH --license=SCRATCH\n#SBATCH --account=m2759"
 
 # Resident task workers and ranks
 export TURBINE_RESIDENT_WORK_WORKERS=1

workflows/nt3_mlrMBO/swift/cori_workflow3.sh

@@ -75,7 +75,7 @@ COMMON_DIR=$EMEWS_PROJECT_ROOT/../common/python
 export PYTHONPATH=$EMEWS_PROJECT_ROOT/python:$EMEWS_PROJECT_ROOT/ext/EQ-Py:$BENCHMARK_DIR:$COMMON_DIR
 export PYTHONHOME=/global/common/cori/software/python/2.7-anaconda/envs/deeplearning/
 
-export TURBINE_DIRECTIVE="#SBATCH --constraint=haswell\n#SBATCH --license=SCRATCH"
+export TURBINE_DIRECTIVE="#SBATCH --constraint=knl,quad,cache\n#SBATCH --license=SCRATCH\n#SBATCH --account=m2759"
 
 # Resident task workers and ranks
 export TURBINE_RESIDENT_WORK_WORKERS=1

workflows/p1b1_mlrMBO/swift/cori_workflow.sh

@@ -72,7 +72,7 @@ COMMON_DIR=$EMEWS_PROJECT_ROOT/../common/python
 export PYTHONPATH=$BENCHMARK_DIR:$COMMON_DIR:$EMEWS_PROJECT_ROOT/python
 export PYTHONHOME=/global/common/cori/software/python/2.7-anaconda/envs/deeplearning/
 
-export TURBINE_DIRECTIVE="#SBATCH --constraint=haswell\n#SBATCH --license=SCRATCH"
+export TURBINE_DIRECTIVE="#SBATCH --constraint=knl,quad,cache\n#SBATCH --license=SCRATCH\n#SBATCH --account=m2759"
 
 # Resident task workers and ranks
 export TURBINE_RESIDENT_WORK_WORKERS=1

workflows/p1b3_mlrMBO/swift/cori_workflow.sh

@@ -71,7 +71,7 @@ COMMON_DIR=$EMEWS_PROJECT_ROOT/../common/python
 export PYTHONPATH=$EMEWS_PROJECT_ROOT/python:$BENCHMARK_DIR:$COMMON_DIR
 export PYTHONHOME=/global/common/cori/software/python/2.7-anaconda/envs/deeplearning/
 
-export TURBINE_DIRECTIVE="#SBATCH --constraint=haswell\n#SBATCH --license=SCRATCH"
+export TURBINE_DIRECTIVE="#SBATCH --constraint=knl,quad,cache\n#SBATCH --license=SCRATCH\n#SBATCH --account=m2759"
 
 # Resident task workers and ranks
 export TURBINE_RESIDENT_WORK_WORKERS=1

workflows/p1b3_mlrMBO/swift/cori_workflow3.sh

@@ -75,7 +75,7 @@ COMMON_DIR=$EMEWS_PROJECT_ROOT/../common/python
 export PYTHONPATH=$EMEWS_PROJECT_ROOT/python:$BENCHMARK_DIR:$COMMON_DIR
 export PYTHONHOME=/global/common/cori/software/python/2.7-anaconda/envs/deeplearning/
 
-export TURBINE_DIRECTIVE="#SBATCH --constraint=haswell\n#SBATCH --license=SCRATCH"
+export TURBINE_DIRECTIVE="#SBATCH --constraint=knl,quad,cache\n#SBATCH --license=SCRATCH\n#SBATCH --account=m2759"
 
 # Resident task workers and ranks
 export TURBINE_RESIDENT_WORK_WORKERS=1

workflows/p2b1_mlrMBO/swift/cori_workflow3.sh

@@ -74,7 +74,7 @@ COMMON_DIR=$EMEWS_PROJECT_ROOT/../common/python
 export PYTHONPATH=$EMEWS_PROJECT_ROOT/python:$EMEWS_PROJECT_ROOT/ext/EQ-Py:$BENCHMARK_DIR:$COMMON_DIR
 export PYTHONHOME=/global/common/cori/software/python/2.7-anaconda/envs/deeplearning/
 
-export TURBINE_DIRECTIVE="#SBATCH --constraint=haswell\n#SBATCH --license=SCRATCH"
+export TURBINE_DIRECTIVE="#SBATCH --constraint=knl,quad,cache\n#SBATCH --license=SCRATCH\n#SBATCH --account=m2759"
 
 # Resident task workers and ranks
 export TURBINE_RESIDENT_WORK_WORKERS=1

workflows/p3b1_mlrMBO/swift/cori_workflow3.sh

@@ -79,7 +79,7 @@ COMMON_DIR=$EMEWS_PROJECT_ROOT/../common/python
 export PYTHONPATH=$EMEWS_PROJECT_ROOT/python:$EMEWS_PROJECT_ROOT/ext/EQ-Py:$BENCHMARK_DIR:$COMMON_DIR
 export PYTHONHOME=/global/common/cori/software/python/2.7-anaconda/envs/deeplearning/
 
-export TURBINE_DIRECTIVE="#SBATCH --constraint=haswell\n#SBATCH --license=SCRATCH"
+export TURBINE_DIRECTIVE="#SBATCH --constraint=knl,quad,cache\n#SBATCH --license=SCRATCH\n#SBATCH --account=m2759"
 
 # Resident task workers and ranks
 export TURBINE_RESIDENT_WORK_WORKERS=1