From 9248f411764259a39dea22a11da7a7fd5ca9c2bd Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Thu, 28 Mar 2019 17:07:37 +0100 Subject: [PATCH] Compiler/openmpi: all variants merged and moved to 'files' --- Compiler/openmpi/1.10/variants.Darwin | 6 --- Compiler/openmpi/1.10/variants.Linux | 12 ----- Compiler/openmpi/1.4/variants.Linux | 2 - Compiler/openmpi/1.6/variants.Darwin | 3 -- Compiler/openmpi/1.6/variants.Linux | 3 -- Compiler/openmpi/1.8/variants.Darwin | 8 ---- Compiler/openmpi/1.8/variants.Linux | 8 ---- Compiler/openmpi/2.0/variants.Darwin | 3 -- Compiler/openmpi/2.0/variants.Linux | 5 --- Compiler/openmpi/2.1/variants.Darwin | 1 - Compiler/openmpi/2.1/variants.Linux | 11 ----- Compiler/openmpi/3/variants.Darwin | 5 --- Compiler/openmpi/3/variants.Linux | 12 ----- Compiler/openmpi/4/variants | 1 - Compiler/openmpi/files/variants.Darwin | 25 +++++++++++ .../openmpi/{1.10 => files}/variants.Edison | 0 Compiler/openmpi/files/variants.Linux | 44 +++++++++++++++++++ 17 files changed, 69 insertions(+), 80 deletions(-) delete mode 100644 Compiler/openmpi/1.10/variants.Darwin delete mode 100644 Compiler/openmpi/1.10/variants.Linux delete mode 100644 Compiler/openmpi/1.4/variants.Linux delete mode 100644 Compiler/openmpi/1.6/variants.Darwin delete mode 100644 Compiler/openmpi/1.6/variants.Linux delete mode 100644 Compiler/openmpi/1.8/variants.Darwin delete mode 100644 Compiler/openmpi/1.8/variants.Linux delete mode 100644 Compiler/openmpi/2.0/variants.Darwin delete mode 100644 Compiler/openmpi/2.0/variants.Linux delete mode 100644 Compiler/openmpi/2.1/variants.Darwin delete mode 100644 Compiler/openmpi/2.1/variants.Linux delete mode 100644 Compiler/openmpi/3/variants.Darwin delete mode 100644 Compiler/openmpi/3/variants.Linux delete mode 100644 Compiler/openmpi/4/variants create mode 100644 Compiler/openmpi/files/variants.Darwin rename Compiler/openmpi/{1.10 => files}/variants.Edison (100%) create mode 100644 Compiler/openmpi/files/variants.Linux diff --git a/Compiler/openmpi/1.10/variants.Darwin b/Compiler/openmpi/1.10/variants.Darwin deleted file mode 100644 index 53811af..0000000 --- a/Compiler/openmpi/1.10/variants.Darwin +++ /dev/null @@ -1,6 +0,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 deleted file mode 100644 index 465f65b..0000000 --- a/Compiler/openmpi/1.10/variants.Linux +++ /dev/null @@ -1,12 +0,0 @@ -openmpi/1.10.0 deprecated {gcc/4.8.4,4.9.2,4.9.3} - -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 intel/15.3 - -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.4/variants.Linux b/Compiler/openmpi/1.4/variants.Linux deleted file mode 100644 index 8db502b..0000000 --- a/Compiler/openmpi/1.4/variants.Linux +++ /dev/null @@ -1,2 +0,0 @@ -openmpi/1.4.3 stable gcc/4.7.4 - diff --git a/Compiler/openmpi/1.6/variants.Darwin b/Compiler/openmpi/1.6/variants.Darwin deleted file mode 100644 index b4a9b60..0000000 --- a/Compiler/openmpi/1.6/variants.Darwin +++ /dev/null @@ -1,3 +0,0 @@ -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 - diff --git a/Compiler/openmpi/1.6/variants.Linux b/Compiler/openmpi/1.6/variants.Linux deleted file mode 100644 index ebc8a2f..0000000 --- a/Compiler/openmpi/1.6/variants.Linux +++ /dev/null @@ -1,3 +0,0 @@ -openmpi/1.6.5 deprecated gcc/4.9.2 -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 deleted file mode 100644 index 5d93ac0..0000000 --- a/Compiler/openmpi/1.8/variants.Darwin +++ /dev/null @@ -1,8 +0,0 @@ -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,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 deleted file mode 100644 index d2d5f05..0000000 --- a/Compiler/openmpi/1.8/variants.Linux +++ /dev/null @@ -1,8 +0,0 @@ -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.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 deleted file mode 100644 index ee722fb..0000000 --- a/Compiler/openmpi/2.0/variants.Darwin +++ /dev/null @@ -1,3 +0,0 @@ -openmpi/2.0.0 stable gcc/6.1.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 deleted file mode 100644 index 27e2c88..0000000 --- a/Compiler/openmpi/2.0/variants.Linux +++ /dev/null @@ -1,5 +0,0 @@ -openmpi/2.0.0 stable gcc/6.1.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.Darwin b/Compiler/openmpi/2.1/variants.Darwin deleted file mode 100644 index 3612f00..0000000 --- a/Compiler/openmpi/2.1/variants.Darwin +++ /dev/null @@ -1 +0,0 @@ -openmpi/2.1.2 unstable gcc/7.3.0 diff --git a/Compiler/openmpi/2.1/variants.Linux b/Compiler/openmpi/2.1/variants.Linux deleted file mode 100644 index 75417b7..0000000 --- a/Compiler/openmpi/2.1/variants.Linux +++ /dev/null @@ -1,11 +0,0 @@ -openmpi/2.1.0 stable gcc/7.1.0 - -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,6.4.8,7.3.0} -openmpi/2.1.2 stable intel/17.4 - -openmpi/2.1.3 stable gcc/{5.5.0,6.4.0,7.3.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.Darwin b/Compiler/openmpi/3/variants.Darwin deleted file mode 100644 index f6dc53a..0000000 --- a/Compiler/openmpi/3/variants.Darwin +++ /dev/null @@ -1,5 +0,0 @@ -openmpi/3.0.0 stable gcc/7.3.0 -openmpi/3.0.2 stable gcc/7.3.0 -openmpi/3.1.1 stable gcc/7.3.0 -openmpi/3.1.2 stable gcc/7.3.0 -openmpi/3.1.3 stable gcc/7.3.0 diff --git a/Compiler/openmpi/3/variants.Linux b/Compiler/openmpi/3/variants.Linux deleted file mode 100644 index 9ff08bf..0000000 --- a/Compiler/openmpi/3/variants.Linux +++ /dev/null @@ -1,12 +0,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,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,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,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 deleted file mode 100644 index b99c0a5..0000000 --- a/Compiler/openmpi/4/variants +++ /dev/null @@ -1 +0,0 @@ -openmpi/4.0.0 unstable gcc/{5.5,6.4,6.5,7.3,7.4,8.2,8.3}.0 diff --git a/Compiler/openmpi/files/variants.Darwin b/Compiler/openmpi/files/variants.Darwin new file mode 100644 index 0000000..4014bb6 --- /dev/null +++ b/Compiler/openmpi/files/variants.Darwin @@ -0,0 +1,25 @@ +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.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,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} + +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 + +openmpi/2.0.0 stable gcc/6.1.0 +openmpi/2.0.1 unstable gcc/{4.8.5,4.9.4,5.4.0,6.2.0,6.3.0} + +openmpi/2.1.2 unstable gcc/7.3.0 + +openmpi/3.0.0 stable gcc/7.3.0 +openmpi/3.0.2 stable gcc/7.3.0 +openmpi/3.1.1 stable gcc/7.3.0 +openmpi/3.1.2 stable gcc/7.3.0 +openmpi/3.1.3 stable gcc/7.3.0 diff --git a/Compiler/openmpi/1.10/variants.Edison b/Compiler/openmpi/files/variants.Edison similarity index 100% rename from Compiler/openmpi/1.10/variants.Edison rename to Compiler/openmpi/files/variants.Edison diff --git a/Compiler/openmpi/files/variants.Linux b/Compiler/openmpi/files/variants.Linux new file mode 100644 index 0000000..e712c49 --- /dev/null +++ b/Compiler/openmpi/files/variants.Linux @@ -0,0 +1,44 @@ +openmpi/1.4.3 stable gcc/4.7.4 + +openmpi/1.6.5 deprecated gcc/4.9.2 +openmpi/1.6.5 stable intel/{15.2,15.3} + +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.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 + +openmpi/1.10.0 deprecated {gcc/4.8.4,4.9.2,4.9.3} +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 intel/15.3 +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 + +openmpi/2.0.0 stable gcc/6.1.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} + +openmpi/2.1.0 stable gcc/7.1.0 +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,6.4.8,7.3.0} +openmpi/2.1.2 stable intel/17.4 +openmpi/2.1.3 stable gcc/{5.5.0,6.4.0,7.3.0} +openmpi/2.1.5 stable gcc/{4.8.5,5.5.0,6.4.0,7.3.0,8.2.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,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,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,5.5.0,6.4.0,6.5.0,7.3.0,8.2.0,8.3.0} + +openmpi/4.0.0 unstable gcc/{5.5,6.4,6.5,7.3,7.4,8.2,8.3}.0