Skip to content
Closed
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
54 changes: 47 additions & 7 deletions config/cscs.py
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,10 @@ class ReframeSettings:
'access': ['--partition=cn-regression'],
'environs': ['PrgEnv-gnu', 'PrgEnv-cray',
'PrgEnv-pgi', 'PrgEnv-gnu-gdr',
'PrgEnv-pgi_17.10_gdr', 'PrgEnv-pgi_18.4_gdr',
'PrgEnv-cray_gdr', 'PrgEnv-cray_gdr_2.3'],
'PrgEnv-cray_gdr', 'PrgEnv-cray_gdr_2.3',
'PrgEnv-c2sm-pgi', 'PrgEnv-c2sm-pgi-gpu',
'PrgEnv-c2sm-gnu', 'PrgEnv-c2sm-gnu-gpu',
'PrgEnv-c2sm-cray', 'PrgEnv-c2sm-cray-gpu'],
'descr': 'Kesch compute nodes',
'resources': {
'_rfm_gpu': ['--gres=gpu:{num_gpus_per_node}']
Expand Down Expand Up @@ -205,28 +207,66 @@ class ReframeSettings:
},
'PrgEnv-pgi': {
'type': 'ProgEnvironment',
'modules': ['PrgEnv-pgi/17.10'],
'modules': ['PrgEnv-pgi/17.10_gdr'],
'cc': 'mpicc',
'cxx': 'mpicxx',
'ftn': 'mpif90',
},
'PrgEnv-pgi_17.10_gdr': {
'PrgEnv-c2sm-gnu': {
'type': 'ProgEnvironment',
'modules': ['PrgEnv-pgi/17.10_gdr'],
'modules': ['PrgEnv-gnu', '/apps/common/UES/sandbox/kraushm/c2sm-rcm-env/env', 'c2sm/gnu-env/base'],
'cc': 'mpicc',
'cxx': 'mpicxx',
'ftn': 'mpif90',
},
'PrgEnv-c2sm-gnu-gpu': {
'type': 'ProgEnvironment',
'modules': ['PrgEnv-gnu', '/apps/common/UES/sandbox/kraushm/c2sm-rcm-env/env', 'c2sm/gnu-env/gpu'],
Copy link
Contributor

@ajocksch ajocksch Sep 3, 2018

Choose a reason for hiding this comment

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

For

'modules': ['PrgEnv-gnu', '/scratch/ajocksch/c2sm-rcm-env.git/modules/kesch/c2sm/gnu-env/gpu', 'mvapich2gdr_gnu/2.2_cuda_8.0'],

it is working

btw. why is 'PrgEnv-gnu' needed?

Copy link
Contributor

Choose a reason for hiding this comment

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

btw. why is 'PrgEnv-gnu' needed?

I think we should focus only on the Cray and PGI version for the moment.

'cc': 'mpicc',
'cxx': 'mpicxx',
'ftn': 'mpif90',
},
'PrgEnv-c2sm-gnu-cpp': {
'type': 'ProgEnvironment',
'modules': ['PrgEnv-gnu', '/apps/common/UES/sandbox/kraushm/c2sm-rcm-env/env', 'c2sm/gnu_for_cpp'],
'cc': 'mpicc',
'cxx': 'mpicxx',
'ftn': 'mpif90',
},
'PrgEnv-c2sm-cray': {
'type': 'ProgEnvironment',
'modules': ['/apps/common/UES/sandbox/kraushm/c2sm-rcm-env/env', 'c2sm/cray-env/base'],
'cc': 'cc',
'cxx': 'CC',
'ftn': 'ftn -D__CRAY_FORTRAN_',
Copy link
Contributor

Choose a reason for hiding this comment

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

I think the compiler variables should be using the corresponding environment variables that the guys set, e.g. $CXX etc. That's because they have a complex environment setup that is mixing up the standard programming environment. I don't think what we have here is enough.

},
'PrgEnv-c2sm-cray-gpu': {
'type': 'ProgEnvironment',
'modules': ['PrgEnv-cray', '/apps/common/UES/sandbox/kraushm/c2sm-rcm-env/env', 'c2sm/cray-env/gpu'],
'cc': 'cc',
'cxx': 'CC',
'ftn': 'ftn -D__CRAY_FORTRAN_',
},
'PrgEnv-c2sm-pgi': {
'type': 'ProgEnvironment',
'modules': ['/apps/common/UES/sandbox/kraushm/c2sm-rcm-env/env', 'c2sm/pgi-env/base'],
'cc': 'mpicc',
'cxx': 'mpicxx',
'ftn': 'mpif90',
},
'PrgEnv-pgi_18.4_gdr': {
'PrgEnv-c2sm-pgi-gpu': {
'type': 'ProgEnvironment',
'modules': ['PrgEnv-pgi/18.4_gdr'],
'modules': ['/apps/common/UES/sandbox/kraushm/c2sm-rcm-env/env', 'c2sm/pgi-env/gpu'],
'cc': 'mpicc',
'cxx': 'mpicxx',
'ftn': 'mpif90',
},
'PrgEnv-cray_gdr': {
'type': 'ProgEnvironment',
'modules': ['PrgEnv-cray/1.0.2_gdr'],
'cc': 'cc',
'cxx': 'CC',
'ftn': 'ftn',
},
'PrgEnv-cray_gdr_2.3': {
'type': 'ProgEnvironment',
Expand Down