Skip to content

Commit 340fe72

Browse files
author
Vasileios Karakasis
authored
Merge branch 'master' into docs/renew-tutorial
2 parents ef5ca62 + 5115365 commit 340fe72

File tree

26 files changed

+222
-114
lines changed

26 files changed

+222
-114
lines changed

‎JenkinsfileDeploy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
def tag = env.TAG_NAME
22
def version = tag.substring(1) // Remove the first character of the tag which is 'v'
3-
def machines = '[dom daint TSAtds]' // To be included in the PR title
3+
def machines = '[dom daint tsa]' // To be included in the PR title
44
def reviewersPR = 'teojgo,vkarak' // The Github usernames requested for review
5-
def ebTemplate = '3.0-dev6' // The eb recipe of ReFrame to use as template
5+
def ebTemplate = '3.1-dev0' // The eb recipe of ReFrame to use as template
66

77
stage('Deploy Tests') {
88
node('daint') {

‎config/cscs-ci.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@
162162
'builtin'
163163
],
164164
'descr': 'Tsa compute nodes',
165-
'max_jobs': 10,
165+
'max_jobs': 20,
166166
'resources': [
167167
{
168168
'name': '_rfm_gpu',

‎config/cscs.py‎

Lines changed: 66 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@
141141
'environs': [
142142
'builtin',
143143
'PrgEnv-cray',
144+
'PrgEnv-cray_classic',
144145
'PrgEnv-gnu',
145146
'PrgEnv-intel',
146147
'PrgEnv-pgi'
@@ -175,6 +176,7 @@
175176
'environs': [
176177
'builtin',
177178
'PrgEnv-cray',
179+
'PrgEnv-cray_classic',
178180
'PrgEnv-gnu',
179181
'PrgEnv-intel',
180182
'PrgEnv-pgi'
@@ -221,6 +223,7 @@
221223
'environs': [
222224
'builtin',
223225
'PrgEnv-cray',
226+
'PrgEnv-cray_classic',
224227
'PrgEnv-gnu',
225228
'PrgEnv-intel',
226229
'PrgEnv-pgi'
@@ -288,7 +291,6 @@
288291
'environs': [
289292
'builtin',
290293
'PrgEnv-cray',
291-
'PrgEnv-cray_classic',
292294
'PrgEnv-gnu',
293295
'PrgEnv-intel',
294296
'PrgEnv-pgi'
@@ -323,7 +325,6 @@
323325
'environs': [
324326
'builtin',
325327
'PrgEnv-cray',
326-
'PrgEnv-cray_classic',
327328
'PrgEnv-gnu',
328329
'PrgEnv-intel',
329330
'PrgEnv-pgi'
@@ -364,7 +365,6 @@
364365
'environs': [
365366
'builtin',
366367
'PrgEnv-cray',
367-
'PrgEnv-cray_classic',
368368
'PrgEnv-gnu',
369369
'PrgEnv-intel',
370370
'PrgEnv-pgi'
@@ -545,10 +545,13 @@
545545
'environs': [
546546
'PrgEnv-pgi',
547547
'PrgEnv-pgi-nompi',
548+
'PrgEnv-pgi-nompi-nocuda',
548549
'PrgEnv-gnu',
549-
'PrgEnv-gnu-nompi'
550+
'PrgEnv-gnu-nompi',
551+
'PrgEnv-gnu-nompi-nocuda'
550552
],
551553
'descr': 'Arolla login nodes',
554+
'max_jobs': 4,
552555
'launcher': 'local'
553556
},
554557
{
@@ -560,10 +563,13 @@
560563
'environs': [
561564
'PrgEnv-pgi',
562565
'PrgEnv-pgi-nompi',
566+
'PrgEnv-pgi-nompi-nocuda',
563567
'PrgEnv-gnu',
564-
'PrgEnv-gnu-nompi'
568+
'PrgEnv-gnu-nompi',
569+
'PrgEnv-gnu-nompi-nocuda'
565570
],
566571
'descr': 'Arolla post-processing nodes',
572+
'max_jobs': 50,
567573
'launcher': 'srun'
568574
},
569575
{
@@ -575,8 +581,10 @@
575581
'environs': [
576582
'PrgEnv-gnu',
577583
'PrgEnv-gnu-nompi',
584+
'PrgEnv-gnu-nompi-nocuda',
578585
'PrgEnv-pgi',
579-
'PrgEnv-pgi-nompi'
586+
'PrgEnv-pgi-nompi',
587+
'PrgEnv-pgi-nompi-nocuda'
580588
],
581589
'descr': 'Arolla compute nodes',
582590
'resources': [
@@ -587,6 +595,7 @@
587595
]
588596
}
589597
],
598+
'max_jobs': 50,
590599
'launcher': 'srun'
591600
}
592601
]
@@ -606,10 +615,15 @@
606615
'environs': [
607616
'PrgEnv-pgi',
608617
'PrgEnv-pgi-nompi',
618+
'PrgEnv-pgi-nocuda',
619+
'PrgEnv-pgi-nompi-nocuda',
609620
'PrgEnv-gnu',
610-
'PrgEnv-gnu-nompi'
621+
'PrgEnv-gnu-nompi',
622+
'PrgEnv-gnu-nocuda',
623+
'PrgEnv-gnu-nompi-nocuda'
611624
],
612625
'descr': 'Tsa login nodes',
626+
'max_jobs': 4,
613627
'launcher': 'local'
614628
},
615629
{
@@ -621,10 +635,15 @@
621635
'environs': [
622636
'PrgEnv-pgi',
623637
'PrgEnv-pgi-nompi',
638+
'PrgEnv-pgi-nocuda',
639+
'PrgEnv-pgi-nompi-nocuda',
624640
'PrgEnv-gnu',
625-
'PrgEnv-gnu-nompi'
641+
'PrgEnv-gnu-nompi',
642+
'PrgEnv-gnu-nocuda',
643+
'PrgEnv-gnu-nompi-nocuda'
626644
],
627645
'descr': 'Tsa post-processing nodes',
646+
'max_jobs': 20,
628647
'launcher': 'srun'
629648
},
630649
{
@@ -636,10 +655,15 @@
636655
'environs': [
637656
'PrgEnv-gnu',
638657
'PrgEnv-gnu-nompi',
658+
'PrgEnv-gnu-nocuda',
659+
'PrgEnv-gnu-nompi-nocuda',
639660
'PrgEnv-pgi',
640-
'PrgEnv-pgi-nompi'
661+
'PrgEnv-pgi-nompi',
662+
'PrgEnv-pgi-nocuda',
663+
'PrgEnv-pgi-nompi-nocuda'
641664
],
642665
'descr': 'Tsa compute nodes',
666+
'max_jobs': 20,
643667
'resources': [
644668
{
645669
'name': '_rfm_gpu',
@@ -781,10 +805,22 @@
781805
'cxx': 'g++',
782806
'ftn': 'gfortran'
783807
},
808+
{
809+
'name': 'PrgEnv-pgi-nompi-nocuda',
810+
'target_systems': [
811+
'arolla', 'tsa'
812+
],
813+
'modules': [
814+
'PrgEnv-pgi/19.9-nocuda'
815+
],
816+
'cc': 'pgcc',
817+
'cxx': 'pgc++',
818+
'ftn': 'pgf90'
819+
},
784820
{
785821
'name': 'PrgEnv-pgi-nompi',
786822
'target_systems': [
787-
'arolla'
823+
'arolla', 'tsa'
788824
],
789825
'modules': [
790826
'PrgEnv-pgi/19.9'
@@ -796,7 +832,7 @@
796832
{
797833
'name': 'PrgEnv-pgi',
798834
'target_systems': [
799-
'arolla'
835+
'arolla', 'tsa'
800836
],
801837
'modules': [
802838
'PrgEnv-pgi/19.9'
@@ -806,72 +842,60 @@
806842
'ftn': 'mpifort'
807843
},
808844
{
809-
'name': 'PrgEnv-gnu',
845+
'name': 'PrgEnv-pgi-nocuda',
810846
'target_systems': [
811-
'arolla'
847+
'arolla', 'tsa'
812848
],
813849
'modules': [
814-
'PrgEnv-gnu/19.2'
850+
'PrgEnv-pgi/19.9-nocuda'
815851
],
816852
'cc': 'mpicc',
817853
'cxx': 'mpicxx',
818854
'ftn': 'mpifort'
819855
},
820856
{
821-
'name': 'PrgEnv-gnu-nompi',
857+
'name': 'PrgEnv-gnu',
822858
'target_systems': [
823-
'arolla'
859+
'arolla', 'tsa'
824860
],
825861
'modules': [
826862
'PrgEnv-gnu/19.2'
827863
],
828-
'cc': 'gcc',
829-
'cxx': 'g++',
830-
'ftn': 'gfortran'
831-
},
832-
{
833-
'name': 'PrgEnv-pgi-nompi',
834-
'target_systems': [
835-
'tsa'
836-
],
837-
'modules': [
838-
'PrgEnv-pgi/19.9'
839-
],
840-
'cc': 'pgcc',
841-
'cxx': 'pgc++',
842-
'ftn': 'pgf90'
864+
'cc': 'mpicc',
865+
'cxx': 'mpicxx',
866+
'ftn': 'mpifort'
843867
},
844868
{
845-
'name': 'PrgEnv-pgi',
869+
'name': 'PrgEnv-gnu-nocuda',
846870
'target_systems': [
847-
'tsa'
871+
'arolla', 'tsa'
848872
],
849873
'modules': [
850-
'PrgEnv-pgi/19.9'
874+
'PrgEnv-gnu/19.2-nocuda'
851875
],
852876
'cc': 'mpicc',
853877
'cxx': 'mpicxx',
854878
'ftn': 'mpifort'
855879
},
856880
{
857-
'name': 'PrgEnv-gnu',
881+
'name': 'PrgEnv-gnu-nompi',
858882
'target_systems': [
859-
'tsa'
883+
'arolla', 'tsa'
860884
],
861885
'modules': [
862886
'PrgEnv-gnu/19.2'
863887
],
864-
'cc': 'mpicc',
865-
'cxx': 'mpicxx',
866-
'ftn': 'mpifort'
888+
'cc': 'gcc',
889+
'cxx': 'g++',
890+
'ftn': 'gfortran'
867891
},
868892
{
869-
'name': 'PrgEnv-gnu-nompi',
893+
'name': 'PrgEnv-gnu-nompi-nocuda',
870894
'target_systems': [
871-
'tsa'
895+
'arolla', 'tsa'
872896
],
873897
'modules': [
874-
'PrgEnv-gnu/19.2'
898+
'PrgEnv-gnu/19.2-nocuda'
875899
],
876900
'cc': 'gcc',
877901
'cxx': 'g++',

‎cscs-checks/apps/jupyter/check_ipcmagic.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ def __init__(self):
1515
self.valid_systems = ['daint:gpu', 'dom:gpu']
1616
self.valid_prog_environs = ['PrgEnv-gnu']
1717
self.modules = ['ipcmagic']
18-
self.pre_run = [
18+
self.prerun_cmds = [
1919
'module unload dask',
2020
'module load Horovod/0.16.4-CrayGNU-19.10-tf-1.14.0'
2121
]

‎cscs-checks/cuda/cuda_checks.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ def __init__(self):
1717
self.valid_prog_environs += ['PrgEnv-cray-nompi',
1818
'PrgEnv-gnu-nompi']
1919
elif self.current_system.name in ['arolla', 'tsa']:
20-
self.valid_prog_environs += ['PrgEnv-gnu-nompi']
20+
self.valid_prog_environs += ['PrgEnv-pgi',
21+
'PrgEnv-gnu-nompi',
22+
'PrgEnv-pgi-nompi']
2123

2224
self.sourcesdir = os.path.join(self.current_system.resourcesdir,
2325
'CUDA', 'essentials')

‎cscs-checks/mch/automatic_arrays_acc.py‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,3 +84,9 @@ def cray_linker_workaround(self):
8484
if (self.current_system.name == 'dom' and
8585
self.current_environ.name == 'PrgEnv-cray'):
8686
self.variables['LINKER_X86_64'] = '/usr/bin/ld'
87+
88+
@rfm.run_before('compile')
89+
def cdt2006_pgi_workaround(self):
90+
if (self.current_system.name == 'dom' and
91+
self.current_environ.name == 'PrgEnv-pgi'):
92+
self.variables.update({'CUDA_HOME': '$CUDATOOLKIT_HOME'})

‎cscs-checks/mch/cuda_stress_test.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ def __init__(self):
1919
self.modules = ['cudatoolkit/8.0.61']
2020
elif self.current_system.name in ['arolla', 'tsa']:
2121
self.exclusive_access = True
22-
self.valid_prog_environs = ['PrgEnv-gnu-nompi']
22+
self.valid_prog_environs = ['PrgEnv-gnu', 'PrgEnv-gnu-nompi',
23+
'PrgEnv-pgi', 'PrgEnv-pgi-nompi']
2324
self.modules = ['cuda/10.1.243']
2425
else:
2526
self.valid_prog_environs = ['PrgEnv-gnu']

‎cscs-checks/mch/gpu_direct_acc.py‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,3 +80,9 @@ def cray_linker_workaround(self):
8080
if (self.current_system.name == 'dom' and
8181
self.current_environ.name == 'PrgEnv-cray'):
8282
self.variables['LINKER_X86_64'] = '/usr/bin/ld'
83+
84+
@rfm.run_before('compile')
85+
def cdt2006_pgi_workaround(self):
86+
if (self.current_system.name == 'dom' and
87+
self.current_environ.name == 'PrgEnv-pgi'):
88+
self.variables['CUDA_HOME'] = '$CUDATOOLKIT_HOME'

‎cscs-checks/mch/gpu_direct_cuda.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def __init__(self):
3333
self.build_system.cxxflags = ['-ccbin', 'mpicxx', '-arch=sm_37']
3434
elif self.current_system.name in ['arolla', 'tsa']:
3535
self.exclusive_access = True
36-
self.valid_prog_environs = ['PrgEnv-gnu']
36+
self.valid_prog_environs = ['PrgEnv-gnu', 'PrgEnv-pgi']
3737
self.variables = {
3838
'G2G': '1',
3939
}

‎cscs-checks/mch/openacc_cuda_mpi_cppstd.py‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,3 +90,9 @@ def setflags(self):
9090
self.build_system.ldflags += [
9191
'-L$EBROOTCUDA/lib64', '-lcublas', '-lcudart'
9292
]
93+
94+
@rfm.run_before('compile')
95+
def cdt2006_pgi_workaround(self):
96+
if (self.current_system.name == 'dom' and
97+
self.current_environ.name == 'PrgEnv-pgi'):
98+
self.variables.update({'CUDA_HOME': '$CUDATOOLKIT_HOME'})

0 commit comments

Comments
 (0)