From ea83705324585c148128ce209c3e413d36985531 Mon Sep 17 00:00:00 2001 From: dionperd Date: Thu, 21 Sep 2023 18:18:56 +0200 Subject: [PATCH] Further updates to docker scripts --- docker/cosimulate_tvb_nest.sh | 4 ++-- docker/cosimulate_with_staging.sh | 4 ++-- docker/hpc/example_script.sh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docker/cosimulate_tvb_nest.sh b/docker/cosimulate_tvb_nest.sh index 197fe0c77..b9c7475f4 100644 --- a/docker/cosimulate_tvb_nest.sh +++ b/docker/cosimulate_tvb_nest.sh @@ -1,12 +1,12 @@ #!/bin/sh echo "Pulling TVB-Multiscale docker image" -/apps/daint/system/opt/sarus/1.1.0/bin/sarus pull thevirtualbrain/tvb-multiscale:2.0.1 +/apps/daint/system/opt/sarus/1.1.0/bin/sarus pull thevirtualbrain/tvb-multiscale:2.1.0 start=$SECONDS echo "Start docker container" -srun -C mc /apps/daint/system/opt/sarus/1.1.0/bin/sarus --debug run --mpi thevirtualbrain/tvb-multiscale:2.0.1 /home/docker/env/neurosci/bin/python /home/docker/packages/tvb-multiscale/docker/installation_test.py +srun -C mc /apps/daint/system/opt/sarus/1.1.0/bin/sarus --debug run --mpi thevirtualbrain/tvb-multiscale:2.1.0 /home/docker/.local/bin/python /home/docker/packages/tvb-multiscale/docker/installation_test.py duration=$(( SECONDS - start )) diff --git a/docker/cosimulate_with_staging.sh b/docker/cosimulate_with_staging.sh index da3510bd0..1a710b91e 100644 --- a/docker/cosimulate_with_staging.sh +++ b/docker/cosimulate_with_staging.sh @@ -1,12 +1,12 @@ #!/bin/sh echo "Pulling TVB-Multiscale docker image" -/apps/daint/system/opt/sarus/1.1.0/bin/sarus pull thevirtualbrain/tvb-multiscale:2.0.1 +/apps/daint/system/opt/sarus/1.1.0/bin/sarus pull thevirtualbrain/tvb-multiscale:2.1.0 start=$SECONDS echo "Start docker container" -srun -C mc /apps/daint/system/opt/sarus/1.1.0/bin/sarus --debug run --mpi --mount=type=bind,source=$PWD,destination=$PWD thevirtualbrain/tvb-multiscale:2.0.1 /bin/bash -c "cd $PWD && /home/docker/env/neurosci/bin/python $1" +srun -C mc /apps/daint/system/opt/sarus/1.1.0/bin/sarus --debug run --mpi --mount=type=bind,source=$PWD,destination=$PWD thevirtualbrain/tvb-multiscale:2.1.0 /bin/bash -c "cd $PWD && /home/docker/.local/bin/python $1" duration=$(( SECONDS - start )) diff --git a/docker/hpc/example_script.sh b/docker/hpc/example_script.sh index 3db51137b..f7b58a5b6 100755 --- a/docker/hpc/example_script.sh +++ b/docker/hpc/example_script.sh @@ -10,7 +10,7 @@ export DOCKER_HOME=/home/docker export DOCKER_TVB_ROOT=$DOCKER_HOME/packages/tvb-root export DOCKER_TVB_MULTISCALE=$DOCKER_HOME/packages/tvb-multiscale export DOCKER_WORKDIR=$DOCKER_TVB_MULTISCALE/tvb_multiscale/examples/tvb_nest -export DOCKER_PYTHON=/usr/bin/python +export DOCKER_PYTHON=$DOCKER_HOME/.local/bin/python export DOCKER_RUN_FILE=/home/docker/packages/tvb-multiscale/tvb_multiscale/examples/tvb_nest/example.py export CMD=$DOCKER_PYTHON' '$DOCKER_RUN_FILE