Skip to content

Commit fe47222

Browse files
Merge pull request ComputationalRadiationPhysics#2546 from ax3l/topic-dgxDocker
DGX Docker
2 parents 1741a21 + 6aa10e8 commit fe47222

File tree

3 files changed

+11
-6
lines changed

3 files changed

+11
-6
lines changed

etc/picongpu/bash/mpiexec.tpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
.TBG_author=${MY_NAME:+--author \"${MY_NAME}\"}
2525
.TBG_profile=${PIC_PROFILE:-"~/picongpu.profile"}
2626

27-
# 4 gpus per node if we need more than 4 gpus else same count as TBG_tasks
28-
.TBG_gpusPerNode=$(if [ $TBG_tasks -gt 4 ] ; then echo 4; else echo $TBG_tasks; fi)
27+
# 8 gpus per node if we need more than 8 gpus else same count as TBG_tasks
28+
.TBG_gpusPerNode=$(if [ $TBG_tasks -gt 8 ] ; then echo 8; else echo $TBG_tasks; fi)
2929

3030
## end calculations ##
3131

etc/picongpu/bash/mpirun.tpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
.TBG_author=${MY_NAME:+--author \"${MY_NAME}\"}
2525
.TBG_profile=${PIC_PROFILE:-"~/picongpu.profile"}
2626

27-
# 4 gpus per node if we need more than 4 gpus else same count as TBG_tasks
28-
.TBG_gpusPerNode=$(if [ $TBG_tasks -gt 4 ] ; then echo 4; else echo $TBG_tasks; fi)
27+
# 8 gpus per node if we need more than 8 gpus else same count as TBG_tasks
28+
.TBG_gpusPerNode=$(if [ $TBG_tasks -gt 8 ] ; then echo 8; else echo $TBG_tasks; fi)
2929

3030
## end calculations ##
3131

share/picongpu/dockerfiles/ubuntu-1604/Dockerfile

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,19 @@ RUN /bin/echo -e "source $SPACK_ROOT/share/spack/setup-env.sh\n" \
6161
"spack load $PIC_PACKAGE\n" \
6262
'if [ $(id -u) -eq 0 ]; then\n' \
6363
' function mpirun { $(which mpirun) --allow-run-as-root $@; }\n' \
64-
'fi' \
64+
'fi\n' \
65+
'export -f mpirun\n' \
66+
'if [ $(id -u) -eq 0 ]; then\n' \
67+
' function mpiexec { $(which mpiexec) --allow-run-as-root $@; }\n' \
68+
'fi\n' \
69+
'export -f mpiexec\n' \
6570
> /etc/profile.d/picongpu.sh
6671

6772
# build example for out-of-the-box usage: LWFA
6873
RUN /bin/bash -l -c ' \
6974
pic-create $PICSRC/share/picongpu/examples/LaserWakefield /opt/picInputs/lwfa && \
7075
cd /opt/picInputs/lwfa && \
71-
pic-build -b "cuda:30;35;37;50;60" && \
76+
pic-build -b "cuda:30;35;37;50;60" -c'-DCUDAMEMTEST_ENABLE=OFF' && \
7277
rm -rf .build'
7378

7479
COPY start_lwfa.sh /usr/bin/lwfa

0 commit comments

Comments
 (0)