From 1c8f8d91f85109ae6b932207920e3a661db3b4a2 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Mon, 25 Mar 2019 17:12:05 +0100 Subject: [PATCH] Compiler/openmpi: use brace expansion in variants files --- Compiler/openmpi/1.10/variants.Darwin | 13 +++-------- Compiler/openmpi/1.10/variants.Linux | 32 +++++---------------------- Compiler/openmpi/1.6/variants.Darwin | 6 +---- Compiler/openmpi/1.6/variants.Linux | 8 +------ Compiler/openmpi/1.8/variants.Darwin | 24 ++++++-------------- Compiler/openmpi/1.8/variants.Linux | 20 +++++------------ Compiler/openmpi/2.0/variants.Darwin | 6 +---- Compiler/openmpi/2.0/variants.Linux | 10 +++------ Compiler/openmpi/2.1/variants.Linux | 20 +++++------------ Compiler/openmpi/3/variants.Linux | 24 +++++--------------- Compiler/openmpi/4/variants | 1 + 11 files changed, 38 insertions(+), 126 deletions(-) create mode 100644 Compiler/openmpi/4/variants diff --git a/Compiler/openmpi/1.10/variants.Darwin b/Compiler/openmpi/1.10/variants.Darwin index 135c678..53811af 100644 --- a/Compiler/openmpi/1.10/variants.Darwin +++ b/Compiler/openmpi/1.10/variants.Darwin @@ -1,13 +1,6 @@ -openmpi/1.10.2 stable gcc/4.8.5 -openmpi/1.10.2 stable gcc/4.9.3 -openmpi/1.10.2 stable gcc/5.3.0 -openmpi/1.10.2 stable gcc/6.1.0 -openmpi/1.10.2 stable gcc/6.2.0 -openmpi/1.10.4 stable gcc/4.8.5 -openmpi/1.10.4 stable gcc/4.9.3 -openmpi/1.10.4 stable gcc/4.9.4 -openmpi/1.10.4 stable gcc/5.4.0 -openmpi/1.10.4 stable gcc/6.2.0 +openmpi/1.10.2 stable gcc/{4.8.5,4.9.3,5.3.0,6.1.0,6.2.0} + +openmpi/1.10.4 stable gcc/{4.8.5,4.9.3,4.9.4,5.4.0,6.2.0} openmpi/1.10.7 stable clang-macos/9.0.0 openmpi/1.10.7 stable gcc/7.3.0 diff --git a/Compiler/openmpi/1.10/variants.Linux b/Compiler/openmpi/1.10/variants.Linux index 1344ea6..465f65b 100644 --- a/Compiler/openmpi/1.10/variants.Linux +++ b/Compiler/openmpi/1.10/variants.Linux @@ -1,34 +1,12 @@ -openmpi/1.10.0 deprecated gcc/4.8.4 -openmpi/1.10.0 deprecated gcc/4.9.2 -openmpi/1.10.0 deprecated gcc/4.9.3 +openmpi/1.10.0 deprecated {gcc/4.8.4,4.9.2,4.9.3} -openmpi/1.10.2 stable gcc/4.8.5 -openmpi/1.10.2 stable gcc/4.9.3 -openmpi/1.10.2 stable gcc/4.9.4 +openmpi/1.10.2 stable {gcc/{4.8.5,4.9.3,4.9.4,5.3.0,5.4.0,6.1.0,6.2.0 openmpi/1.10.2 deprecated gcc/5.2.0 -openmpi/1.10.2 stable gcc/5.3.0 -openmpi/1.10.2 stable gcc/5.4.0 -openmpi/1.10.2 stable gcc/6.1.0 -openmpi/1.10.2 stable gcc/6.2.0 - openmpi/1.10.2 stable intel/15.3 -openmpi/1.10.4 stable gcc/4.8.5 -openmpi/1.10.4 stable gcc/4.9.4 -openmpi/1.10.4 stable gcc/5.4.0 -openmpi/1.10.4 stable gcc/6.2.0 -openmpi/1.10.4 stable gcc/6.3.0 - -openmpi/1.10.7 stable gcc/4.8.5 b:cuda/8.0.44 -openmpi/1.10.7 stable gcc/4.9.4 b:cuda/8.0.44 -openmpi/1.10.7 stable gcc/5.4.0 b:cuda/8.0.44 -openmpi/1.10.7 stable gcc/5.5.0 -openmpi/1.10.7 stable gcc/6.2.0 -openmpi/1.10.7 stable gcc/6.3.0 -openmpi/1.10.7 stable gcc/6.4.0 -openmpi/1.10.7 stable gcc/7.2.0 -openmpi/1.10.7 stable gcc/7.3.0 -openmpi/1.10.7 stable gcc/8.2.0 +openmpi/1.10.4 stable gcc/{4.8.5,4.9.4,5.4.0,6.2.0,6.3.0} +openmpi/1.10.7 stable gcc/{4.8.5,4.9.4,5.4.0} b:cuda/8.0.44 +openmpi/1.10.7 stable gcc/{5.5.0,6.2.0,6.3.0,6.4.0,7.2.0,7.3.0,8.2.0} openmpi/1.10.7 stable intel/17.4 diff --git a/Compiler/openmpi/1.6/variants.Darwin b/Compiler/openmpi/1.6/variants.Darwin index 7e8329a..b4a9b60 100644 --- a/Compiler/openmpi/1.6/variants.Darwin +++ b/Compiler/openmpi/1.6/variants.Darwin @@ -1,7 +1,3 @@ -openmpi/1.6.5 stable gcc/4.7.4 -openmpi/1.6.5 stable gcc/4.8.3 -openmpi/1.6.5 stable gcc/4.8.4 -openmpi/1.6.5 stable gcc/4.8.5 +openmpi/1.6.5 stable gcc/{4.7.4,4.8.3,4.8.4,4.8.5,4.9.3} openmpi/1.6.5 deprecated gcc/4.9.2 -openmpi/1.6.5 stable gcc/4.9.3 diff --git a/Compiler/openmpi/1.6/variants.Linux b/Compiler/openmpi/1.6/variants.Linux index c806108..ebc8a2f 100644 --- a/Compiler/openmpi/1.6/variants.Linux +++ b/Compiler/openmpi/1.6/variants.Linux @@ -1,9 +1,3 @@ -openmpi/1.6.5 stable gcc/4.7.4 -openmpi/1.6.5 stable gcc/4.8.3 -openmpi/1.6.5 stable gcc/4.8.4 -openmpi/1.6.5 stable gcc/4.8.5 openmpi/1.6.5 deprecated gcc/4.9.2 -openmpi/1.6.5 stable gcc/4.9.3 -openmpi/1.6.5 stable intel/15.2 -openmpi/1.6.5 stable intel/15.3 +openmpi/1.6.5 stable intel/{15.2,15.3} diff --git a/Compiler/openmpi/1.8/variants.Darwin b/Compiler/openmpi/1.8/variants.Darwin index 5610f48..5d93ac0 100644 --- a/Compiler/openmpi/1.8/variants.Darwin +++ b/Compiler/openmpi/1.8/variants.Darwin @@ -1,18 +1,8 @@ -openmpi/1.8.2 stable gcc/4.7.4 -openmpi/1.8.2 deprecated gcc/4.8.3 -openmpi/1.8.2 deprecated gcc/4.8.4 -openmpi/1.8.2 stable gcc/4.8.5 -openmpi/1.8.2 deprecated gcc/4.9.2 -openmpi/1.8.2 stable gcc/4.9.3 +openmpi/1.8.2 stable gcc/{4.7.4,4.8.5,4.9.3} +openmpi/1.8.2 deprecated gcc/{4.8.3,4.8.4,4.9.2} + openmpi/1.8.4 stable gcc/4.7.4 -openmpi/1.8.4 deprecated gcc/4.8.3 -openmpi/1.8.4 deprecated gcc/4.8.4 -openmpi/1.8.4 deprecated gcc/4.9.2 -openmpi/1.8.4 deprecated gcc/4.9.3 -openmpi/1.8.8 deprecated gcc/4.8.4 -openmpi/1.8.8 stable gcc/4.8.5 -openmpi/1.8.8 stable gcc/4.9.3 -openmpi/1.8.8 stable gcc/4.9.4 -openmpi/1.8.8 deprecated gcc/5.2.0 -openmpi/1.8.8 stable gcc/5.3.0 -openmpi/1.8.8 unstable gcc/6.1.0 +openmpi/1.8.4 deprecated gcc/{4.8.3,4.8.4,4.9.2,4.9.3} + +openmpi/1.8.8 stable gcc/{4.8.5,4.9.3,4.9.4,5.3.0,6.1.0} +openmpi/1.8.8 deprecated gcc/{4.8.4,5.2.0} diff --git a/Compiler/openmpi/1.8/variants.Linux b/Compiler/openmpi/1.8/variants.Linux index b6a408a..d2d5f05 100644 --- a/Compiler/openmpi/1.8/variants.Linux +++ b/Compiler/openmpi/1.8/variants.Linux @@ -1,16 +1,8 @@ -openmpi/1.8.2 stable gcc/4.7.4 -openmpi/1.8.2 stable gcc/4.8.3 -openmpi/1.8.2 stable gcc/4.8.4 -openmpi/1.8.2 stable gcc/4.8.5 +openmpi/1.8.2 stable gcc/{4.7.4,4.8.3,4.8.4,4.8.5,4.9.3} openmpi/1.8.2 deprecated gcc/4.9.2 -openmpi/1.8.2 stable gcc/4.9.3 -openmpi/1.8.4 stable gcc/4.7.4 -openmpi/1.8.4 stable gcc/4.8.3 -openmpi/1.8.4 stable gcc/4.8.4 -openmpi/1.8.4 stable gcc/4.9.2 -openmpi/1.8.8 deprecated gcc/4.8.4 -openmpi/1.8.8 stable gcc/4.8.5 -openmpi/1.8.8 stable gcc/4.9.3 -openmpi/1.8.8 deprecated gcc/5.2.0 -openmpi/1.8.8 stable gcc/5.3.0 + +openmpi/1.8.4 stable gcc/{4.7.4,4.8.3,4.8.4,4.9.2} + +openmpi/1.8.8 deprecated gcc/{4.8.4,5.2.0} +openmpi/1.8.8 stable gcc/{4.8.5,4.9.2,5.3.0} openmpi/1.8.8 unstable gcc/6.1.0 diff --git a/Compiler/openmpi/2.0/variants.Darwin b/Compiler/openmpi/2.0/variants.Darwin index d2ba1f7..ee722fb 100644 --- a/Compiler/openmpi/2.0/variants.Darwin +++ b/Compiler/openmpi/2.0/variants.Darwin @@ -1,7 +1,3 @@ openmpi/2.0.0 stable gcc/6.1.0 -openmpi/2.0.1 unstable gcc/4.8.5 -openmpi/2.0.1 unstable gcc/4.9.4 -openmpi/2.0.1 unstable gcc/5.4.0 -openmpi/2.0.1 unstable gcc/6.2.0 -openmpi/2.0.1 unstable gcc/6.3.0 +openmpi/2.0.1 unstable gcc/{4.8.5,4.9.4,5.4.0,6.2.0,6.3.0} diff --git a/Compiler/openmpi/2.0/variants.Linux b/Compiler/openmpi/2.0/variants.Linux index 1992f09..27e2c88 100644 --- a/Compiler/openmpi/2.0/variants.Linux +++ b/Compiler/openmpi/2.0/variants.Linux @@ -1,9 +1,5 @@ openmpi/2.0.0 stable gcc/6.1.0 - -openmpi/2.0.1 stable gcc/4.8.5 -openmpi/2.0.1 stable gcc/4.9.4 -openmpi/2.0.1 stable gcc/5.4.0 -openmpi/2.0.1 stable gcc/6.2.0 -openmpi/2.0.1 stable gcc/6.3.0 - openmpi/2.0.0 stable intel/16.3 + +openmpi/2.0.1 stable gcc/{4.8.5,4.9.4,5.4.0,6.2.0,6.3.0} + diff --git a/Compiler/openmpi/2.1/variants.Linux b/Compiler/openmpi/2.1/variants.Linux index 02db50b..75417b7 100644 --- a/Compiler/openmpi/2.1/variants.Linux +++ b/Compiler/openmpi/2.1/variants.Linux @@ -1,21 +1,11 @@ openmpi/2.1.0 stable gcc/7.1.0 -openmpi/2.1.1 stable gcc/6.4.0 -openmpi/2.1.1 stable gcc/7.2.0 -openmpi/2.1.1 unstable intel/17.1 -openmpi/2.1.1 stable intel/17.4 +openmpi/2.1.1 stable gcc/{6.4.0,7.2.0} +openmpi/2.1.1 stable intel/{17.1,17.4} -openmpi/2.1.2 stable gcc/5.5.0 -openmpi/2.1.2 stable gcc/6.4.0 -openmpi/2.1.2 stable gcc/7.3.0 +openmpi/2.1.2 stable gcc/{5.5.0,6.4.8,7.3.0} openmpi/2.1.2 stable intel/17.4 -openmpi/2.1.3 stable gcc/5.5.0 -openmpi/2.1.3 stable gcc/6.4.0 -openmpi/2.1.3 stable gcc/7.3.0 +openmpi/2.1.3 stable gcc/{5.5.0,6.4.0,7.3.0} -openmpi/2.1.5 stable gcc/4.8.5 -openmpi/2.1.5 stable gcc/5.5.0 -openmpi/2.1.5 stable gcc/6.4.0 -openmpi/2.1.5 stable gcc/7.3.0 -openmpi/2.1.5 stable gcc/8.2.0 +openmpi/2.1.5 stable gcc/{4.8.5,5.5.0,6.4.0,7.3.0,8.2.0} diff --git a/Compiler/openmpi/3/variants.Linux b/Compiler/openmpi/3/variants.Linux index 454137e..9ff08bf 100644 --- a/Compiler/openmpi/3/variants.Linux +++ b/Compiler/openmpi/3/variants.Linux @@ -1,26 +1,12 @@ -openmpi/3.0.0 stable gcc/5.5.0 -openmpi/3.0.0 stable gcc/6.4.0 -openmpi/3.0.0 stable gcc/7.2.0 -openmpi/3.0.0 stable gcc/7.3.0 +openmpi/3.0.0 stable gcc/{5.5.0,6.4.0,7.2.0,7.3.0} openmpi/3.0.0 stable intel/17.4 -openmpi/3.0.1 stable gcc/5.5.0 -openmpi/3.0.1 stable gcc/6.4.0 -openmpi/3.0.1 stable gcc/7.3.0 -openmpi/3.0.1 stable gcc/8.1.0 +openmpi/3.0.1 stable gcc/{5.5.0,6.4.0,7.3.0,8.1.0} openpmi/3.0.1 stable intel/18.2 -openmpi/3.1.1 stable gcc/8.1.0 -openmpi/3.1.1 stable gcc/8.2.0 +openmpi/3.1.1 stable gcc/{8.1.0,8.2.0} -openmpi/3.1.2 stable gcc/7.3.0 -openmpi/3.1.2 stable gcc/8.2.0 +openmpi/3.1.2 stable gcc/{7.3.0,8.2.0} openmpi/3.1.2 stable intel/18.4 -openmpi/3.1.3 stable gcc/4.8.5 -openmpi/3.1.3 stable gcc/5.5.0 -openmpi/3.1.3 stable gcc/6.4.0 -openmpi/3.1.3 stable gcc/6.5.0 -openmpi/3.1.3 stable gcc/7.3.0 -openmpi/3.1.3 stable gcc/8.2.0 -openmpi/3.1.3 stable gcc/8.3.0 +openmpi/3.1.3 stable gcc/{4.8.5,5.5.0,6.4.0,6.5.0,7.3.0,8.2.0,8.3.0} diff --git a/Compiler/openmpi/4/variants b/Compiler/openmpi/4/variants new file mode 100644 index 0000000..b99c0a5 --- /dev/null +++ b/Compiler/openmpi/4/variants @@ -0,0 +1 @@ +openmpi/4.0.0 unstable gcc/{5.5,6.4,6.5,7.3,7.4,8.2,8.3}.0