Skip to content

Commit 930904b

Browse files
author
Vasileios Karakasis
committed
Merge branch 'master' into feat/use_unuse_path
2 parents 0369e4e + 9354331 commit 930904b

Some content is hidden

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

69 files changed

+508
-1177
lines changed

‎Jenkinsfile‎

Lines changed: 5 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ def uniqueID
1010

1111
stage('Initialization') {
1212
node('master') {
13-
try {
13+
catchError(stageResult: 'FAILURE') {
1414
uniqueID = "${env.ghprbActualCommit[0..6]}-${env.BUILD_ID}"
1515
echo 'Environment Variables:'
1616
echo sh(script: 'env|sort', returnStdout: true)
@@ -55,19 +55,7 @@ stage('Initialization') {
5555
currentBuild.result = 'ABORTED'
5656
return
5757
}
58-
5958
currentBuild.result = 'SUCCESS'
60-
} catch(err) {
61-
println err.toString()
62-
if (err.toString().contains('exit code 143')) {
63-
currentBuild.result = "ABORTED"
64-
}
65-
else if (err.toString().contains('Queue task was cancelled')) {
66-
currentBuild.result = "ABORTED"
67-
}
68-
else {
69-
currentBuild.result = "FAILURE"
70-
}
7159
}
7260
}
7361
}
@@ -101,22 +89,8 @@ stage('Unittest') {
10189
}
10290
}
10391

104-
try {
92+
catchError(stageResult: 'FAILURE') {
10593
parallel builds
106-
currentBuild.result = "SUCCESS"
107-
} catch(err) {
108-
if (err.toString().contains('exit code 143')) {
109-
currentBuild.result = "ABORTED"
110-
println "The Unittest was cancelled. Aborting....."
111-
}
112-
else if (err.toString().contains('Queue task was cancelled')) {
113-
currentBuild.result = "ABORTED"
114-
println "The Queue task was cancelled. Aborting....."
115-
}
116-
else {
117-
currentBuild.result = "FAILURE"
118-
println "The Unittest failed. Exiting....."
119-
}
12094
}
12195
}
12296

