From dbd2cd4acbda9415c8d43cf4b9035f9d0195a8fa Mon Sep 17 00:00:00 2001
From: jgp <jgp@cscs.ch>
Date: Tue, 20 Apr 2021 08:28:12 -0500
Subject: [PATCH 1/3] remove collections for alps

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

diff --git a/config/cscs.py b/config/cscs.py
index 9afda51de7..603650496c 100644
--- a/config/cscs.py
+++ b/config/cscs.py
@@ -973,7 +973,7 @@
                 'eiger', 'pilatus'
             ],
             'modules': [
-                {'name': 'PrgEnv-aocc', 'collection': True}
+                {'name': 'PrgEnv-aocc', 'collection': False}
             ]
         },
         {
@@ -982,7 +982,7 @@
                 'eiger', 'pilatus'
             ],
             'modules': [
-                {'name': 'PrgEnv-cray', 'collection': True}
+                {'name': 'PrgEnv-cray', 'collection': False}
             ]
         },
         {
@@ -991,16 +991,16 @@
                 'eiger', 'pilatus'
             ],
             'modules': [
-                {'name': 'PrgEnv-gnu', 'collection': True}
+                {'name': 'PrgEnv-gnu', 'collection': False}
             ]
         },
         {
             'name': 'PrgEnv-intel',
             'target_systems': [
-                'pilatus'
+                'eiger', 'pilatus'
             ],
             'modules': [
-                {'name': 'PrgEnv-intel', 'collection': True}
+                {'name': 'PrgEnv-intel', 'collection': False}
             ]
         },
         {
@@ -1033,7 +1033,7 @@
         {
             'name': 'cpeIntel',
             'target_systems': [
-                'pilatus'
+                'eiger', 'pilatus'
             ],
             'modules': [
                 'cpeIntel'

From 327c01de6222ddb0a09f9b01c0e02c4dc08c9f4e Mon Sep 17 00:00:00 2001
From: jgp <jgp@cscs.ch>
Date: Wed, 21 Apr 2021 05:23:17 -0500
Subject: [PATCH 2/3] fix for review

---
 config/cscs.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/cscs.py b/config/cscs.py
index 603650496c..b1c5d958b9 100644
--- a/config/cscs.py
+++ b/config/cscs.py
@@ -973,7 +973,7 @@
                 'eiger', 'pilatus'
             ],
             'modules': [
-                {'name': 'PrgEnv-aocc', 'collection': False}
+                {'name': 'PrgEnv-aocc'}
             ]
         },
         {
@@ -982,7 +982,7 @@
                 'eiger', 'pilatus'
             ],
             'modules': [
-                {'name': 'PrgEnv-cray', 'collection': False}
+                {'name': 'PrgEnv-cray'}
             ]
         },
         {
@@ -991,7 +991,7 @@
                 'eiger', 'pilatus'
             ],
             'modules': [
-                {'name': 'PrgEnv-gnu', 'collection': False}
+                {'name': 'PrgEnv-gnu'}
             ]
         },
         {
@@ -1000,7 +1000,7 @@
                 'eiger', 'pilatus'
             ],
             'modules': [
-                {'name': 'PrgEnv-intel', 'collection': False}
+                {'name': 'PrgEnv-intel'}
             ]
         },
         {

From 7b43c7f765d6477959a4dafa5a529a0ae9e40418 Mon Sep 17 00:00:00 2001
From: jgp <jgp@cscs.ch>
Date: Thu, 22 Apr 2021 12:04:19 +0200
Subject: [PATCH 3/3] fix for review

---
 config/cscs.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/cscs.py b/config/cscs.py
index b1c5d958b9..e20aee2ace 100644
--- a/config/cscs.py
+++ b/config/cscs.py
@@ -973,7 +973,7 @@
                 'eiger', 'pilatus'
             ],
             'modules': [
-                {'name': 'PrgEnv-aocc'}
+                'PrgEnv-aocc'
             ]
         },
         {
@@ -982,7 +982,7 @@
                 'eiger', 'pilatus'
             ],
             'modules': [
-                {'name': 'PrgEnv-cray'}
+                'PrgEnv-cray'
             ]
         },
         {
@@ -991,7 +991,7 @@
                 'eiger', 'pilatus'
             ],
             'modules': [
-                {'name': 'PrgEnv-gnu'}
+                'PrgEnv-gnu'
             ]
         },
         {
@@ -1000,7 +1000,7 @@
                 'eiger', 'pilatus'
             ],
             'modules': [
-                {'name': 'PrgEnv-intel'}
+                'PrgEnv-intel'
             ]
         },
         {