From f7cd37fa455da23dfc5c33be600b9c8d25205a91 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Wed, 9 Mar 2016 13:29:10 +0100 Subject: [PATCH 1/5] Compiler/openmpi/1.x.y/variants replaced --- Compiler/openmpi/1.10.0/variants | 4 ---- Compiler/openmpi/1.6.5/variants | 8 -------- Compiler/openmpi/1.8.2/variants | 6 ------ Compiler/openmpi/1.8.4/variants | 6 ------ Compiler/openmpi/1.8.8/variants | 4 ---- 5 files changed, 28 deletions(-) delete mode 100644 Compiler/openmpi/1.10.0/variants delete mode 100644 Compiler/openmpi/1.6.5/variants delete mode 100644 Compiler/openmpi/1.8.2/variants delete mode 100644 Compiler/openmpi/1.8.4/variants delete mode 100644 Compiler/openmpi/1.8.8/variants diff --git a/Compiler/openmpi/1.10.0/variants b/Compiler/openmpi/1.10.0/variants deleted file mode 100644 index 3ce0ed6..0000000 --- a/Compiler/openmpi/1.10.0/variants +++ /dev/null @@ -1,4 +0,0 @@ -:Linux:Darwin: unstable gcc/4.8.5 -:Linux:Darwin: unstable gcc/4.9.3 -:Linux:Darwin: unstable gcc/5.2.0 -:Linux: unstable intel/15.3 diff --git a/Compiler/openmpi/1.6.5/variants b/Compiler/openmpi/1.6.5/variants deleted file mode 100644 index e3a3a4c..0000000 --- a/Compiler/openmpi/1.6.5/variants +++ /dev/null @@ -1,8 +0,0 @@ -:Linux:Darwin: stable gcc/4.7.4 -:Linux:Darwin: stable gcc/4.8.3 -:Linux:Darwin: stable gcc/4.8.4 -:Linux:Darwin: unstable gcc/4.8.5 -:Linux:Darwin: stable gcc/4.9.2 -:Linux:Darwin: unstable gcc/4.9.3 -:Linux: stable intel/15.2 -:Linux: stable intel/15.3 diff --git a/Compiler/openmpi/1.8.2/variants b/Compiler/openmpi/1.8.2/variants deleted file mode 100644 index 9b00e28..0000000 --- a/Compiler/openmpi/1.8.2/variants +++ /dev/null @@ -1,6 +0,0 @@ -stable gcc/4.7.4 -stable gcc/4.8.3 -stable gcc/4.8.4 -unstable gcc/4.8.5 -stable gcc/4.9.2 -unstable gcc/4.9.3 diff --git a/Compiler/openmpi/1.8.4/variants b/Compiler/openmpi/1.8.4/variants deleted file mode 100644 index 9b00e28..0000000 --- a/Compiler/openmpi/1.8.4/variants +++ /dev/null @@ -1,6 +0,0 @@ -stable gcc/4.7.4 -stable gcc/4.8.3 -stable gcc/4.8.4 -unstable gcc/4.8.5 -stable gcc/4.9.2 -unstable gcc/4.9.3 diff --git a/Compiler/openmpi/1.8.8/variants b/Compiler/openmpi/1.8.8/variants deleted file mode 100644 index 3ce0ed6..0000000 --- a/Compiler/openmpi/1.8.8/variants +++ /dev/null @@ -1,4 +0,0 @@ -:Linux:Darwin: unstable gcc/4.8.5 -:Linux:Darwin: unstable gcc/4.9.3 -:Linux:Darwin: unstable gcc/5.2.0 -:Linux: unstable intel/15.3 From 8904624fd1c60067f91b2bc55c242fa5457f1fed Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Wed, 9 Mar 2016 13:30:02 +0100 Subject: [PATCH 2/5] Compiler/openmpi/1.x/variants: - added, replacing the 1.x.y/variants files --- Compiler/openmpi/1.10/variants | 4 ++++ Compiler/openmpi/1.6/variants | 9 +++++++++ Compiler/openmpi/1.8/variants | 8 ++++++++ 3 files changed, 21 insertions(+) create mode 100644 Compiler/openmpi/1.10/variants create mode 100644 Compiler/openmpi/1.6/variants create mode 100644 Compiler/openmpi/1.8/variants diff --git a/Compiler/openmpi/1.10/variants b/Compiler/openmpi/1.10/variants new file mode 100644 index 0000000..3ce0ed6 --- /dev/null +++ b/Compiler/openmpi/1.10/variants @@ -0,0 +1,4 @@ +:Linux:Darwin: unstable gcc/4.8.5 +:Linux:Darwin: unstable gcc/4.9.3 +:Linux:Darwin: unstable gcc/5.2.0 +:Linux: unstable intel/15.3 diff --git a/Compiler/openmpi/1.6/variants b/Compiler/openmpi/1.6/variants new file mode 100644 index 0000000..cb898d0 --- /dev/null +++ b/Compiler/openmpi/1.6/variants @@ -0,0 +1,9 @@ +1.6.5 stable Linux,Darwin gcc/4.7.4 +1.6.5 stable Linux,Darwin gcc/4.8.3 +1.6.5 stable Linux,Darwin gcc/4.8.4 +1.6.5 unstable Linux,Darwin gcc/4.8.5 +1.6.5 stable Linux,Darwin gcc/4.9.2 +1.6.5 unstable Linux,Darwin gcc/4.9.3 +1.6.5 stable Linux intel/15.2 +1.6.5 stable Linux intel/15.3 + diff --git a/Compiler/openmpi/1.8/variants b/Compiler/openmpi/1.8/variants new file mode 100644 index 0000000..108db59 --- /dev/null +++ b/Compiler/openmpi/1.8/variants @@ -0,0 +1,8 @@ +1.8.2,1.8.4,1.8.8 stable Linux,Darwin gcc/4.7.4 +1.8.2,1.8.4,1.8.8 stable Linux,Darwin gcc/4.8.3 +1.8.2,1.8.4,1.8.8 stable Linux,Darwin gcc/4.8.4 +1.8.2,1.8.4,1.8.8 unstable Linux,Darwin gcc/4.8.5 +1.8.2,1.8.4,1.8.8 stable Linux,Darwin gcc/4.9.2 +1.8.2,1.8.4,1.8.8 unstable Linux,Darwin gcc/4.9.3 + + From 8d9027b4d54904ebdd6b650a0ae4aec6aee5f692 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Wed, 9 Mar 2016 13:30:26 +0100 Subject: [PATCH 3/5] Programming/gcc/with_modules-4.9.3: - added --- Programming/gcc/with_modules-4.9.3 | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 Programming/gcc/with_modules-4.9.3 diff --git a/Programming/gcc/with_modules-4.9.3 b/Programming/gcc/with_modules-4.9.3 new file mode 100644 index 0000000..1b560bd --- /dev/null +++ b/Programming/gcc/with_modules-4.9.3 @@ -0,0 +1,3 @@ +gmp/6.0.0 +mpfr/3.1.3 +mpc/1.0.3 From e36ef9af5a1a80012f0030f345710320fa660d12 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Wed, 9 Mar 2016 13:31:08 +0100 Subject: [PATCH 4/5] Compiler/H5root/with_modules: - added --- Compiler/H5root/with_modules | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 Compiler/H5root/with_modules diff --git a/Compiler/H5root/with_modules b/Compiler/H5root/with_modules new file mode 100644 index 0000000..19c356f --- /dev/null +++ b/Compiler/H5root/with_modules @@ -0,0 +1,4 @@ +gcc/4.8.3 +hdf5_serial/1.8.12 +H5hut_serial/1.99.13 +root/5.34.26 From 0cde2f6950a6b3e43c3d1fff52db6b91b7eeb952 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Wed, 9 Mar 2016 13:32:53 +0100 Subject: [PATCH 5/5] bin/manage_variants: - added a first version --- bin/manage_variants | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100755 bin/manage_variants diff --git a/bin/manage_variants b/bin/manage_variants new file mode 100755 index 0000000..68e5cd4 --- /dev/null +++ b/bin/manage_variants @@ -0,0 +1,16 @@ +#!/bin/bash + +declare buildblock=$1 +declare variants=$2 + + +declare -r OS=$(uname -s) + +while read versions release oss dependencies; do + [[ "${oss}" =~ "${OS}" ]] || continue + versions_a=( ${versions//,/ } ) + dependencies_a=( ${dependencies//,/ } ) + for version in "${versions_a[@]}"; do + "${buildblock}" "${version}" --release=${release} "${dependencies_a[@]/#/--with=}" + done +done < "${variants}" \ No newline at end of file