diff --git a/dockerfiles/Dockerfile b/dockerfiles/Dockerfile index 5d22a6e..f185f68 100644 --- a/dockerfiles/Dockerfile +++ b/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 && \ diff --git a/firecrestspawner/spawner.py b/firecrestspawner/spawner.py index ae89e64..a71c101 100644 --- a/firecrestspawner/spawner.py +++ b/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 %} diff --git a/requirements.txt b/requirements.txt index bfdd1a4..2d4494b 100644 --- a/requirements.txt +++ b/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