From 3fa080876f5497df96330bb367c66d5f7e0d2a7e Mon Sep 17 00:00:00 2001 From: Hans-Christian Stadler Kleeb Date: Tue, 22 Aug 2017 09:45:37 +0200 Subject: [PATCH 01/11] Add gcc 7.2.0 --- Programming/gcc/7/variants | 1 + 1 file changed, 1 insertion(+) diff --git a/Programming/gcc/7/variants b/Programming/gcc/7/variants index 52ce704..fb04c2b 100644 --- a/Programming/gcc/7/variants +++ b/Programming/gcc/7/variants @@ -1 +1,2 @@ gcc/7.1.0 stable b:gmp/6.1.2 b:mpfr/3.1.5 b:mpc/1.0.3 +gcc/7.2.0 stable b:gmp/6.1.2 b:mpfr/3.1.5 b:mpc/1.0.3 From bd4fd0f326781780c2f7b5b83a8ed3ede12c0817 Mon Sep 17 00:00:00 2001 From: Hans-Christian Stadler Kleeb Date: Tue, 22 Aug 2017 09:46:07 +0200 Subject: [PATCH 02/11] Add gcc 6.4.0 --- Programming/gcc/6/variants | 1 + 1 file changed, 1 insertion(+) diff --git a/Programming/gcc/6/variants b/Programming/gcc/6/variants index dee69bc..2ff0755 100644 --- a/Programming/gcc/6/variants +++ b/Programming/gcc/6/variants @@ -1,3 +1,4 @@ gcc/6.1.0 stable b:gmp/6.1.0 b:mpfr/3.1.4 b:mpc/1.0.3 gcc/6.2.0 stable b:gmp/6.1.1 b:mpfr/3.1.4 b:mpc/1.0.3 gcc/6.3.0 stable b:gmp/6.1.2 b:mpfr/3.1.5 b:mpc/1.0.3 +gcc/6.4.0 stable b:gmp/6.1.2 b:mpfr/3.1.5 b:mpc/1.0.3 From aa2e8bdcd03f44407369f4fdb40d3a87ac3cf845 Mon Sep 17 00:00:00 2001 From: Hans-Christian Stadler Kleeb Date: Tue, 22 Aug 2017 09:47:26 +0200 Subject: [PATCH 03/11] Openmpi 2.1.1 for gcc 7.2.0 --- Compiler/openmpi/2.1/variants.Linux | 1 + 1 file changed, 1 insertion(+) diff --git a/Compiler/openmpi/2.1/variants.Linux b/Compiler/openmpi/2.1/variants.Linux index c1a6228..7f27949 100644 --- a/Compiler/openmpi/2.1/variants.Linux +++ b/Compiler/openmpi/2.1/variants.Linux @@ -1 +1,2 @@ openmpi/2.1.0 stable gcc/7.1.0 +openmpi/2.1.1 stable gcc/7.2.0 From ffb48873e25b4a940b1279add35852105d5db5a9 Mon Sep 17 00:00:00 2001 From: Hans-Christian Stadler Kleeb Date: Tue, 22 Aug 2017 09:48:12 +0200 Subject: [PATCH 04/11] HDF5 serial for gcc 7.1.0, 7.2.0 and intel 17.1 --- Compiler/hdf5_serial/1/variants | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Compiler/hdf5_serial/1/variants b/Compiler/hdf5_serial/1/variants index 78cb1db..30fdaa7 100644 --- a/Compiler/hdf5_serial/1/variants +++ b/Compiler/hdf5_serial/1/variants @@ -34,3 +34,8 @@ 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 + +hdf5_serial/1.10.1 stable gcc/7.1.0 +hdf5_serial/1.10.1 stable gcc/7.2.0 + +hdf5_serial/1.10.1 unstable intel/17.1 From bd1899e592b94b35d2fbebc39a3afcf999293f9f Mon Sep 17 00:00:00 2001 From: Hans-Christian Stadler Kleeb Date: Tue, 22 Aug 2017 15:18:24 +0200 Subject: [PATCH 05/11] openmpi/2.1.1 for intel/17.1 --- Compiler/openmpi/2.1/variants.Linux | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Compiler/openmpi/2.1/variants.Linux b/Compiler/openmpi/2.1/variants.Linux index 7f27949..8b1d0c3 100644 --- a/Compiler/openmpi/2.1/variants.Linux +++ b/Compiler/openmpi/2.1/variants.Linux @@ -1,2 +1,4 @@ openmpi/2.1.0 stable gcc/7.1.0 openmpi/2.1.1 stable gcc/7.2.0 + +openmpi/2.1.1 unstable intel/17.1 From 0ae2e5555720c50677e88d661e1caa0cf606a4b8 Mon Sep 17 00:00:00 2001 From: Hans-Christian Stadler Kleeb Date: Tue, 22 Aug 2017 16:31:59 +0200 Subject: [PATCH 06/11] hdf5_serial/1.10.1 for gcc/6.4.0 --- Compiler/hdf5_serial/1/variants | 1 + 1 file changed, 1 insertion(+) diff --git a/Compiler/hdf5_serial/1/variants b/Compiler/hdf5_serial/1/variants index 30fdaa7..4925a6e 100644 --- a/Compiler/hdf5_serial/1/variants +++ b/Compiler/hdf5_serial/1/variants @@ -35,6 +35,7 @@ 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 +hdf5_serial/1.10.1 stable gcc/6.4.0 hdf5_serial/1.10.1 stable gcc/7.1.0 hdf5_serial/1.10.1 stable gcc/7.2.0 From 0f9fd632e4dcbf2f43a918c934ab48f4c49d3d24 Mon Sep 17 00:00:00 2001 From: Hans-Christian Stadler Kleeb Date: Tue, 22 Aug 2017 16:32:24 +0200 Subject: [PATCH 07/11] openmpi/2.1.1 for gcc/6.4.0 --- Compiler/openmpi/2.1/variants.Linux | 1 + 1 file changed, 1 insertion(+) diff --git a/Compiler/openmpi/2.1/variants.Linux b/Compiler/openmpi/2.1/variants.Linux index 8b1d0c3..8730c8b 100644 --- a/Compiler/openmpi/2.1/variants.Linux +++ b/Compiler/openmpi/2.1/variants.Linux @@ -1,3 +1,4 @@ +openmpi/2.1.1 stable gcc/6.4.0 openmpi/2.1.0 stable gcc/7.1.0 openmpi/2.1.1 stable gcc/7.2.0 From b7fc1e36011a9e66a627b0cd8160e34bf73df572 Mon Sep 17 00:00:00 2001 From: Hans-Christian Stadler Kleeb Date: Thu, 31 Aug 2017 14:06:20 +0200 Subject: [PATCH 08/11] penmpi/2.1.1 for intel/17.4 --- Compiler/openmpi/2.1/variants.Linux | 1 + 1 file changed, 1 insertion(+) diff --git a/Compiler/openmpi/2.1/variants.Linux b/Compiler/openmpi/2.1/variants.Linux index 8730c8b..2575134 100644 --- a/Compiler/openmpi/2.1/variants.Linux +++ b/Compiler/openmpi/2.1/variants.Linux @@ -3,3 +3,4 @@ openmpi/2.1.0 stable gcc/7.1.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 From 6640dc7c2c0832c8864a5dd4cf08912e7b54ef29 Mon Sep 17 00:00:00 2001 From: Hans-Christian Stadler Kleeb Date: Thu, 7 Sep 2017 11:48:47 +0200 Subject: [PATCH 09/11] hdf5_serial/1.10.1 for intel/17.4 --- Compiler/hdf5_serial/1/variants | 1 + 1 file changed, 1 insertion(+) diff --git a/Compiler/hdf5_serial/1/variants b/Compiler/hdf5_serial/1/variants index 4925a6e..fc91517 100644 --- a/Compiler/hdf5_serial/1/variants +++ b/Compiler/hdf5_serial/1/variants @@ -40,3 +40,4 @@ hdf5_serial/1.10.1 stable gcc/7.1.0 hdf5_serial/1.10.1 stable gcc/7.2.0 hdf5_serial/1.10.1 unstable intel/17.1 +hdf5_serial/1.10.1 stable intel/17.4 From 7a383a067f4c7898222d75c8c1b0f491056ad696 Mon Sep 17 00:00:00 2001 From: Hans-Christian Stadler Kleeb Date: Thu, 14 Sep 2017 13:04:41 +0200 Subject: [PATCH 10/11] hdf5_serial/1.10.1 for pgi 17.3 and 17.7 --- Compiler/hdf5_serial/1/variants | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Compiler/hdf5_serial/1/variants b/Compiler/hdf5_serial/1/variants index fc91517..eececc7 100644 --- a/Compiler/hdf5_serial/1/variants +++ b/Compiler/hdf5_serial/1/variants @@ -41,3 +41,6 @@ hdf5_serial/1.10.1 stable gcc/7.2.0 hdf5_serial/1.10.1 unstable intel/17.1 hdf5_serial/1.10.1 stable intel/17.4 + +hdf5_serial/1.10.1 unstable pgi/17.3 +hdf5_serial/1.10.1 unstable pgi/17.7 From 04904c33c3d9c88671ffe209fbe7818a5da0b539 Mon Sep 17 00:00:00 2001 From: Hans-Christian Stadler Kleeb Date: Thu, 14 Sep 2017 13:05:59 +0200 Subject: [PATCH 11/11] Adapt to PGI compilers - pgrepro doesn't pass preprocessor tests - pgc++ doesn't understand -pthread switch given to it by libtool --- Compiler/hdf5_serial/build | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Compiler/hdf5_serial/build b/Compiler/hdf5_serial/build index 2c1f42c..443c17f 100755 --- a/Compiler/hdf5_serial/build +++ b/Compiler/hdf5_serial/build @@ -1,6 +1,11 @@ #!/usr/bin/env modbuild pbuild::configure() { + test "$(basename "$CPP")" = "pgprepro" && { + CPP=cpp + CXX=g++ + echo "INFO: substituted pgprepro with cpp, and pgc++ with g++!" + } "${MODULE_SRCDIR}"/configure \ --prefix="${PREFIX}" \ --enable-shared \