Skip to content

[test] Update PrgEnv-pgi definitions on Kesch #348

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 10, 2018
Merged

[test] Update PrgEnv-pgi definitions on Kesch #348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
65c08cf
updated prgenv-pgi; deleted workaround in gpu_direct_acc.py
ajocksch Jul 3, 2018
2a2e7f5
Merge branch 'master' into kesch/allprgenv
Jul 10, 2018
453f063
Merge branch 'master' into kesch/allprgenv
vkarak Jul 10, 2018
97e2d55
Fix broken test after conflict resolution
Jul 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 6 additions & 29 deletions config/cscs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,10 +124,8 @@ class ReframeSettings:
'access': ['--partition=cn-regression'],
'environs': ['PrgEnv-gnu', 'PrgEnv-cray',
'PrgEnv-pgi', 'PrgEnv-gnu-gdr',
'PrgEnv-pgi_16', 'PrgEnv-pgi_17',
'PrgEnv-pgi_18', 'PrgEnv-pgi_17_aj',
'PrgEnv-pgi_18_aj', 'PrgEnv-cray_aj',
'PrgEnv-cray_aj_b'],
'PrgEnv-pgi_17.10_gdr', 'PrgEnv-pgi_18.4_gdr',
'PrgEnv-cray_aj', 'PrgEnv-cray_aj_b'],
'descr': 'Kesch compute nodes',
'resources': {
'_rfm_gpu': ['--gres=gpu:{num_gpus_per_node}']
Expand Down Expand Up @@ -206,43 +204,22 @@ class ReframeSettings:
'ftn': 'mpif90',
},
'PrgEnv-pgi': {
'type': 'ProgEnvironment',
'modules': ['PrgEnv-pgi/17.10_aj'],
'cc': 'mpicc',
'cxx': 'mpicxx',
'ftn': 'mpif90',
},
'PrgEnv-pgi_16': {
'type': 'ProgEnvironment',
'modules': ['PrgEnv-pgi/16.10'],
'cc': 'mpicc',
'cxx': 'mpicxx',
'ftn': 'mpif90',
},
'PrgEnv-pgi_17': {
'type': 'ProgEnvironment',
'modules': ['PrgEnv-pgi/17.10'],
'cc': 'mpicc',
'cxx': 'mpicxx',
'ftn': 'mpif90',
},
'PrgEnv-pgi_18': {
'type': 'ProgEnvironment',
'modules': ['PrgEnv-pgi/18.4'],
'cc': 'mpicc',
'cxx': 'mpicxx',
'ftn': 'mpif90',
},
'PrgEnv-pgi_17_aj': {
'PrgEnv-pgi_17.10_gdr': {
'type': 'ProgEnvironment',
'modules': ['PrgEnv-pgi/17.10_aj'],
'modules': ['PrgEnv-pgi/17.10_gdr'],
'cc': 'mpicc',
'cxx': 'mpicxx',
'ftn': 'mpif90',
},
'PrgEnv-pgi_18_aj': {
'PrgEnv-pgi_18.4_gdr': {
'type': 'ProgEnvironment',
'modules': ['PrgEnv-pgi/18.4_aj'],
'modules': ['PrgEnv-pgi/18.4_gdr'],
'cc': 'mpicc',
'cxx': 'mpicxx',
'ftn': 'mpif90',
Expand Down
11 changes: 2 additions & 9 deletions cscs-checks/prgenv/gpu_direct_acc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ def __init__(self, **kwargs):
self.num_tasks_per_node = 1
elif self.current_system.name in ['kesch']:
self.modules = ['craype-accel-nvidia35']
self._pgi_flags = '-acc -ta=tesla:cc35 -Mnorpath'
self._pgi_flags = '-acc -ta=tesla:cc35'
self.variables = {
'MPICH_RDMA_ENABLED_CUDA': '1',
'MV2_USE_CUDA': '1',
'G2G': '1',
'G2G': '1'
}
self.num_tasks = 8
self.num_gpus_per_node = 8
Expand All @@ -43,11 +43,4 @@ def setup(self, partition, environ, **job_opts):
elif environ.name.startswith('PrgEnv-pgi'):
environ.fflags = self._pgi_flags

if (self.current_system.name in ['kesch']) and \
(environ.name.startswith('PrgEnv-pgi')):
self.pre_run = [
'export LD_PRELOAD='
'$(pkg-config --variable=libdir mvapich2-gdr)/libmpi.so'
]

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