Skip to content

Commit ef47bff

Browse files
committed
Merge branch '489-damask-env-settings' into 'development'
improved setting of variables Closes #489 See merge request damask/DAMASK!1057
2 parents 1402671 + 894ccaf commit ef47bff

File tree

2 files changed

+17
-3
lines changed

2 files changed

+17
-3
lines changed

env/DAMASK.sh

+9-2
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,11 @@ SOLVER_MESH=$(type -p DAMASK_mesh || true 2>/dev/null)
4040
# http://superuser.com/questions/220059/what-parameters-has-ulimit
4141
ulimit -s unlimited 2>/dev/null # maximum stack size (kB)
4242

43+
[ "x$OMP_NUM_THREADS" == "x" ] && export OMP_NUM_THREADS=4
44+
[ "x$OPENBLAS_NUM_THREADS" == "x" ] && export OPENBLAS_NUM_THREADS=1 # avoid nested threads
45+
[ "x$I_MPI_JOB_ABORT_SIGNAL" == "x" ] && export I_MPI_JOB_ABORT_SIGNAL=15 # SIGTERM
46+
[ "x$I_MPI_JOB_SIGNAL_PROPAGATION" == "x" ] && export I_MPI_JOB_SIGNAL_PROPAGATION=yes
47+
4348
# disable output in case of scp
4449
if [ ! -z "$PS1" ]; then
4550
echo
@@ -51,15 +56,17 @@ if [ ! -z "$PS1" ]; then
5156
echo "DAMASK $DAMASK_ROOT $BRANCH"
5257
echo "Grid Solver $SOLVER_GRID"
5358
echo "Mesh Solver $SOLVER_MESH"
54-
if [ "x$PETSC_DIR" != "x" ]; then
59+
if [ "x$PETSC_DIR" != "x" ]; then
5560
echo -n "PETSc location "
5661
[ -d $PETSC_DIR ] && echo $PETSC_DIR || blink $PETSC_DIR
5762
[[ $(canonicalPath "$PETSC_DIR") == $PETSC_DIR ]] \
5863
|| echo " ~~> "$(canonicalPath "$PETSC_DIR")
5964
fi
6065
[ "x$PETSC_ARCH" != "x" ] && echo "PETSc architecture $PETSC_ARCH"
61-
[ "x$OMP_NUM_THREADS" == "x" ] && export OMP_NUM_THREADS=4
6266
echo "Multithreading OMP_NUM_THREADS=$OMP_NUM_THREADS"
67+
echo " OPENBLAS_NUM_THREADS=$OPENBLAS_NUM_THREADS"
68+
echo "IntelMPI I_MPI_JOB_ABORT_SIGNAL=$I_MPI_JOB_ABORT_SIGNAL"
69+
echo " I_MPI_JOB_SIGNAL_PROPAGATION=$I_MPI_JOB_SIGNAL_PROPAGATION"
6370
echo -n "heap size "
6471
[[ "$(ulimit -d)" == "unlimited" ]] \
6572
&& echo "unlimited" \

env/DAMASK.zsh

+8-1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@ SOLVER_MESH=$(which DAMASK_mesh || true 2>/dev/null)
3030
# http://superuser.com/questions/220059/what-parameters-has-ulimit
3131
ulimit -s unlimited 2>/dev/null # maximum stack size (kB)
3232

33+
[[ "x$OMP_NUM_THREADS" == "x" ]] && export OMP_NUM_THREADS=4
34+
[[ "x$OPENBLAS_NUM_THREADS" == "x" ]] && export OPENBLAS_NUM_THREADS=1 # avoid nested threads
35+
[[ "x$I_MPI_JOB_ABORT_SIGNAL" == "x" ]] && export I_MPI_JOB_ABORT_SIGNAL=15 # SIGTERM
36+
[[ "x$I_MPI_JOB_SIGNAL_PROPAGATION" == "x" ]] && export I_MPI_JOB_SIGNAL_PROPAGATION=yes
37+
3338
# disable output in case of scp
3439
if [ ! -z "$PS1" ]; then
3540
echo
@@ -48,8 +53,10 @@ if [ ! -z "$PS1" ]; then
4853
|| echo " ~~> "$(canonicalPath "$PETSC_DIR")
4954
fi
5055
[[ "x$PETSC_ARCH" != "x" ]] && echo "PETSc architecture $PETSC_ARCH"
51-
[[ "x$OMP_NUM_THREADS" == "x" ]] && export OMP_NUM_THREADS=4
5256
echo "Multithreading OMP_NUM_THREADS=$OMP_NUM_THREADS"
57+
echo " OPENBLAS_NUM_THREADS=$OPENBLAS_NUM_THREADS"
58+
echo "IntelMPI I_MPI_JOB_ABORT_SIGNAL=$I_MPI_JOB_ABORT_SIGNAL"
59+
echo " I_MPI_JOB_SIGNAL_PROPAGATION=$I_MPI_JOB_SIGNAL_PROPAGATION"
5360
echo -n "heap size "
5461
[[ "$(ulimit -d)" == "unlimited" ]] \
5562
&& echo "unlimited" \

0 commit comments

Comments
 (0)