Merge pull request #782 from vkarak/ci/ault-config

[ci] Expand Ault configuration
reframe-hpc · May 17, 2019 · 6f9f7f5 · 6f9f7f5
2 parents df7a617 + e85fed5
commit 6f9f7f5
Showing 1 changed file with 20 additions and 9 deletions.
diff --git a/config/cscs.py b/config/cscs.py
@@ -11,7 +11,6 @@ class ReframeSettings:
     checks_path_recurse = True
     site_configuration = {
         'systems': {
-
             'ault': {
                 'descr': 'Ault TDS',
                 'hostnames': ['ault'],
@@ -21,25 +20,37 @@ class ReframeSettings:
                     'login': {
                         'scheduler': 'local',
                         'environs': ['PrgEnv-gnu'],
-                        'descr': 'Login nodes (SkylakeSilver)',
+                        'descr': 'Login nodes',
                         'max_jobs': 4
                     },
-
-                    'v100': {
+                    'amdv100': {
+                        'scheduler': 'nativeslurm',
+                        'access':  ['-pamdv100'],
+                        'environs': ['PrgEnv-gnu'],
+                        'descr': 'AMD Naples 32c + 2x NVIDIA V100',
+                        'max_jobs': 100,
+                    },
+                    'amdvega': {
+                        'scheduler': 'nativeslurm',
+                        'access':  ['-pamdvega'],
+                        'environs': ['PrgEnv-gnu'],
+                        'descr': 'AMD Naples 32c + 3x AMD GFX900',
+                        'max_jobs': 100,
+                    },
+                    'intelv100': {
                         'scheduler': 'nativeslurm',
                         'access':  ['-pintelv100'],
                         'environs': ['PrgEnv-gnu'],
-                        'descr': 'Hybrid Nvidia nodes (Skylake36c/4*V100)',
+                        'descr': 'Intel Skylake 36c + 4x NVIDIA V100',
                         'max_jobs': 100,
                     },
-
-                    'skl': {
+                    'intel': {
                         'scheduler': 'nativeslurm',
                         'access':  ['-pintel'],
                         'environs': ['PrgEnv-gnu'],
-                        'descr': 'Multicore nodes (Skylake36c)',
+                        'descr': 'Intel Skylake 36c',
                         'max_jobs': 100,
-                    },
+                    }
                 }
             },