Skip to content

Commit 4e434cd

Browse files
author
Vasileios Karakasis
authored
Merge branch 'master' into github_issue1947_failures
2 parents e34b7aa + 9fad84c commit 4e434cd

File tree

90 files changed

+2896
-1277
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+2896
-1277
lines changed

‎bootstrap.sh‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,25 @@ usage()
3131
{
3232
echo "Usage: $0 [-h] [+docs] [+pygelf]"
3333
echo "Bootstrap ReFrame by pulling all its dependencies"
34-
echo " -P EXEC Use EXEC as Python interpreter"
35-
echo " -h Print this help message and exit"
36-
echo " +docs Build also the documentation"
37-
echo " +pygelf Install also the pygelf Python package"
34+
echo " -P EXEC Use EXEC as Python interpreter"
35+
echo " -h Print this help message and exit"
36+
echo " --pip-opts Pass additional options to pip."
37+
echo " +docs Build also the documentation"
38+
echo " +pygelf Install also the pygelf Python package"
3839
}
3940

4041

41-
while getopts "hP:" opt; do
42+
while getopts "hP-:" opt; do
4243
case $opt in
4344
"P") python=$OPTARG ;;
4445
"h") usage && exit 0 ;;
46+
"-")
47+
case "${OPTARG}" in
48+
pip-opts)
49+
PIPOPTS="${!OPTIND}"; OPTIND=$(( $OPTIND + 1 )) ;;
50+
pip-opts=*)
51+
PIPOPTS=${OPTARG#*=} ;;
52+
esac;;
4553
"?") usage && exit 0 ;;
4654
esac
4755
done
@@ -94,12 +102,12 @@ CMD $python -m pip install --no-cache-dir -q --upgrade pip --target=external/
94102
if [ -n "$PYGELF" ]; then
95103
tmp_requirements=$(mktemp)
96104
sed -e 's/^#+pygelf%//g' requirements.txt > $tmp_requirements
97-
CMD_M +pygelf $python -m pip install --no-cache-dir -q -r $tmp_requirements --target=external/ --upgrade && rm $tmp_requirements
105+
CMD_M +pygelf $python -m pip install --no-cache-dir -q -r $tmp_requirements --target=external/ --upgrade $PIPOPTS && rm $tmp_requirements
98106
else
99-
CMD $python -m pip install --no-cache-dir -q -r requirements.txt --target=external/ --upgrade
107+
CMD $python -m pip install --no-cache-dir -q -r requirements.txt --target=external/ --upgrade $PIPOPTS
100108
fi
101109

102110
if [ -n "$MAKEDOCS" ]; then
103-
CMD_M +docs $python -m pip install --no-cache-dir -q -r docs/requirements.txt --target=external/ --upgrade
111+
CMD_M +docs $python -m pip install --no-cache-dir -q -r docs/requirements.txt --target=external/ --upgrade $PIPOPTS
104112
make -C docs PYTHON=$python
105113
fi

‎ci-scripts/ci-runner.bash‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ checked_exec()
4141

4242
run_tutorial_checks()
4343
{
44-
cmd="./bin/reframe -C tutorials/config/settings.py -J account=jenscscs \
45-
--save-log-files --flex-alloc-nodes=2 -r -x HelloThreadedExtendedTest $@"
44+
cmd="./bin/reframe -vv -C tutorials/config/settings.py -J account=jenscscs \
45+
--save-log-files --flex-alloc-nodes=2 -r -x HelloThreadedExtendedTest|BZip2.*Check $@"
4646
echo "[INFO] Running tutorial checks with \`$cmd'"
4747
checked_exec $cmd
4848
}
@@ -125,10 +125,7 @@ if [ "X${MODULEUSE}" != "X" ]; then
125125
module use ${MODULEUSE}
126126
fi
127127

128-
parallel_opts="--workers=auto --forked"
129-
if [[ $(hostname) =~ tsa|uan ]]; then
130-
parallel_opts=""
131-
fi
128+
parallel_opts=""
132129

133130
# Bootstrap ReFrame
134131
./bootstrap.sh

‎config/cscs.py‎

Lines changed: 45 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,8 @@
341341
'PrgEnv-cray',
342342
'PrgEnv-gnu',
343343
'PrgEnv-intel',
344-
'PrgEnv-pgi'
344+
'PrgEnv-pgi',
345+
'PrgEnv-nvidia'
345346
],
346347
'descr': 'Login nodes',
347348
'max_jobs': 4,
@@ -377,7 +378,8 @@
377378
'PrgEnv-cray',
378379
'PrgEnv-gnu',
379380
'PrgEnv-intel',
380-
'PrgEnv-pgi'
381+
'PrgEnv-pgi',
382+
'PrgEnv-nvidia'
381383
],
382384
'descr': 'Hybrid nodes (Haswell/P100)',
383385
'max_jobs': 100,
@@ -419,7 +421,8 @@
419421
'PrgEnv-cray',
420422
'PrgEnv-gnu',
421423
'PrgEnv-intel',
422-
'PrgEnv-pgi'
424+
'PrgEnv-pgi',
425+
'PrgEnv-nvidia'
423426
],
424427
'descr': 'Multicore nodes (Broadwell)',
425428
'max_jobs': 100,
@@ -694,6 +697,14 @@
694697
'name': 'mc',
695698
'descr': 'Multicore nodes (AMD EPYC 7742, 256|512GB/cn)',
696699
'scheduler': 'slurm',
700+
'container_platforms': [
701+
{
702+
'type': 'Sarus',
703+
},
704+
{
705+
'type': 'Singularity',
706+
}
707+
],
697708
'environs': [
698709
'builtin',
699710
'PrgEnv-aocc',
@@ -706,6 +717,7 @@
706717
'cpeIntel'
707718
],
708719
'max_jobs': 100,
720+
'access': ['-Cmc', f'--account={osext.osgroup()}'],
709721
'resources': [
710722
{
711723
'name': 'switches',
@@ -755,6 +767,14 @@
755767
'name': 'mc',
756768
'descr': 'Multicore nodes (AMD EPYC 7742, 256|512GB/cn)',
757769
'scheduler': 'slurm',
770+
'container_platforms': [
771+
{
772+
'type': 'Sarus',
773+
},
774+
{
775+
'type': 'Singularity',
776+
}
777+
],
758778
'environs': [
759779
'builtin',
760780
'PrgEnv-aocc',
@@ -1074,6 +1094,28 @@
10741094
'PrgEnv-pgi'
10751095
]
10761096
},
1097+
{
1098+
'name': 'PrgEnv-nvidia',
1099+
'target_systems': [
1100+
'pilatus'
1101+
],
1102+
'modules': [
1103+
'PrgEnv-nvidia',
1104+
# FIXME: We should not be forcing a cdt version
1105+
'cpe/21.06'
1106+
]
1107+
},
1108+
{
1109+
'name': 'PrgEnv-nvidia',
1110+
'target_systems': [
1111+
'dom', 'daint'
1112+
],
1113+
'modules': [
1114+
'PrgEnv-nvidia',
1115+
# FIXME: We should not be forcing a cdt version
1116+
'cdt/21.05'
1117+
]
1118+
},
10771119
{
10781120
'name': 'builtin',
10791121
'cc': 'cc',

0 commit comments

Comments
 (0)