Skip to content

Commit 60bbeeb

Browse files
author
Theofilos Manitaras
committed
Address PR comments
1 parent 86c9889 commit 60bbeeb

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

cscs-checks/prgenv/openacc_checks.py

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,27 +5,26 @@
55
@rfm.parameterized_test([1], [2])
66
class OpenACCFortranCheck(rfm.RegressionTest):
77
def __init__(self, num_tasks):
8+
super().__init__()
89
if num_tasks == 1:
910
self.name = 'openacc_fortran_check'
1011
else:
1112
self.name = 'openacc_mpi_fortran_check'
1213

13-
super().__init__()
14+
self.descr = self.name
1415
self.valid_systems = ['daint:gpu', 'dom:gpu', 'kesch:cn']
1516
self.valid_prog_environs = ['PrgEnv-cray', 'PrgEnv-pgi']
16-
if self.current_system.name in ['daint', 'dom']:
17-
self.modules = ['craype-accel-nvidia60']
18-
self._pgi_flags = ['-acc', '-ta=tesla:cc60']
19-
elif self.current_system.name in ['kesch']:
20-
self.modules = ['craype-accel-nvidia35']
21-
self._pgi_flags = ['-acc', '-ta=tesla:cc35']
22-
2317
self.num_tasks = num_tasks
2418
if self.num_tasks == 1:
2519
self.sourcepath = 'vecAdd_openacc.f90'
2620
else:
2721
self.sourcepath = 'vecAdd_openacc_mpi.f90'
2822

23+
if self.current_system.name in ['daint', 'dom']:
24+
self.modules = ['craype-accel-nvidia60']
25+
elif self.current_system.name == 'kesch':
26+
self.modules = ['craype-accel-nvidia35']
27+
2928
self.build_system = 'SingleSource'
3029
self.num_gpus_per_node = 1
3130
self.executable = self.name
@@ -41,6 +40,9 @@ def setup(self, partition, environ, **job_opts):
4140
if environ.name == 'PrgEnv-cray':
4241
self.build_system.fflags = ['-hacc', '-hnoomp']
4342
elif environ.name == 'PrgEnv-pgi':
44-
self.build_system.fflags = self._pgi_flags
43+
if self.current_system.name in ['daint', 'dom']:
44+
self.build_system.fflags = ['-acc', '-ta=tesla:cc60']
45+
else:
46+
self.build_system.fflags = ['-acc', '-ta=tesla:cc35']
4547

4648
super().setup(partition, environ, **job_opts)

cscs-checks/prgenv/ulimit_check.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ def __init__(self):
1212
self.valid_prog_environs = ['PrgEnv-cray', 'PrgEnv-gnu',
1313
'PrgEnv-intel', 'PrgEnv-pgi']
1414
self.sourcepath = 'ulimit.c'
15-
self.build_system = 'SingleSource'
1615
self.sanity_patterns = sn.all([
1716
sn.assert_found(r'The soft limit is unlimited', self.stdout),
1817
sn.assert_found(r'The hard limit is unlimited', self.stdout),

0 commit comments

Comments
 (0)