@@ -127,7 +101,7 @@ stage('Tutorial Check') {
127101
return
128102
}
129103
else {
130-
try {
104+
catchError(stageResult: 'FAILURE') {
131105
if (!('daint' in machinesToRun)) {
132106
return
133107
}
@@ -141,20 +115,6 @@ stage('Tutorial Check') {
141115
bash ${reframeDir}/${bashScript} -f ${reframeDir} -i '' -t""")
142116
}
143117
}
144-
currentBuild.result = "SUCCESS"
145-
} catch(err) {
146-
if (err.toString().contains('exit code 143')) {
147-
currentBuild.result = "ABORTED"
148-
println "The Tutorial Check was cancelled. Aborting....."
149-
}
150-
else if (err.toString().contains('Queue task was cancelled')) {
151-
currentBuild.result = "ABORTED"
152-
println "The Queue task was cancelled. Aborting....."
153-
}
154-
else {
155-
currentBuild.result = "FAILURE"
156-
println "The Tutorial Check failed. Exiting....."
157-
}
158118
}
159119
}
160120
}
@@ -181,22 +141,8 @@ stage('Cleanup') {
181141
}
182142
}
183143
}
184-
try {
144+
catchError(stageResult: 'FAILURE') {
185145
parallel builds
186-
currentBuild.result = "SUCCESS"
187-
} catch(err) {
188-
if (err.toString().contains('exit code 143')) {
189-
currentBuild.result = "ABORTED"
190-
println "The Cleanup was cancelled. Aborting....."
191-
}
192-
else if (err.toString().contains('Queue task was cancelled')) {
193-
currentBuild.result = "ABORTED"
194-
println "The Queue task was cancelled. Aborting....."
195-
}
196-
else {
197-
currentBuild.result = "FAILURE"
198-
println "The Cleanup failed. Exiting....."
199-
}
200146
}
201147
}
202148
}
@@ -218,21 +164,7 @@ stage('Cleanup Stale') {
218164
}
219165
}
220166

221-
try {
167+
catchError(stageResult: 'FAILURE') {
222168
parallel builds
223-
currentBuild.result = "SUCCESS"
224-
} catch(err) {
225-
if (err.toString().contains('exit code 143')) {
226-
currentBuild.result = "ABORTED"
227-
println "The Build step was cancelled. Aborting....."
228-
}
229-
else if (err.toString().contains('Queue task was cancelled')) {
230-
currentBuild.result = "ABORTED"
231-
println "The Queue task was cancelled. Aborting....."
232-
}
233-
else {
234-
currentBuild.result = "FAILURE"
235-
println "The Build step failed. Exiting....."
236-
}
237169
}
238170
}

‎config/cscs-ci.py‎

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -119,37 +119,6 @@
119119
}
120120
]
121121
},
122-
{
123-
'name': 'kesch',
124-
'descr': 'Kesch MCH',
125-
'hostnames': [
126-
r'keschln-\d+'
127-
],
128-
'modules_system': 'tmod',
129-
'resourcesdir': '/apps/common/UES/reframe/resources',
130-
'partitions': [
131-
{
132-
'name': 'cn',
133-
'scheduler': 'slurm',
134-
'access': [
135-
'--partition=cn-regression'
136-
],
137-
'environs': [
138-
'builtin'
139-
],
140-
'descr': 'Kesch compute nodes',
141-
'resources': [
142-
{
143-
'name': '_rfm_gpu',
144-
'options': [
145-
'--gres=gpu:{num_gpus_per_node}'
146-
]
147-
}
148-
],
149-
'launcher': 'srun'
150-
}
151-
]
152-
},
153122
{
154123
'name': 'tsa',
155124
'descr': 'Tsa MCH',

‎config/cscs.py‎

Lines changed: 0 additions & 146 deletions
Original file line numberDiff line numberDiff line change
@@ -481,73 +481,6 @@
481481
}
482482
]
483483
},
484-
{
485-
'name': 'kesch',
486-
'descr': 'Kesch MCH',
487-
'hostnames': [
488-
r'keschln-\d+'
489-
],
490-
'modules_system': 'tmod',
491-
'resourcesdir': '/apps/common/UES/reframe/resources',
492-
'partitions': [
493-
{
494-
'name': 'login',
495-
'scheduler': 'local',
496-
'environs': [
497-
'PrgEnv-cray',
498-
'PrgEnv-cray-nompi',
499-
'PrgEnv-pgi',
500-
'PrgEnv-pgi-nompi',
501-
'PrgEnv-gnu',
502-
'PrgEnv-gnu-nompi'
503-
],
504-
'descr': 'Kesch login nodes',
505-
'launcher': 'local'
506-
},
507-
{
508-
'name': 'pn',
509-
'scheduler': 'slurm',
510-
'access': [
511-
'--partition=pn-regression'
512-
],
513-
'environs': [
514-
'PrgEnv-cray',
515-
'PrgEnv-cray-nompi',
516-
'PrgEnv-pgi',
517-
'PrgEnv-pgi-nompi',
518-
'PrgEnv-gnu',
519-
'PrgEnv-gnu-nompi'
520-
],
521-
'descr': 'Kesch post-processing nodes',
522-
'launcher': 'srun'
523-
},
524-
{
525-
'name': 'cn',
526-
'scheduler': 'slurm',
527-
'access': [
528-
'--partition=cn-regression'
529-
],
530-
'environs': [
531-
'PrgEnv-cray',
532-
'PrgEnv-cray-nompi',
533-
'PrgEnv-pgi',
534-
'PrgEnv-pgi-nompi',
535-
'PrgEnv-gnu',
536-
'PrgEnv-gnu-nompi'
537-
],
538-
'descr': 'Kesch compute nodes',
539-
'resources': [
540-
{
541-
'name': '_rfm_gpu',
542-
'options': [
543-
'--gres=gpu:{num_gpus_per_node}'
544-
]
545-
}
546-
],
547-
'launcher': 'srun'
548-
}
549-
]
550-
},
551484
{
552485
'name': 'arolla',
553486
'descr': 'Arolla MCH',
@@ -744,85 +677,6 @@
744677
'cxx': 'g++',
745678
'ftn': 'gfortran'
746679
},
747-
{
748-
'name': 'PrgEnv-pgi-nompi',
749-
'target_systems': [
750-
'kesch'
751-
],
752-
'modules': [
753-
'PE/17.06',
754-
'PrgEnv-pgi/18.5'
755-
],
756-
'cc': 'pgcc',
757-
'cxx': 'pgc++',
758-
'ftn': 'pgf90'
759-
},
760-
{
761-
'name': 'PrgEnv-pgi',
762-
'target_systems': [
763-
'kesch'
764-
],
765-
'modules': [
766-
'PE/17.06',
767-
'pgi/18.5-gcc-5.4.0-2.26',
768-
'openmpi/4.0.1-pgi-18.5-gcc-5.4.0-2.26-cuda-8.0'
769-
],
770-
'cc': 'mpicc',
771-
'cxx': 'mpicxx',
772-
'ftn': 'mpifort'
773-
},
774-
{
775-
'name': 'PrgEnv-cray',
776-
'target_systems': [
777-
'kesch'
778-
],
779-
'modules': [
780-
'PE/17.06',
781-
'PrgEnv-CrayCCE/17.06'
782-
]
783-
},
784-
{
785-
'name': 'PrgEnv-cray-nompi',
786-
'target_systems': [
787-
'kesch'
788-
],
789-
'modules': [
790-
'PE/17.06',
791-
'PrgEnv-cray'
792-
]
793-
},
794-
{
795-
'name': 'PrgEnv-gnu',
796-
'target_systems': [
797-
'kesch'
798-
],
799-
'modules': [
800-
'PE/17.06',
801-
'gmvapich2/17.02_cuda_8.0_gdr'
802-
],
803-
'variables': [
804-
[
805-
'LD_PRELOAD',
806-
'$(pkg-config --variable=libdir mvapich2-gdr)/libmpi.so'
807-
]
808-
],
809-
'cc': 'mpicc',
810-
'cxx': 'mpicxx',
811-
'ftn': 'mpif90'
812-
},
813-
{
814-
'name': 'PrgEnv-gnu-nompi',
815-
'target_systems': [
816-
'kesch'
817-
],
818-
'modules': [
819-
'PE/17.06',
820-
'PrgEnv-gnu'
821-
],
822-
'cc': 'gcc',
823-
'cxx': 'g++',
824-
'ftn': 'gfortran'
825-
},
826680
{
827681
'name': 'PrgEnv-pgi-nompi-nocuda',
828682
'target_systems': [

‎cscs-checks/apps/gromacs/gromacs_check.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ def __init__(self, output_file):
5757
class GromacsGPUCheck(GromacsBaseCheck):
5858
def __init__(self, scale, variant):
5959
super().__init__('md.log')
60-
self.valid_systems = ['daint:gpu', 'tiger:gpu']
60+
self.valid_systems = ['daint:gpu']
6161
self.descr = 'GROMACS GPU check'
6262
self.executable_opts = ['mdrun', '-dlb yes', '-ntomp 1', '-npme 0',
6363
'-s herflat.tpr']

‎cscs-checks/compile/haswell_fma_check.py‎

Lines changed: 7 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,10 @@
1212
class HaswellFmaCheck(rfm.CompileOnlyRegressionTest):
1313
def __init__(self):
1414
self.descr = 'check for avx2 instructions'
15-
self.valid_systems = ['dom:login', 'daint:login', 'kesch:login']
16-
if self.current_system.name == 'kesch':
17-
self.valid_prog_environs = [
18-
'PrgEnv-cray', 'PrgEnv-gnu', 'PrgEnv-cray-nompi',
19-
'PrgEnv-gnu-nompi'
20-
]
21-
else:
22-
self.valid_prog_environs = [
23-
'PrgEnv-cray', 'PrgEnv-gnu',
24-
'PrgEnv-intel', 'PrgEnv-pgi'
25-
]
26-
self.modules = ['craype-haswell']
15+
self.valid_systems = ['dom:login', 'daint:login']
16+
self.valid_prog_environs = ['PrgEnv-cray', 'PrgEnv-gnu',
17+
'PrgEnv-intel', 'PrgEnv-pgi']
18+
self.modules = ['craype-haswell']
2719

2820
self.sourcesdir = 'src/haswell_fma'
2921
self.build_system = 'Make'
@@ -42,16 +34,6 @@ def __init__(self):
4234

4335
@rfm.run_before('compile')
4436
def setflags(self):
45-
if self.current_system.name == 'kesch':
46-
if self.current_environ.name.startswith('PrgEnv-cray'):
47-
# Ignore CPATH warning
48-
self.build_system.cflags += ['-h nomessage=1254']
49-
self.build_system.cxxflags += ['-h nomessage=1254']
50-
else:
51-
self.build_system.cflags += ['-march=native']
52-
self.build_system.cxxflags += ['-march=native']
53-
self.build_system.fflags += ['-march=native']
54-
else:
55-
if self.current_environ.name == 'PrgEnv-cray':
56-
self.build_system.cflags = ['-Ofast', '-S']
57-
self.build_system.cxxflags = ['-Ofast', '-S']
37+
if self.current_environ.name == 'PrgEnv-cray':
38+
self.build_system.cflags = ['-Ofast', '-S']
39+
self.build_system.cxxflags = ['-Ofast', '-S']

‎cscs-checks/compile/libsci_acc_symlink.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,9 @@
2020
class LibSciAccSymLinkTest(rfm.RunOnlyRegressionTest):
2121
def __init__(self, lib_name):
2222
self.descr = 'LibSciAcc symlink check of %s' % lib_name
23-
2423
self.valid_systems = [
2524
'daint:login', 'daint:gpu',
2625
'dom:login', 'dom:gpu',
27-
'tiger:login', 'tiger:gpu'
2826
]
2927
regex = (r'libsci_acc_(?P<prgenv>[A-Za-z]+)_((?P<cver>[A-Za-z0-9]+)_)'
3028
r'?(?P<version>\S+)')

0 commit comments

Comments
 (0)