From b948c721dcdb54b9acdf83a4b5d0ebe343600fec Mon Sep 17 00:00:00 2001
From: Vasileios Karakasis <karakasis@cscs.ch>
Date: Thu, 16 May 2019 14:00:41 +0200
Subject: [PATCH 1/2] Expand Ault config

---
 config/cscs.py | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/config/cscs.py b/config/cscs.py
index 5df1f23d2e..a0afec4afd 100644
--- a/config/cscs.py
+++ b/config/cscs.py
@@ -24,22 +24,34 @@ class ReframeSettings:
                         'descr': 'Login nodes (SkylakeSilver)',
                         'max_jobs': 4
                     },
-
-                    'v100': {
+                    'amdv100': {
+                        'scheduler': 'nativeslurm',
+                        'access':  ['-pamdv100'],
+                        'environs': ['PrgEnv-gnu'],
+                        'descr': 'Hybrid AMD/Nvidia nodes (Naples 32c / 2x V100)',
+                        'max_jobs': 100,
+                    },
+                    'amdvega': {
+                        'scheduler': 'nativeslurm',
+                        'access':  ['-pamdvega'],
+                        'environs': ['PrgEnv-gnu'],
+                        'descr': 'Hybrid AMD nodes (Naples 32c / 3x GFX900)',
+                        'max_jobs': 100,
+                    },
+                    'intelv100': {
                         'scheduler': 'nativeslurm',
                         'access':  ['-pintelv100'],
                         'environs': ['PrgEnv-gnu'],
-                        'descr': 'Hybrid Nvidia nodes (Skylake36c/4*V100)',
+                        'descr': 'Hybrid Intel/Nvidia nodes (Skylake 36c / 4x V100)',
                         'max_jobs': 100,
                     },
-
-                    'skl': {
+                    'intel': {
                         'scheduler': 'nativeslurm',
                         'access':  ['-pintel'],
                         'environs': ['PrgEnv-gnu'],
-                        'descr': 'Multicore nodes (Skylake36c)',
+                        'descr': 'Multicore nodes (Skylake 36c)',
                         'max_jobs': 100,
-                    },
+                    }
                 }
             },
 

From e85fed5b4533024a4398f778baa07f71670970ec Mon Sep 17 00:00:00 2001
From: Vasileios Karakasis <karakasis@cscs.ch>
Date: Thu, 16 May 2019 14:15:58 +0200
Subject: [PATCH 2/2] Fix PEP8 issues

---
 config/cscs.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/config/cscs.py b/config/cscs.py
index a0afec4afd..15c641fa93 100644
--- 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,35 +20,35 @@ class ReframeSettings:
                     'login': {
                         'scheduler': 'local',
                         'environs': ['PrgEnv-gnu'],
-                        'descr': 'Login nodes (SkylakeSilver)',
+                        'descr': 'Login nodes',
                         'max_jobs': 4
                     },
                     'amdv100': {
                         'scheduler': 'nativeslurm',
                         'access':  ['-pamdv100'],
                         'environs': ['PrgEnv-gnu'],
-                        'descr': 'Hybrid AMD/Nvidia nodes (Naples 32c / 2x V100)',
+                        'descr': 'AMD Naples 32c + 2x NVIDIA V100',
                         'max_jobs': 100,
                     },
                     'amdvega': {
                         'scheduler': 'nativeslurm',
                         'access':  ['-pamdvega'],
                         'environs': ['PrgEnv-gnu'],
-                        'descr': 'Hybrid AMD nodes (Naples 32c / 3x GFX900)',
+                        'descr': 'AMD Naples 32c + 3x AMD GFX900',
                         'max_jobs': 100,
                     },
                     'intelv100': {
                         'scheduler': 'nativeslurm',
                         'access':  ['-pintelv100'],
                         'environs': ['PrgEnv-gnu'],
-                        'descr': 'Hybrid Intel/Nvidia nodes (Skylake 36c / 4x V100)',
+                        'descr': 'Intel Skylake 36c + 4x NVIDIA V100',
                         'max_jobs': 100,
                     },
                     'intel': {
                         'scheduler': 'nativeslurm',
                         'access':  ['-pintel'],
                         'environs': ['PrgEnv-gnu'],
-                        'descr': 'Multicore nodes (Skylake 36c)',
+                        'descr': 'Intel Skylake 36c',
                         'max_jobs': 100,
                     }
                 }