Skip to content
Merged
Changes from all commits
Commits
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
18 changes: 12 additions & 6 deletions config/cscs.py
Original file line number Diff line number Diff line change
Expand Up @@ -340,29 +340,34 @@ class ReframeSettings:
'kesch': {
'PrgEnv-pgi-nompi': {
'type': 'ProgEnvironment',
'modules': ['PrgEnv-pgi/17.10'],
'modules': ['PE/17.06',
'PrgEnv-pgi/18.5'],
'cc': 'pgcc',
'cxx': 'pgc++',
'ftn': 'pgf90',
},
'PrgEnv-pgi': {
'type': 'ProgEnvironment',
'modules': ['PrgEnv-pgi/17.10_gdr'],
'modules': ['PE/17.06',
'PrgEnv-pgi/18.5'],
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My comment was that we don't need both PrgEnv-pgi and PrgEnv-pgi-nompi, since they load completely the same modules.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ignore this.

'cc': 'mpicc',
'cxx': 'mpicxx',
'ftn': 'mpif90',
},
'PrgEnv-cray': {
'type': 'ProgEnvironment',
'modules': ['PrgEnv-cray/1.0.2_gdr'],
'modules': ['PE/17.06',
'PrgEnv-CrayCCE/17.06'],
},
'PrgEnv-cray-nompi': {
'type': 'ProgEnvironment',
'modules': ['PrgEnv-cray'],
'modules': ['PE/17.06',
'PrgEnv-cray'],
},
'PrgEnv-gnu': {
'type': 'ProgEnvironment',
'modules': ['gmvapich2/17.02_cuda_8.0_gdr'],
'modules': ['PE/17.06',
'gmvapich2/17.02_cuda_8.0_gdr'],
'variables': {
'LD_PRELOAD': '$(pkg-config --variable=libdir mvapich2-gdr)/libmpi.so'
},
Expand All @@ -372,7 +377,8 @@ class ReframeSettings:
},
'PrgEnv-gnu-nompi': {
'type': 'ProgEnvironment',
'modules': ['PrgEnv-gnu'],
'modules': ['PE/17.06',
'PrgEnv-gnu'],
'cc': 'gcc',
'cxx': 'g++',
'ftn': 'gfortran',
Expand Down