Merge pull request #26 from eth-cscs/spawner-update

Allow multiple nodes

dockerfiles/Dockerfile

@@ -20,7 +20,7 @@ RUN . /opt/conda/bin/activate && \
 
 RUN . /opt/conda/bin/activate && \
     conda activate $__CONDA_ENV__ && \
-    pip install --no-cache jupyterhub==4.1.5 pyfirecrest==2.1.0 SQLAlchemy==1.4.52 oauthenticator==16.3.1
+    pip install --no-cache jupyterhub==4.1.6 pyfirecrest==2.1.0 SQLAlchemy==1.4.52 oauthenticator==16.3.1
 
 COPY . firecrestspawner
 RUN . /opt/conda/bin/activate && \

firecrestspawner/spawner.py

@@ -99,6 +99,11 @@ class FirecRESTSpawnerBase(Spawner):
         help="Number of processors to request from resource manager"
     ).tag(config=True)
 
+    req_nnodes = Unicode(
+        '',
+        help="Number of nodes to request from resource manager"
+    ).tag(config=True)
+
     req_ngpus = Unicode(
         '',
         help="Number of GPUs to request from resource manager"
@@ -514,6 +519,7 @@ class SlurmSpawner(FirecRESTSpawnerRegexStates):
 {% if memory     %}#SBATCH --mem={{memory}}{% endif %}
 {% if gres       %}#SBATCH --gres={{gres}}{% endif %}
 {% if nprocs     %}#SBATCH --cpus-per-task={{nprocs}}{% endif %}
+{% if nnodes     %}#SBATCH --nodes={{nnodes}}{% endif %}
 {% if reservation%}#SBATCH --reservation={{reservation}}{% endif %}
 {% if constraint %}#SBATCH --constraint={{constraint}}{% endif %}
 {% if options    %}#SBATCH {{options}}{% endif %}

requirements.txt

@@ -1,4 +1,4 @@
-jupyterhub==4.1.5
+jupyterhub==4.1.6
 pyfirecrest==2.1.0
 SQLAlchemy==1.4.52
 oauthenticator==16.3.1