From b46657620d1d9538e9988db504a9dc89121733aa Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Wed, 15 Feb 2017 15:06:13 +0100 Subject: [PATCH 1/8] MPI/OPAL/with_modules: - removed --- MPI/OPAL/with_modules | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 MPI/OPAL/with_modules diff --git a/MPI/OPAL/with_modules b/MPI/OPAL/with_modules deleted file mode 100644 index 4463df4..0000000 --- a/MPI/OPAL/with_modules +++ /dev/null @@ -1,9 +0,0 @@ -gcc/4.8.3 -openmpi/1.8.2 -ippl/1.1.4 -hdf5/1.8.12 -H5hut/1.99.13 -trilinos/11.10.2 -boost/1.55.0 -gsl/1.15 -root/5.34.19 From 7d18db27d533468b3782162fdbc0d17a7e922505 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Wed, 15 Feb 2017 15:08:27 +0100 Subject: [PATCH 2/8] OpenBLAS, boost, gsl, hdf5_serial, openmpi: - variants for gcc 6.3 added --- Compiler/OpenBLAS/0/variants | 1 + Compiler/boost/1/variants | 4 ++++ Compiler/gsl/2/variants | 1 + Compiler/hdf5_serial/1/variants | 3 ++- Compiler/openmpi/1.10/variants.Linux | 3 +++ 5 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Compiler/OpenBLAS/0/variants b/Compiler/OpenBLAS/0/variants index 8d2e761..dd46098 100644 --- a/Compiler/OpenBLAS/0/variants +++ b/Compiler/OpenBLAS/0/variants @@ -10,3 +10,4 @@ OpenBLAS/0.2.19 stable gcc/4.9.4 OpenBLAS/0.2.19 stable gcc/5.3.0 OpenBLAS/0.2.19 stable gcc/5.4.0 OpenBLAS/0.2.19 stable gcc/6.2.0 +OpenBLAS/0.2.19 stable gcc/6.3.0 diff --git a/Compiler/boost/1/variants b/Compiler/boost/1/variants index e28220f..c0ecaab 100644 --- a/Compiler/boost/1/variants +++ b/Compiler/boost/1/variants @@ -3,12 +3,16 @@ boost/1.55.0 stable gcc/4.8.3 b:Python/3.4.0 boost/1.55.0 stable gcc/4.8.4 b:Python/3.4.0 boost/1.55.0 stable gcc/4.8.5 b:Python/2.7.11 boost/1.55.0 stable gcc/4.9.2 b:Python/3.4.0 + boost/1.58.0 stable gcc/4.8.4 b:Python/3.4.0 boost/1.58.0 stable gcc/4.8.5 b:Python/2.7.11 boost/1.58.0 stable gcc/4.9.3 b:Python/2.7.11 + boost/1.61.0 stable gcc/4.8.5 b:Python/2.7.11 boost/1.61.0 stable gcc/6.2.0 b:Python/2.7.11 + boost/1.62.0 stable gcc/4.8.5 Python/2.7.12 boost/1.62.0 stable gcc/4.9.4 Python/2.7.12 boost/1.62.0 stable gcc/5.4.0 Python/2.7.12 boost/1.62.0 stable gcc/6.2.0 Python/2.7.12 +boost/1.62.0 unstable gcc/6.3.0 Python/2.7.12 diff --git a/Compiler/gsl/2/variants b/Compiler/gsl/2/variants index f05bdc3..214378b 100644 --- a/Compiler/gsl/2/variants +++ b/Compiler/gsl/2/variants @@ -2,3 +2,4 @@ gsl/2.2.1 stable gcc/4.8.5 gsl/2.2.1 stable gcc/4.9.4 gsl/2.2.1 stable gcc/5.4.0 gsl/2.2.1 stable gcc/6.2.0 +gsl/2.2.1 stable gcc/6.3.0 diff --git a/Compiler/hdf5_serial/1/variants b/Compiler/hdf5_serial/1/variants index 8213405..78cb1db 100644 --- a/Compiler/hdf5_serial/1/variants +++ b/Compiler/hdf5_serial/1/variants @@ -1,5 +1,5 @@ hdf5_serial/1.8.12 stable gcc/4.7.4 -hdf5_serial/1.8.12 deprecated gcc/4.8.3 +hdf5_serial/1.8.12 stable gcc/4.8.3 hdf5_serial/1.8.12 deprecated gcc/4.8.4 #hdf5_serial/1.8.12 stable gcc/4.8.5 hdf5_serial/1.8.12 deprecated gcc/4.9.2 @@ -33,3 +33,4 @@ hdf5_serial/1.8.18 stable gcc/4.8.5 hdf5_serial/1.8.18 stable gcc/4.9.4 hdf5_serial/1.8.18 stable gcc/5.4.0 hdf5_serial/1.8.18 stable gcc/6.2.0 +hdf5_serial/1.8.18 stable gcc/6.3.0 diff --git a/Compiler/openmpi/1.10/variants.Linux b/Compiler/openmpi/1.10/variants.Linux index 4ecfe59..b9986c2 100644 --- a/Compiler/openmpi/1.10/variants.Linux +++ b/Compiler/openmpi/1.10/variants.Linux @@ -1,6 +1,7 @@ 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.2 stable gcc/4.8.5 openmpi/1.10.2 stable gcc/4.9.3 openmpi/1.10.2 stable gcc/4.9.4 @@ -9,9 +10,11 @@ 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.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 unstable gcc/6.3.0 openmpi/1.10.2 unstable intel/15.3 From 3aa6cd96d9850de0007f4ab54cd65d6f8c33105d Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Wed, 15 Feb 2017 15:09:49 +0100 Subject: [PATCH 3/8] Compiler(openmpi/2.0/variants.Darwin - changed to current format --- Compiler/openmpi/2.0/variants.Darwin | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Compiler/openmpi/2.0/variants.Darwin b/Compiler/openmpi/2.0/variants.Darwin index 047dcf5..d2ba1f7 100644 --- a/Compiler/openmpi/2.0/variants.Darwin +++ b/Compiler/openmpi/2.0/variants.Darwin @@ -1,3 +1,7 @@ -2.0.0 unstable gcc/6.1.0 -2.0.0 unstable intel/16.3 -2.0.1 unstable gcc/6.2.0 +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 From 7b0f72d2208c3f942c717757be7be3e21304c884 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Wed, 15 Feb 2017 15:11:15 +0100 Subject: [PATCH 4/8] MPI/OPAL/1.5/variants* - snapshots added --- MPI/OPAL/1.5/variants | 2 ++ MPI/OPAL/1.5/variants.Darwin | 2 ++ 2 files changed, 4 insertions(+) create mode 100644 MPI/OPAL/1.5/variants.Darwin diff --git a/MPI/OPAL/1.5/variants b/MPI/OPAL/1.5/variants index 5fd4933..c5b189d 100644 --- a/MPI/OPAL/1.5/variants +++ b/MPI/OPAL/1.5/variants @@ -1,2 +1,4 @@ OPAL/1.5.0-20161209 unstable gcc/5.4.0 openmpi/1.10.4 dks/1.0.1 boost/1.62.0 hdf5/1.8.18 H5hut/2.0.0rc3 gsl/2.2.1 trilinos/12.10.1 cuda/8.0.44 b:cmake/3.6.3 b:OpenBLAS/0.2.19 +OPAL/1.5.0-20170126 unstable gcc/5.4.0 openmpi/1.10.4 dks/1.0.1 boost/1.62.0 hdf5/1.8.18 H5hut/2.0.0rc3 gsl/2.2.1 trilinos/12.10.1 cuda/8.0.44 b:cmake/3.6.3 b:OpenBLAS/0.2.19 +OPAL/1.5.1-20170210 unstable gcc/5.4.0 openmpi/1.10.4 dks/1.0.1 boost/1.62.0 hdf5/1.8.18 H5hut/2.0.0rc3 gsl/2.2.1 trilinos/12.10.1 cuda/8.0.44 b:cmake/3.6.3 b:OpenBLAS/0.2.19 diff --git a/MPI/OPAL/1.5/variants.Darwin b/MPI/OPAL/1.5/variants.Darwin new file mode 100644 index 0000000..21a8598 --- /dev/null +++ b/MPI/OPAL/1.5/variants.Darwin @@ -0,0 +1,2 @@ +OPAL/1.5.0-20170126 unstable gcc/5.4.0 openmpi/1.10.4 boost/1.62.0 hdf5/1.8.18 H5hut/2.0.0rc3 gsl/2.2.1 trilinos/12.10.1 b:cmake/3.6.3 b:OpenBLAS/0.2.19 + From afeef58b67466b6163a59ecbb2bb7532a0860ac3 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Wed, 15 Feb 2017 15:11:59 +0100 Subject: [PATCH 5/8] MPI/OPAL/build: - enable DKS on Linux only --- MPI/OPAL/build | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/MPI/OPAL/build b/MPI/OPAL/build index 6c4ff61..0f730d0 100755 --- a/MPI/OPAL/build +++ b/MPI/OPAL/build @@ -1,5 +1,15 @@ #!/usr/bin/env modbuild +config_args=() + +case ${OS} in +Darwin ) + : + ;; +Linux ) + : #config_args+=( '-DENABLE_DKS=ON' ) + ;; +esac # add -fopenmp to CC and CXX, if you want to compile with OpenMP pbuild::configure() { @@ -7,7 +17,7 @@ pbuild::configure() { -DCMAKE_INSTALL_PREFIX="${PREFIX}" \ -DCMAKE_BUILD_TYPE=RELEASE \ -DENABLE_SAAMG_SOLVER=TRUE \ - -DENABLE_DKS=ON \ + "${config_args[@]}" \ "${MODULE_SRCDIR}" } From ee97fa0adb3c304fa95b2e82a9fe4b8610e3c8e4 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Wed, 15 Feb 2017 15:12:42 +0100 Subject: [PATCH 6/8] MPI/dks/1/variants.Darwin - added --- MPI/dks/1/variants.Darwin | 1 + 1 file changed, 1 insertion(+) create mode 100644 MPI/dks/1/variants.Darwin diff --git a/MPI/dks/1/variants.Darwin b/MPI/dks/1/variants.Darwin new file mode 100644 index 0000000..d6ee7ac --- /dev/null +++ b/MPI/dks/1/variants.Darwin @@ -0,0 +1 @@ +dks/1.0.1 unstable gcc/5.4.0 openmpi/1.10.4 boost/1.62.0 b:cmake/3.6.3 From ea46054c910d8ded529ce961d30e759557780201 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Wed, 15 Feb 2017 15:14:33 +0100 Subject: [PATCH 7/8] OPAL/opt-pilot: - review build-block --- OPAL/opt-pilot/0/variants | 1 + OPAL/opt-pilot/0/variants.Darwin | 1 + OPAL/opt-pilot/build | 4 +--- 3 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 OPAL/opt-pilot/0/variants create mode 100644 OPAL/opt-pilot/0/variants.Darwin diff --git a/OPAL/opt-pilot/0/variants b/OPAL/opt-pilot/0/variants new file mode 100644 index 0000000..9c25ee8 --- /dev/null +++ b/OPAL/opt-pilot/0/variants @@ -0,0 +1 @@ +opt-pilot/0.1.3-20170126 unstable gcc/5.4.0 openmpi/1.10.4 dks/1.0.1 hdf5/1.8.18 H5hut/2.0.0rc3 trilinos/12.10.1 boost/1.62.0 gsl/2.2.1 root/6.08.02 OPAL/1.5.0-20170126 cuda/8.0.44 b:cmake/3.6.3 diff --git a/OPAL/opt-pilot/0/variants.Darwin b/OPAL/opt-pilot/0/variants.Darwin new file mode 100644 index 0000000..47cf932 --- /dev/null +++ b/OPAL/opt-pilot/0/variants.Darwin @@ -0,0 +1 @@ +opt-pilot/0.1.3-20170126 unstable gcc/5.4.0 openmpi/1.10.4 hdf5/1.8.18 H5hut/2.0.0rc3 trilinos/12.10.1 boost/1.62.0 gsl/2.2.1 root/6.08.02 OPAL/1.5.0-20170126 b:cmake/3.6.3 diff --git a/OPAL/opt-pilot/build b/OPAL/opt-pilot/build index e403851..855bfdb 100755 --- a/OPAL/opt-pilot/build +++ b/OPAL/opt-pilot/build @@ -11,8 +11,6 @@ pbuild::configure() { } pbuild::add_to_group 'OPAL' -pbuild::set_runtime_dependencies "${COMPILER}" "${MPI}" -pbuild::set_build_dependencies 'cmake' "${COMPILER}" "${MPI}" 'boost' 'hdf5' 'H5hut' 'trilinos' 'gsl' 'boost' 'OPAL' -pbuild::set_supported_compilers 'gcc/4.8' +pbuild::set_supported_compilers 'gcc/4.8' 'gcc/5.4' pbuild::make_all From 99cffa3039139ec7e2361ddc27171e370da486f1 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Wed, 15 Feb 2017 15:17:01 +0100 Subject: [PATCH 8/8] OPAL/opt-pilot/with-modules: - deleted --- OPAL/opt-pilot/with_modules | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 OPAL/opt-pilot/with_modules diff --git a/OPAL/opt-pilot/with_modules b/OPAL/opt-pilot/with_modules deleted file mode 100644 index bbad858..0000000 --- a/OPAL/opt-pilot/with_modules +++ /dev/null @@ -1,10 +0,0 @@ -gcc/4.8.3 -openmpi/1.8.2 -ippl/1.1.4 -hdf5/1.8.12 -H5hut/1.99.13 -trilinos/11.10.2 -boost/1.55.0 -gsl/1.15 -root/5.34.19 -OPAL/1.3.2