From 0aee428b67081a9fa47506685319cf3b7f3ec4eb Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Wed, 11 Apr 2018 16:42:33 +0200 Subject: [PATCH 01/54] Python - mpi4py removed --- Programming/Python/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Programming/Python/build b/Programming/Python/build index 6b24c55..6549949 100755 --- a/Programming/Python/build +++ b/Programming/Python/build @@ -31,7 +31,7 @@ pbuild::post_install() { pip${V_MAJOR} install pandas pip${V_MAJOR} install sympy pip${V_MAJOR} install nose - pip${V_MAJOR} install mpi4py + #pip${V_MAJOR} install mpi4py } pbuild::add_to_group 'Programming' From 2ba8c50c907dcf98c4fd0d90e3e4444ef170cae1 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Wed, 11 Apr 2018 16:42:59 +0200 Subject: [PATCH 02/54] Python - variant for version 2.7.14 added --- Programming/Python/2/variants | 1 + 1 file changed, 1 insertion(+) diff --git a/Programming/Python/2/variants b/Programming/Python/2/variants index 0f8a7d8..5d8619a 100644 --- a/Programming/Python/2/variants +++ b/Programming/Python/2/variants @@ -1,2 +1,3 @@ Python/2.7.11 stable openssl/1.0.2j Tcl/8.6.4 Tk/8.6.4 Python/2.7.12 stable openssl/1.0.2j Tcl/8.6.4 Tk/8.6.4 +Python/2.7.14 stable openssl/1.0.2o Tcl/8.6.4 Tk/8.6.4 From ce1b5be86d73f655cdbd18a702e151edbfc7fe01 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Wed, 11 Apr 2018 16:44:44 +0200 Subject: [PATCH 03/54] git - use Modules perl, asciidoc and xmlto for building --- Tools/git/2/variants | 2 +- Tools/git/build | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Tools/git/2/variants b/Tools/git/2/variants index f214488..7a3f89d 100644 --- a/Tools/git/2/variants +++ b/Tools/git/2/variants @@ -2,4 +2,4 @@ git/2.3.3 stable Tcl/8.6.4 Tk/8.6.4 git/2.5.2 stable Tcl/8.6.4 Tk/8.6.4 git/2.8.1 stable Tcl/8.6.4 Tk/8.6.4 git/2.11.1 stable Tcl/8.6.4 Tk/8.6.4 -git/2.13.0 unstable Tcl/8.6.4 Tk/8.6.4 +git/2.13.0 unstable Tcl/8.6.4 Tk/8.6.4 b:perl b:asciidoc b:xmlto diff --git a/Tools/git/build b/Tools/git/build index 16dcee2..e48a85e 100755 --- a/Tools/git/build +++ b/Tools/git/build @@ -15,6 +15,7 @@ pbuild::configure() { "${MODULE_SRCDIR}"/configure \ --prefix="${PREFIX}" \ --with-tcltk \ + --with-perl="${PERL_PREFIX}/bin/perl" \ || exit 1 } From 461db33ac129e876279838995f917087b98a3e29 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Wed, 11 Apr 2018 16:45:35 +0200 Subject: [PATCH 04/54] openssl - variant for version 1.0.2o added --- Tools/openssl/1/variants | 1 + 1 file changed, 1 insertion(+) diff --git a/Tools/openssl/1/variants b/Tools/openssl/1/variants index cde34c7..68a9ea4 100644 --- a/Tools/openssl/1/variants +++ b/Tools/openssl/1/variants @@ -1,2 +1,3 @@ openssl/1.0.2h deprecated openssl/1.0.2j stable +openssl/1.0.2o stable From 5f513f9f3cb195be9503934c2049b7cd1868cabb Mon Sep 17 00:00:00 2001 From: Hans-Christian Stadler Kleeb Date: Tue, 17 Apr 2018 13:15:23 +0200 Subject: [PATCH 05/54] hdf5_serial/1.10.2 for intel/18.2 and gcc/7.3.0 --- Compiler/hdf5_serial/1/variants.Linux | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Compiler/hdf5_serial/1/variants.Linux b/Compiler/hdf5_serial/1/variants.Linux index 992b860..9aaba2e 100644 --- a/Compiler/hdf5_serial/1/variants.Linux +++ b/Compiler/hdf5_serial/1/variants.Linux @@ -49,8 +49,12 @@ hdf5_serial/1.10.1 stable gcc/6.3.0 hdf5_serial/1.10.1 stable gcc/7.2.0 hdf5_serial/1.10.1 stable gcc/7.3.0 +hdf5_serial/1.10.2 stable gcc/7.3.0 + hdf5_serial/1.10.1 unstable intel/17.1 hdf5_serial/1.10.1 stable intel/17.4 +hdf5_serial/1.10.2 unstable intel/18.2 + hdf5_serial/1.10.1 unstable pgi/17.3 hdf5_serial/1.10.1 unstable pgi/17.7 From 67d94db7ad48afae49c0fc1da2ff02cc89cd822a Mon Sep 17 00:00:00 2001 From: Hans-Christian Stadler Kleeb Date: Tue, 17 Apr 2018 14:10:25 +0200 Subject: [PATCH 06/54] openmpi/3.0.1 for intel/18.2 and gcc/7.3.0 --- Compiler/openmpi/3.0/variants.Linux | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Compiler/openmpi/3.0/variants.Linux b/Compiler/openmpi/3.0/variants.Linux index bff5698..7f24a3a 100644 --- a/Compiler/openmpi/3.0/variants.Linux +++ b/Compiler/openmpi/3.0/variants.Linux @@ -2,3 +2,6 @@ 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 intel/17.4 + +openmpi/3.0.1 stable gcc/7.3.0 +openpmi/3.0.1 unstable intel/18.2 From 64cde589436b41ebb61891cee2c0c198bc44a376 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Tue, 17 Apr 2018 17:25:27 +0200 Subject: [PATCH 07/54] mpc/1: variant with gmp/6.1.2 and mpfr/4.0.1 added --- Libraries/mpc/1/variants | 1 + 1 file changed, 1 insertion(+) diff --git a/Libraries/mpc/1/variants b/Libraries/mpc/1/variants index 97455ac..a0caba7 100644 --- a/Libraries/mpc/1/variants +++ b/Libraries/mpc/1/variants @@ -3,3 +3,4 @@ mpc/1.0.3 stable b:gmp/6.1.0 b:mpfr/3.1.4 mpc/1.0.3-1 stable b:gmp/6.1.1 b:mpfr/3.1.4 mpc/1.0.3-2 stable b:gmp/6.1.2 b:mpfr/3.1.5 mpc/1.1.0 stable b:gmp/6.1.2 b:mpfr/4.0.0 +mpc/1.1.0-1 stable b:gmp/6.1.2 b:mpfr/4.0.1 From 8f14cccf0e2790ccd4340bd0d14fee5178a2013d Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Tue, 17 Apr 2018 17:26:25 +0200 Subject: [PATCH 08/54] mpfr/4: variant for mpfr/4.0.1 with gmp/6.1.2 added --- Libraries/mpfr/4/variants | 1 + 1 file changed, 1 insertion(+) diff --git a/Libraries/mpfr/4/variants b/Libraries/mpfr/4/variants index cec1cb1..3d8e833 100644 --- a/Libraries/mpfr/4/variants +++ b/Libraries/mpfr/4/variants @@ -1 +1,2 @@ mpfr/4.0.0 stable b:gmp/6.1.2 +mpfr/4.0.1 stable b:gmp/6.1.2 From 1df7c045864ede1c9b4fd3d4e41d703515887797 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Tue, 17 Apr 2018 17:27:12 +0200 Subject: [PATCH 09/54] automake/1: variant for version 1.16 added --- Programming/automake/1/variants | 1 + 1 file changed, 1 insertion(+) diff --git a/Programming/automake/1/variants b/Programming/automake/1/variants index 5704e8c..25829fa 100644 --- a/Programming/automake/1/variants +++ b/Programming/automake/1/variants @@ -1,2 +1,3 @@ automake/1.14 stable m4/1.4.17 autoconf/2.69 automake/1.15 stable m4/1.4.17 autoconf/2.69 +automake/1.16 stable m4/1.4.17 autoconf/2.69 From aa211abf0d527da85c58153ba2d0d8d2a6a92898 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Tue, 17 Apr 2018 17:28:15 +0200 Subject: [PATCH 10/54] gcc/5: variant for version 5.5.0 added --- Programming/gcc/5/variants | 1 + 1 file changed, 1 insertion(+) diff --git a/Programming/gcc/5/variants b/Programming/gcc/5/variants index 08b36c2..a2e118e 100644 --- a/Programming/gcc/5/variants +++ b/Programming/gcc/5/variants @@ -2,4 +2,5 @@ gcc/5.1.0 deprecated b:gmp/5.1.1 b:mpfr/3.1.2 b:mpc/1.0.2 gcc/5.2.0 deprecated b:gmp/6.0.0 b:mpfr/3.1.3 b:mpc/1.0.3 gcc/5.3.0 stable b:gmp/6.0.0 b:mpfr/3.1.3 b:mpc/1.0.3 gcc/5.4.0 stable b:gmp/6.1.2 b:mpfr/3.1.5 b:mpc/1.0.3-2 +gcc/5.5.0 stable b:gmp/6.1.2 b:mpfr/4.0.1 b:mpc/1.1.0-1 From b19161eb05f5e2ca45001ae6b7d2105aa97b1ad8 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Tue, 17 Apr 2018 17:28:44 +0200 Subject: [PATCH 11/54] perl: new module added --- Programming/perl/5/variants | 1 + Programming/perl/build | 17 +++++++++++++++++ Programming/perl/modulefile | 19 +++++++++++++++++++ 3 files changed, 37 insertions(+) create mode 100644 Programming/perl/5/variants create mode 100755 Programming/perl/build create mode 100644 Programming/perl/modulefile diff --git a/Programming/perl/5/variants b/Programming/perl/5/variants new file mode 100644 index 0000000..b36d254 --- /dev/null +++ b/Programming/perl/5/variants @@ -0,0 +1 @@ +perl/5.26.1 unstable diff --git a/Programming/perl/build b/Programming/perl/build new file mode 100755 index 0000000..3cdf58e --- /dev/null +++ b/Programming/perl/build @@ -0,0 +1,17 @@ +#!/usr/bin/env modbuild + +SOURCE_URL="http://www.cpan.org/src/5.0/$P-$V.tar.gz" + +pbuild::configure() { + "${MODULE_SRCDIR}"/configure.gnu \ + --prefix="${PREFIX}" \ + || exit 1 +} + +pbuild::post_build() { + make test +} + +pbuild::compile_in_sourcetree +pbuild::add_to_group 'Programming' +pbuild::make_all diff --git a/Programming/perl/modulefile b/Programming/perl/modulefile new file mode 100644 index 0000000..21ac986 --- /dev/null +++ b/Programming/perl/modulefile @@ -0,0 +1,19 @@ +#%Module1.0 + +module-whatis "scripting language." +module-url "http://www.perl.org/" +module-license "See https://dev.perl.org/licenses/" +module-maintainer "Achim Gsell " + +module-help " +Perl 5 is a highly capable, feature-rich programming language with +over 29 years of development. Perl 5 runs on over 100 platforms from +portables to mainframes and is suitable for both rapid prototyping +and large scale development projects. + +'Perl' is a family of languages, 'Perl 6' is part of the family, but +it is a separate language which has its own development team. Its +existence has no significant impact on the continuing development of +'Perl 5'. +" + From da1c901ab939dbd6919c02d153d7b2bee93cf157 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Tue, 17 Apr 2018 17:29:02 +0200 Subject: [PATCH 12/54] asciidoc: new module added --- Tools/asciidoc/8/variants | 1 + Tools/asciidoc/build | 31 +++++++++++++++++++++++++++++++ Tools/asciidoc/modulefile | 18 ++++++++++++++++++ 3 files changed, 50 insertions(+) create mode 100644 Tools/asciidoc/8/variants create mode 100755 Tools/asciidoc/build create mode 100644 Tools/asciidoc/modulefile diff --git a/Tools/asciidoc/8/variants b/Tools/asciidoc/8/variants new file mode 100644 index 0000000..f3f1245 --- /dev/null +++ b/Tools/asciidoc/8/variants @@ -0,0 +1 @@ +asciidoc/8.6.9 unstable Python/2.7.14 diff --git a/Tools/asciidoc/build b/Tools/asciidoc/build new file mode 100755 index 0000000..f674122 --- /dev/null +++ b/Tools/asciidoc/build @@ -0,0 +1,31 @@ +#!/usr/bin/env modbuild + +SOURCE_URL="https://sourceforge.net/projects/asciidoc/files/$P/$V/$P-$V.tar.gz" + +pbuild::configure() { + "${MODULE_SRCDIR}"/configure \ + --prefix="${PREFIX}" \ + || exit 1 +} + +pbuild::compile_in_sourcetree +pbuild::add_to_group 'Tools' +pbuild::set_docfiles \ + BUGS \ + BUGS.txt \ + CHANGELOG \ + CHANGELOG.txt \ + COPYING \ + COPYRIGHT \ + INSTALL \ + INSTALL.txt \ + MANIFEST \ + README \ + README.txt +pbuild::make_all + +# Local Variables: +# mode: sh +# sh-basic-offset: 8 +# tab-width: 8 +# End: diff --git a/Tools/asciidoc/modulefile b/Tools/asciidoc/modulefile new file mode 100644 index 0000000..fd4336c --- /dev/null +++ b/Tools/asciidoc/modulefile @@ -0,0 +1,18 @@ +#%Module1.0 + +module-whatis "translater for asciidoc formatted documents" +module-url "http://www.methods.co.nz/asciidoc/index.html" +module-license "GPL v2" +module-maintainer "Achim Gsell " + +module-help " +AsciiDoc is a text document format for writing notes, documentation, +articles, books, ebooks, slideshows, web pages, man pages and blogs. +AsciiDoc files can be translated to many formats including HTML, PDF, +EPUB, man page. + +AsciiDoc is highly configurable: both the AsciiDoc source file syntax +and the backend output markups (which can be almost any type of SGML/XML +markup) can be customized and extended by the user. +" + From 625139f042101de1c9c85106110f141d77ce0296 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Tue, 17 Apr 2018 17:29:14 +0200 Subject: [PATCH 13/54] xmlto: new module added --- Tools/xmlto/0/variants | 1 + Tools/xmlto/build | 26 ++++++++++++++++++++++++++ Tools/xmlto/modulefile | 18 ++++++++++++++++++ 3 files changed, 45 insertions(+) create mode 100644 Tools/xmlto/0/variants create mode 100755 Tools/xmlto/build create mode 100644 Tools/xmlto/modulefile diff --git a/Tools/xmlto/0/variants b/Tools/xmlto/0/variants new file mode 100644 index 0000000..d1fbc24 --- /dev/null +++ b/Tools/xmlto/0/variants @@ -0,0 +1 @@ +xmlto/0.0.28 stable diff --git a/Tools/xmlto/build b/Tools/xmlto/build new file mode 100755 index 0000000..e2874b9 --- /dev/null +++ b/Tools/xmlto/build @@ -0,0 +1,26 @@ +#!/usr/bin/env modbuild + +SOURCE_URL="https://releases.pagure.org/$P/$P-$V.tar.bz2" + +pbuild::configure() { + "${MODULE_SRCDIR}"/configure \ + --prefix="${PREFIX}" \ + || exit 1 +} + +pbuild::compile_in_sourcetree +pbuild::add_to_group 'Tools' +pbuild::set_docfiles \ + AUTHORS \ + COPYING \ + FAQ \ + NEWS \ + README \ + THANKS +pbuild::make_all + +# Local Variables: +# mode: sh +# sh-basic-offset: 8 +# tab-width: 8 +# End: diff --git a/Tools/xmlto/modulefile b/Tools/xmlto/modulefile new file mode 100644 index 0000000..9cf5023 --- /dev/null +++ b/Tools/xmlto/modulefile @@ -0,0 +1,18 @@ +#%Module1.0 + +module-whatis "script to convert XML to other formats" +module-url "https://pagure.io/xmlto" +module-license "GPL v2" +module-maintainer "Achim Gsell " + +module-help " +Utility xmlto is a simple shell script for converting XML files to various +formats. It serves as easy to use command line frontend to make fine output +without remembering many long options and searching for the syntax of the +backends. + +At the moment it supports conersion from docbook, xhtml1 and fo format to +various output formats(awt, fo, htmlhelp, javahelp, mif, pdf, svg, xhtml, +dvi, html, html-nochunks, man , pcl, ps, txt, xhtml-nochunks) +" + From 8beca48166b4f5e9e3b130137e058491a2b3a7f8 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Wed, 18 Apr 2018 14:08:34 +0200 Subject: [PATCH 14/54] gtest/1 - variant build with clang-macos/9.0.0 added --- Compiler/gtest/1/variants | 1 + 1 file changed, 1 insertion(+) diff --git a/Compiler/gtest/1/variants b/Compiler/gtest/1/variants index e7a7d4d..8a77ffc 100644 --- a/Compiler/gtest/1/variants +++ b/Compiler/gtest/1/variants @@ -1,2 +1,3 @@ gtest/1.7.0 stable b:cmake b:gcc/5.4.0 gtest/1.7.0 stable b:cmake b:gcc/7.3.0 +gtest/1.7.0 stable b:cmake b:clang-macos/9.0.0 From 196f9c77748ab1cdbff4d54a82abff9b7ad52bef Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Wed, 18 Apr 2018 14:09:27 +0200 Subject: [PATCH 15/54] H5hut/2 - variant for 2.0.0rc4 compiled with clang-macos/9.0.0 added --- HDF5/H5hut/2/variants | 1 + 1 file changed, 1 insertion(+) diff --git a/HDF5/H5hut/2/variants b/HDF5/H5hut/2/variants index 7cd6c8d..77d51e5 100644 --- a/HDF5/H5hut/2/variants +++ b/HDF5/H5hut/2/variants @@ -24,3 +24,4 @@ H5hut/2.0.0rc4 unstable clang-macos/9.0.0 openmpi/3.0.0 hdf5/1.10.1 b:automake/ H5hut/2.0.0rc4 unstable intel/17.4 openmpi/1.10.7 hdf5/1.10.1 b:automake/1.15 b:autoconf/2.69 b:libtool/2.4.6 b:Python/2.7.12 b:parmetis/4.0.3 H5hut/2.0.0rc4 unstable intel/17.4 openmpi/2.1.2 hdf5/1.10.1 b:automake/1.15 b:autoconf/2.69 b:libtool/2.4.6 b:Python/2.7.12 b:parmetis/4.0.3 H5hut/2.0.0rc4 unstable intel/17.4 openmpi/3.0.0 hdf5/1.10.1 b:automake/1.15 b:autoconf/2.69 b:libtool/2.4.6 b:Python/2.7.12 b:parmetis/4.0.3 +H5hut/2.0.0rc4 unstable clang-macos/9.0.0 openmpi/3.0.0 hdf5/1.10.1 b:automake/1.15 b:autoconf/2.69 b:libtool/2.4.6 b:Python/2.7.12 b:parmetis/4.0.3 From b18cb02ed1d7c4b438738f0725973034c28f836f Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Wed, 18 Apr 2018 14:10:04 +0200 Subject: [PATCH 16/54] H5hut/build - compile without Fortran support if we use clang-macos --- HDF5/H5hut/build | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/HDF5/H5hut/build b/HDF5/H5hut/build index ddb0b15..51bad84 100755 --- a/HDF5/H5hut/build +++ b/HDF5/H5hut/build @@ -14,12 +14,19 @@ pbuild::configure() { if (( V_MAJOR >= 2 )); then : config_args+=" --enable-python" fi + case "${COMPILER}" in + "clang-macos" ) + : + ;; + * ) + config_args+='--enable-fortran' + ;; + esac "${MODULE_SRCDIR}"/configure \ --prefix="${PREFIX}" \ --enable-parallel \ --enable-debug \ - --enable-fortran \ --enable-shared \ --with-hdf5=$HDF5_PREFIX \ --with-pic \ From dd3180b70c4832ba703b1725d80907596d452d0f Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Wed, 18 Apr 2018 14:11:02 +0200 Subject: [PATCH 17/54] OPAL/1.6 - release 1.6.1 as stable - variant for 1.6.2 added --- MPI/OPAL/1.6/variants | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/MPI/OPAL/1.6/variants b/MPI/OPAL/1.6/variants index 3e73d86..ab5c8cb 100644 --- a/MPI/OPAL/1.6/variants +++ b/MPI/OPAL/1.6/variants @@ -5,4 +5,5 @@ OPAL/1.6.0rc4 unstable gcc/5.4.0 openmpi/1.10.4 boost/1.62.0 hdf5/1.8.18 H5hut/2 OPAL/1.6.0rc5 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 cuda/8.0.44 dks/1.1.2 b:cmake/3.6.3 b:OpenBLAS/0.2.19 OPAL/1.6.0rc6 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 cuda/8.0.44 dks/1.1.2 b:cmake/3.6.3 b:OpenBLAS/0.2.19 OPAL/1.6.0 stable 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 cuda/8.0.44 dks/1.1.2 b:cmake/3.6.3 b:OpenBLAS/0.2.19 -OPAL/1.6.1 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 cuda/8.0.44 dks/1.1.2 b:cmake/3.6.3 b:OpenBLAS/0.2.19 +OPAL/1.6.1 stable 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 cuda/8.0.44 dks/1.1.2 b:cmake/3.6.3 b:OpenBLAS/0.2.19 +OPAL/1.6.2 stable 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 cuda/8.0.44 dks/1.1.2 b:cmake/3.6.3 b:OpenBLAS/0.2.19 From b319dbc899fad7e568d2400fa75776bd704f49c0 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Wed, 18 Apr 2018 14:11:32 +0200 Subject: [PATCH 18/54] OPAL/build - fix SOURCE_URL --- MPI/OPAL/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MPI/OPAL/build b/MPI/OPAL/build index 3ba06d5..4072d08 100755 --- a/MPI/OPAL/build +++ b/MPI/OPAL/build @@ -1,6 +1,6 @@ #!/usr/bin/env modbuild -SOURCE_URL='http://amas.web.psi.ch/Downloads/OPAL/OPAL-1.6.0rc6.tar.bz2' +SOURCE_URL='http://amas.web.psi.ch/Downloads/$P/$P-$V.tar.bz2' config_args=() From 9ab16a388c7fe5d4a460ee40efa45125a6290dee Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Wed, 18 Apr 2018 14:12:03 +0200 Subject: [PATCH 19/54] trilinos/12 - variant for 12.12.1 compiled with clang-macos/9.0.0 added --- MPI/trilinos/12/variants.Darwin | 1 + 1 file changed, 1 insertion(+) diff --git a/MPI/trilinos/12/variants.Darwin b/MPI/trilinos/12/variants.Darwin index f8e3d1d..c63d7b8 100644 --- a/MPI/trilinos/12/variants.Darwin +++ b/MPI/trilinos/12/variants.Darwin @@ -12,3 +12,4 @@ trilinos/12.10.1 unstable gcc/6.2.0 openmpi/1.10.4 b:cmake/3.6.3 b:OpenBLAS/0.2. trilinos/12.12.1 unstable gcc/7.3.0 openmpi/1.10.7 hdf5/1.10.1 b:cmake/3.6.3 b:OpenBLAS/0.2.20 b:parmetis/4.0.3 trilinos/12.12.1 unstable gcc/7.3.0 openmpi/2.1.2 hdf5/1.10.1 b:cmake/3.6.3 b:OpenBLAS/0.2.20 b:parmetis/4.0.3 trilinos/12.12.1 unstable gcc/7.3.0 openmpi/3.0.0 hdf5/1.10.1 b:cmake/3.6.3 b:OpenBLAS/0.2.20 b:parmetis/4.0.3 +trilinos/12.12.1 unstable clang-macos/9.0.0 openmpi/3.0.0 hdf5/1.10.1 b:cmake/3.9.6 b:OpenBLAS/0.2.20 b:parmetis/4.0.3 From f20352429851a22f58d30786329f33004440dbfa Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Wed, 18 Apr 2018 14:12:37 +0200 Subject: [PATCH 20/54] vim/8 - added Python/2.7.14 as build dependency --- Tools/vim/8/variants | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tools/vim/8/variants b/Tools/vim/8/variants index f0bb62d..3a113be 100644 --- a/Tools/vim/8/variants +++ b/Tools/vim/8/variants @@ -1 +1 @@ -vim/8.0.586 unstable +vim/8.0.586 unstable b:Python/2.7.14 From 0d1505539399757ecbe8ed2e096605f1058d9f8d Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Wed, 9 May 2018 09:41:44 +0200 Subject: [PATCH 21/54] elegant: README.md added --- MPI/elegant/README.md | 127 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 127 insertions(+) create mode 100644 MPI/elegant/README.md diff --git a/MPI/elegant/README.md b/MPI/elegant/README.md new file mode 100644 index 0000000..90a8428 --- /dev/null +++ b/MPI/elegant/README.md @@ -0,0 +1,127 @@ +# How to compile (P)elegant + +## Official build instructions + +> +Go down for PSI build instructions! + +Instructions to setup `epics/base`, `epics/extensions` compile `SDDS` and `elegant`: + +https://www.aps.anl.gov/Accelerator-Operations-Physics/Software/installationGuide_Linux + +> +Instructions to compile from source are almost at the end of the page! + +Instructions to build `Pelegant`: + +https://ops.aps.anl.gov/publish/Pelegant_manual/node2.html + +## Get the software + +**Main page** + +* https://www1.aps.anl.gov/Accelerator-Operations-Physics/Software + +**Configuration files for EPICS build system (base and extensions)** + +* http://www.aps.anl.gov/Accelerator_Systems_Division/Accelerator_Operations_Physics/cgi-bin/oagLog4.cgi?name=epics.base.configure.tar.gz +* http://www.aps.anl.gov/Accelerator_Systems_Division/Accelerator_Operations_Physics/cgi-bin/oagLog4.cgi?name=epics.extensions.configure.tar.gz + +**Configure files for elegant, spiffe, genesis, and shower** + +* http://www.aps.anl.gov/Accelerator_Systems_Division/Accelerator_Operations_Physics/cgi-bin/oagLog4.cgi?name=oag.apps.configure.tar.gz + +**SDDS source** + +* http://www.aps.anl.gov/Accelerator_Systems_Division/Accelerator_Operations_Physics/cgi-bin/oagLog4.cgi?name=SDDS.3.6.1.tar.gz + +**elegant source** + +* http://www.aps.anl.gov/Accelerator_Systems_Division/Accelerator_Operations_Physics/cgi-bin/oagLog4.cgi?name=elegant.34.2.0.tar.gz + +## Required Modules + +``` +module load gcc/7.3.0 gsl/2.4 mpich/3.2.1 +``` + +## Setup Environment +``` +DOWNLOAD_DIR='/afs/psi.ch/software/Pmodules/distfiles/elegant' +PREFIX=/opt/psi/MPI/elegant/34.2.0/mpich/3.2.1/gcc/7.3.0 + +export HOST_ARCH=linux-x86_64 +export EPICS_HOST_ARCH=linux-x86_64 +export RPN_DEFNS="${PREFIX}/RPN_DEFNS/defns.rpn +``` + +## Prepare build environment + +EPICS base configuration +``` +mkdir -p "${PREFIX}" +cd "${PREFIX}" +tar xvf "${DOWNLOAD_DIR}/epics.base.configure.tar.gz" +cd epics/base +make +``` + +Prepare configuration files for EPICS build system +``` +cd "${PREFIX}" +tar xvf "${DOWNLOAD_DIR}/epics.extensions.configure.tar.gz +``` + +Prepare configuration files for elegant and other OAG apps +``` +cd "${PREFIX}" +tar xvf "${DOWNLOAD_DIR}/oag.apps.configure.tar.gz +``` + +## Base configuration for SDDS and elegant +``` +ARGS=() +ARGS+=( "AR=ar -rc" ) +ARGS+=( "LD=ld -r" ) +ARGS+=( "RANLIB=ranlib" ) +ARGS+=( "GNU_DIR=${GCC_DIR}" ) +ARGS+=( "CLAPACK_LIB=${ATLAS_LIBRARY_DIR}" ) +ARGS+=( "ATLAS_LIB=${ATLAS_LIBRARY_DIR}" ) +ARGS+=( "ATLAS_INCLUDE=${ATLAS_INCLUDE_DIR}" ) +ARGS+=( "SYSGSL=1" ) +ARGS+=( "LAPACK=0" ) +ARGS+=( "GFORTRAN=1" ) +ARGS+=( "CLAPACK=1" ) +ARGS+=( "EPICS_BASE=${PREFIX}/epics/base" ) +ARGS+=( "INSTALL_LOCATION=${PREFIX}" ) +ARGS+=( "INSTALL_LIB=${PREFIX}/lib" ) +ARGS+=( "INSTALL_SHRLIB=${PREFIX}/lib" ) +ARGS+=( "INSTALL_TCLLIB=${PREFIX}/lib" ) +ARGS+=( "INSTALL_BIN=${PREFIX}/bin" ) +``` + +== Compile SDDS +``` +cd ${PREFIX}/epics/extensions/src/SDDS/ +make "${ARGS[@]}" OP_SYS_LDLIBS="-lgfortran -lquadmath -lf2c" -C png +make "${ARGS[@]}" OP_SYS_LDLIBS="-lgfortran -lquadmath -lf2c" -C pgapack +make "${ARGS[@]}" OP_SYS_LDLIBS="-lgfortran -lquadmath -lf2c" +make "${ARGS[@]}" OP_SYS_LDLIBS="-lgfortran -lquadmath -lf2c" MPI=1 -C SDDSlib +``` + +== Compile elegant +``` +PATH+=":${PREFIX}/bin" + +cd "${PREFIX}/oag/apps/src/physics" +make "${ARGS[@]}" OP_SYS_LDLIBS="-lreadline -lncurses -lgfortran -lquadmath -lf2c -lm -lrt -ldl" + +cd "${PREFIX}/oag/apps/src/xraylib" +make "${ARGS[@]}" OP_SYS_LDLIBS="-lreadline -lncurses -lgfortran -lquadmath -lf2c -lm -lrt -ldl" + +cd "${PREFIX}/oag/apps/src/elegant" +make "${ARGS[@]}" OP_SYS_LDLIBS="-lreadline -lncurses -lgfortran -lquadmath -lf2c -lm -lrt -ldl" +make "${ARGS[@]}" OP_SYS_LDLIBS="-lreadline -lncurses -lgfortran -lquadmath -lf2c -lm -lrt -ldl" Pelegant +make "${ARGS[@]}" OP_SYS_LDLIBS="-lreadline -lncurses -lgfortran -lquadmath -lf2c -lm -lrt -ldl" -C elegantTools +make "${ARGS[@]}" OP_SYS_LDLIBS="-lreadline -lncurses -lgfortran -lquadmath -lf2c -lm -lrt -ldl" -C sddsbrightness +``` From 14606e2cd107d34873d1040a0355c3d002c0cd99 Mon Sep 17 00:00:00 2001 From: gsell Date: Wed, 9 May 2018 09:44:03 +0200 Subject: [PATCH 22/54] Update README.md --- MPI/elegant/README.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/MPI/elegant/README.md b/MPI/elegant/README.md index 90a8428..9a2e97f 100644 --- a/MPI/elegant/README.md +++ b/MPI/elegant/README.md @@ -5,13 +5,10 @@ > Go down for PSI build instructions! -Instructions to setup `epics/base`, `epics/extensions` compile `SDDS` and `elegant`: +Instructions to setup `epics/base`, `epics/extensions` compile `SDDS` and `elegant`. The instructions to build from source are almost at the end of the page: https://www.aps.anl.gov/Accelerator-Operations-Physics/Software/installationGuide_Linux -> -Instructions to compile from source are almost at the end of the page! - Instructions to build `Pelegant`: https://ops.aps.anl.gov/publish/Pelegant_manual/node2.html From 113b85ca31567e82f9166e25491aa7a0029d4bec Mon Sep 17 00:00:00 2001 From: Hans-Christian Stadler Kleeb Date: Wed, 9 May 2018 10:55:59 +0200 Subject: [PATCH 23/54] Add gcc 8.1.0 --- Programming/gcc/8/variants | 1 + 1 file changed, 1 insertion(+) create mode 100644 Programming/gcc/8/variants diff --git a/Programming/gcc/8/variants b/Programming/gcc/8/variants new file mode 100644 index 0000000..e4c513c --- /dev/null +++ b/Programming/gcc/8/variants @@ -0,0 +1 @@ +gcc/8.1.0 stable b:gmp/6.1.2 b:mpfr/4.0.1 b:mpc/1.1.0 From 7bf2e499c87e7df31dad93816b66fa6d7df54ad6 Mon Sep 17 00:00:00 2001 From: Hans-Christian Stadler Kleeb Date: Wed, 9 May 2018 11:16:01 +0200 Subject: [PATCH 24/54] Add openmpi/3.0.1 for gcc/8.1.0 --- Compiler/openmpi/3.0/variants.Linux | 1 + 1 file changed, 1 insertion(+) diff --git a/Compiler/openmpi/3.0/variants.Linux b/Compiler/openmpi/3.0/variants.Linux index 7f24a3a..d68c3f3 100644 --- a/Compiler/openmpi/3.0/variants.Linux +++ b/Compiler/openmpi/3.0/variants.Linux @@ -4,4 +4,5 @@ openmpi/3.0.0 stable gcc/7.3.0 openmpi/3.0.0 stable intel/17.4 openmpi/3.0.1 stable gcc/7.3.0 +openmpi/3.0.1 stable gcc/8.1.0 openpmi/3.0.1 unstable intel/18.2 From 4ca64a762d484e91a13568cfe8816e22c9ee57d0 Mon Sep 17 00:00:00 2001 From: gsell Date: Wed, 9 May 2018 12:55:44 +0200 Subject: [PATCH 25/54] Update README.md --- MPI/elegant/README.md | 88 +++++++++++++++++++++---------------------- 1 file changed, 43 insertions(+), 45 deletions(-) diff --git a/MPI/elegant/README.md b/MPI/elegant/README.md index 9a2e97f..b9d1618 100644 --- a/MPI/elegant/README.md +++ b/MPI/elegant/README.md @@ -42,54 +42,25 @@ https://ops.aps.anl.gov/publish/Pelegant_manual/node2.html module load gcc/7.3.0 gsl/2.4 mpich/3.2.1 ``` +## Set used versions +``` +SDDS_VERSION=3.6.1 +ELEGANT_VERSION=34.2.0 +``` + ## Setup Environment ``` DOWNLOAD_DIR='/afs/psi.ch/software/Pmodules/distfiles/elegant' -PREFIX=/opt/psi/MPI/elegant/34.2.0/mpich/3.2.1/gcc/7.3.0 +PREFIX=/opt/psi/MPI/elegant/${ELEGANT_VERSION}/${MPI}/${MPI_VERSION}/${COMPILER}/${COMPILER_VERSION} +export EPICS_BASE="${PREFIX}/epics/base" export HOST_ARCH=linux-x86_64 export EPICS_HOST_ARCH=linux-x86_64 -export RPN_DEFNS="${PREFIX}/RPN_DEFNS/defns.rpn +export RPN_DEFNS="${PREFIX}/RPN_DEFNS/defns.rpn" ``` -## Prepare build environment - -EPICS base configuration -``` -mkdir -p "${PREFIX}" -cd "${PREFIX}" -tar xvf "${DOWNLOAD_DIR}/epics.base.configure.tar.gz" -cd epics/base -make -``` - -Prepare configuration files for EPICS build system -``` -cd "${PREFIX}" -tar xvf "${DOWNLOAD_DIR}/epics.extensions.configure.tar.gz -``` - -Prepare configuration files for elegant and other OAG apps -``` -cd "${PREFIX}" -tar xvf "${DOWNLOAD_DIR}/oag.apps.configure.tar.gz -``` - -## Base configuration for SDDS and elegant ``` ARGS=() -ARGS+=( "AR=ar -rc" ) -ARGS+=( "LD=ld -r" ) -ARGS+=( "RANLIB=ranlib" ) -ARGS+=( "GNU_DIR=${GCC_DIR}" ) -ARGS+=( "CLAPACK_LIB=${ATLAS_LIBRARY_DIR}" ) -ARGS+=( "ATLAS_LIB=${ATLAS_LIBRARY_DIR}" ) -ARGS+=( "ATLAS_INCLUDE=${ATLAS_INCLUDE_DIR}" ) -ARGS+=( "SYSGSL=1" ) -ARGS+=( "LAPACK=0" ) -ARGS+=( "GFORTRAN=1" ) -ARGS+=( "CLAPACK=1" ) -ARGS+=( "EPICS_BASE=${PREFIX}/epics/base" ) ARGS+=( "INSTALL_LOCATION=${PREFIX}" ) ARGS+=( "INSTALL_LIB=${PREFIX}/lib" ) ARGS+=( "INSTALL_SHRLIB=${PREFIX}/lib" ) @@ -97,17 +68,44 @@ ARGS+=( "INSTALL_TCLLIB=${PREFIX}/lib" ) ARGS+=( "INSTALL_BIN=${PREFIX}/bin" ) ``` -== Compile SDDS +## Prepare base build environment + +EPICS base configuration ``` -cd ${PREFIX}/epics/extensions/src/SDDS/ -make "${ARGS[@]}" OP_SYS_LDLIBS="-lgfortran -lquadmath -lf2c" -C png -make "${ARGS[@]}" OP_SYS_LDLIBS="-lgfortran -lquadmath -lf2c" -C pgapack -make "${ARGS[@]}" OP_SYS_LDLIBS="-lgfortran -lquadmath -lf2c" -make "${ARGS[@]}" OP_SYS_LDLIBS="-lgfortran -lquadmath -lf2c" MPI=1 -C SDDSlib +mkdir -p "${PREFIX}" +mkdir -p "${RPN_DEFNS%/*}" +cp "${DOWNLOAD_DIR}/defns.rpn" "${RPN_DEFNS}" +cd "${PREFIX}" +tar xvf "${DOWNLOAD_DIR}/epics.base.configure.tar.gz" +cd epics/base +make ``` -== Compile elegant +## Unpack EPICS extensions and OAG apps configuration + ``` +cd "${PREFIX}" +tar xvf "${DOWNLOAD_DIR}/epics.extensions.configure.tar.gz" +tar xvf "${DOWNLOAD_DIR}/oag.apps.configure.tar.gz" +cd "${PREFIX}/oag/apps/configure" +``` + +## Build required tools and libraries from SDDS +``` +cd "${PREFIX}" +tar xvf "${DOWNLOAD_DIR}/SDDS.${SDDS_VERSION}.tar.gz" +make -e "${ARGS[@]}" -C namelist +make -e "${ARGS[@]}" -C pgapack +make -e "${ARGS[@]}" -C SDDSlib +make -e "${ARGS[@]}" -C SDDSlib clean +make -e "${ARGS[@]}" MPI=1 -C SDDSlib +``` + +== Compile (P)elegant +``` +cd "${PREFIX}" +tar xvf "${DOWNLOAD_DIR}/elegant.${ELEGANT_VERSION}" + PATH+=":${PREFIX}/bin" cd "${PREFIX}/oag/apps/src/physics" From fb15e83d4af18b9b10c8cdfc86449479cf16d929 Mon Sep 17 00:00:00 2001 From: Hans-Christian Stadler Kleeb Date: Wed, 9 May 2018 15:08:52 +0200 Subject: [PATCH 26/54] Mark gcc/8.1.0 unstable as hdf5_serial/1.10.2 cannot compile and my own program produces bad output:wq --- Programming/gcc/8/variants | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Programming/gcc/8/variants b/Programming/gcc/8/variants index e4c513c..b128666 100644 --- a/Programming/gcc/8/variants +++ b/Programming/gcc/8/variants @@ -1 +1 @@ -gcc/8.1.0 stable b:gmp/6.1.2 b:mpfr/4.0.1 b:mpc/1.1.0 +gcc/8.1.0 unstable b:gmp/6.1.2 b:mpfr/4.0.1 b:mpc/1.1.0 From cd3948666906396f3ebf44193c8255b25a55bda5 Mon Sep 17 00:00:00 2001 From: Hans-Christian Stadler Kleeb Date: Wed, 9 May 2018 15:50:07 +0200 Subject: [PATCH 27/54] Mark openmpi/3.0.1 for gcc/8.1.0 as unstable, because the compiler is unstable --- Compiler/openmpi/3.0/variants.Linux | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Compiler/openmpi/3.0/variants.Linux b/Compiler/openmpi/3.0/variants.Linux index d68c3f3..13bb508 100644 --- a/Compiler/openmpi/3.0/variants.Linux +++ b/Compiler/openmpi/3.0/variants.Linux @@ -4,5 +4,5 @@ openmpi/3.0.0 stable gcc/7.3.0 openmpi/3.0.0 stable intel/17.4 openmpi/3.0.1 stable gcc/7.3.0 -openmpi/3.0.1 stable gcc/8.1.0 +openmpi/3.0.1 unstable gcc/8.1.0 openpmi/3.0.1 unstable intel/18.2 From e7923a4992e8bca2956900e7c72de09d3f089398 Mon Sep 17 00:00:00 2001 From: gsell Date: Wed, 9 May 2018 16:36:50 +0200 Subject: [PATCH 28/54] Update README.md --- MPI/elegant/README.md | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/MPI/elegant/README.md b/MPI/elegant/README.md index b9d1618..34a621a 100644 --- a/MPI/elegant/README.md +++ b/MPI/elegant/README.md @@ -39,7 +39,7 @@ https://ops.aps.anl.gov/publish/Pelegant_manual/node2.html ## Required Modules ``` -module load gcc/7.3.0 gsl/2.4 mpich/3.2.1 +module load gcc/7.3.0 gsl/2.4 openblas/0.2.20 mpich/3.2.1 ``` ## Set used versions @@ -61,11 +61,13 @@ export RPN_DEFNS="${PREFIX}/RPN_DEFNS/defns.rpn" ``` ARGS=() +ARGS+=( "EPICS_BASE=${PREFIX}" ) ARGS+=( "INSTALL_LOCATION=${PREFIX}" ) ARGS+=( "INSTALL_LIB=${PREFIX}/lib" ) ARGS+=( "INSTALL_SHRLIB=${PREFIX}/lib" ) ARGS+=( "INSTALL_TCLLIB=${PREFIX}/lib" ) ARGS+=( "INSTALL_BIN=${PREFIX}/bin" ) +ARGS+=( "SYSGSL=1") ``` ## Prepare base build environment @@ -88,35 +90,42 @@ cd "${PREFIX}" tar xvf "${DOWNLOAD_DIR}/epics.extensions.configure.tar.gz" tar xvf "${DOWNLOAD_DIR}/oag.apps.configure.tar.gz" cd "${PREFIX}/oag/apps/configure" +make -e ``` +> +You have to fix the `clean::` target in `${PREFIX}/oag/apps/configure/PYTHON_RULES` + ## Build required tools and libraries from SDDS ``` cd "${PREFIX}" tar xvf "${DOWNLOAD_DIR}/SDDS.${SDDS_VERSION}.tar.gz" +cd "${PREFIX}/epics/extensions/src/SDDS/" +make -e "${ARGS[@]}" -C fftpack +make -e "${ARGS[@]}" -C lzma +make -e "${ARGS[@]}" -C matlib +make -e "${ARGS[@]}" -C mdblib +make -e "${ARGS[@]}" -C mdbcommon +make -e "${ARGS[@]}" -C mdbmth +make -e "${ARGS[@]}" -C meschach make -e "${ARGS[@]}" -C namelist make -e "${ARGS[@]}" -C pgapack +make -e "${ARGS[@]}" -C rpns/code make -e "${ARGS[@]}" -C SDDSlib make -e "${ARGS[@]}" -C SDDSlib clean -make -e "${ARGS[@]}" MPI=1 -C SDDSlib +make "${ARGS[@]}" MPI=1 -C SDDSlib ``` -== Compile (P)elegant +## Compile (P)elegant + ``` cd "${PREFIX}" -tar xvf "${DOWNLOAD_DIR}/elegant.${ELEGANT_VERSION}" +tar xvf "${DOWNLOAD_DIR}/elegant.${ELEGANT_VERSION}.tar.gz" PATH+=":${PREFIX}/bin" -cd "${PREFIX}/oag/apps/src/physics" -make "${ARGS[@]}" OP_SYS_LDLIBS="-lreadline -lncurses -lgfortran -lquadmath -lf2c -lm -lrt -ldl" - -cd "${PREFIX}/oag/apps/src/xraylib" -make "${ARGS[@]}" OP_SYS_LDLIBS="-lreadline -lncurses -lgfortran -lquadmath -lf2c -lm -lrt -ldl" - cd "${PREFIX}/oag/apps/src/elegant" -make "${ARGS[@]}" OP_SYS_LDLIBS="-lreadline -lncurses -lgfortran -lquadmath -lf2c -lm -lrt -ldl" -make "${ARGS[@]}" OP_SYS_LDLIBS="-lreadline -lncurses -lgfortran -lquadmath -lf2c -lm -lrt -ldl" Pelegant -make "${ARGS[@]}" OP_SYS_LDLIBS="-lreadline -lncurses -lgfortran -lquadmath -lf2c -lm -lrt -ldl" -C elegantTools -make "${ARGS[@]}" OP_SYS_LDLIBS="-lreadline -lncurses -lgfortran -lquadmath -lf2c -lm -lrt -ldl" -C sddsbrightness +make -e "${ARGS[@]}" +make clean +make "${ARGS[@]}" Pelegant ``` From 63ead647ed4e47670ed41535533135aac93435eb Mon Sep 17 00:00:00 2001 From: gsell Date: Wed, 9 May 2018 16:42:36 +0200 Subject: [PATCH 29/54] Update README.md --- MPI/elegant/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MPI/elegant/README.md b/MPI/elegant/README.md index 34a621a..b1d9e2e 100644 --- a/MPI/elegant/README.md +++ b/MPI/elegant/README.md @@ -39,7 +39,7 @@ https://ops.aps.anl.gov/publish/Pelegant_manual/node2.html ## Required Modules ``` -module load gcc/7.3.0 gsl/2.4 openblas/0.2.20 mpich/3.2.1 +module load gcc/7.3.0 gsl/2.4 OpenBLAS/0.2.20 mpich/3.2.1 ``` ## Set used versions From 36cd7b5d918d280ee6168ff416e72f96dc1ae1ef Mon Sep 17 00:00:00 2001 From: gsell Date: Wed, 9 May 2018 17:24:31 +0200 Subject: [PATCH 30/54] Update README.md --- MPI/elegant/README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/MPI/elegant/README.md b/MPI/elegant/README.md index b1d9e2e..63be3c1 100644 --- a/MPI/elegant/README.md +++ b/MPI/elegant/README.md @@ -61,6 +61,9 @@ export RPN_DEFNS="${PREFIX}/RPN_DEFNS/defns.rpn" ``` ARGS=() +ARGS+=( "GNU_BIN=$GCC_DIR/bin" ) +ARGS+=( "LD=/usr/bin/ld" ) +ARGS+=( "AR=/usr/bin/ar" ) ARGS+=( "EPICS_BASE=${PREFIX}" ) ARGS+=( "INSTALL_LOCATION=${PREFIX}" ) ARGS+=( "INSTALL_LIB=${PREFIX}/lib" ) @@ -80,7 +83,7 @@ cp "${DOWNLOAD_DIR}/defns.rpn" "${RPN_DEFNS}" cd "${PREFIX}" tar xvf "${DOWNLOAD_DIR}/epics.base.configure.tar.gz" cd epics/base -make +make -e "${ARGS[@]}" ``` ## Unpack EPICS extensions and OAG apps configuration From 5961aea2cf4959bee0efcb891275bb7431a989aa Mon Sep 17 00:00:00 2001 From: gsell Date: Mon, 14 May 2018 17:15:00 +0200 Subject: [PATCH 31/54] Update README.md --- MPI/elegant/README.md | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/MPI/elegant/README.md b/MPI/elegant/README.md index 63be3c1..0d92392 100644 --- a/MPI/elegant/README.md +++ b/MPI/elegant/README.md @@ -57,13 +57,15 @@ export EPICS_BASE="${PREFIX}/epics/base" export HOST_ARCH=linux-x86_64 export EPICS_HOST_ARCH=linux-x86_64 export RPN_DEFNS="${PREFIX}/RPN_DEFNS/defns.rpn" +export PERLLIB="${PREFIX}/lib/perl" ``` ``` ARGS=() ARGS+=( "GNU_BIN=$GCC_DIR/bin" ) ARGS+=( "LD=/usr/bin/ld" ) -ARGS+=( "AR=/usr/bin/ar" ) +ARGS+=( "AR=/usr/bin/ar -rc" ) +ARGS+=( "RANLIB=/usr/bin/ranlib" ) ARGS+=( "EPICS_BASE=${PREFIX}" ) ARGS+=( "INSTALL_LOCATION=${PREFIX}" ) ARGS+=( "INSTALL_LIB=${PREFIX}/lib" ) @@ -89,11 +91,13 @@ make -e "${ARGS[@]}" ## Unpack EPICS extensions and OAG apps configuration ``` +ARGS+=( "TOOLS=${PREFIX}/bin") cd "${PREFIX}" tar xvf "${DOWNLOAD_DIR}/epics.extensions.configure.tar.gz" tar xvf "${DOWNLOAD_DIR}/oag.apps.configure.tar.gz" cd "${PREFIX}/oag/apps/configure" -make -e +sed -i "s/clean::/clean:/" RULES_PYTHON +make -e "${ARGS[@]}" ``` > @@ -104,17 +108,17 @@ You have to fix the `clean::` target in `${PREFIX}/oag/apps/configure/PYTHON_RUL cd "${PREFIX}" tar xvf "${DOWNLOAD_DIR}/SDDS.${SDDS_VERSION}.tar.gz" cd "${PREFIX}/epics/extensions/src/SDDS/" -make -e "${ARGS[@]}" -C fftpack -make -e "${ARGS[@]}" -C lzma -make -e "${ARGS[@]}" -C matlib -make -e "${ARGS[@]}" -C mdblib -make -e "${ARGS[@]}" -C mdbcommon -make -e "${ARGS[@]}" -C mdbmth -make -e "${ARGS[@]}" -C meschach -make -e "${ARGS[@]}" -C namelist -make -e "${ARGS[@]}" -C pgapack -make -e "${ARGS[@]}" -C rpns/code -make -e "${ARGS[@]}" -C SDDSlib +make -e "${ARGS[@]}" -C fftpack && \ +make -e "${ARGS[@]}" -C lzma && \ +make -e "${ARGS[@]}" -C matlib && \ +make -e "${ARGS[@]}" -C mdbcommon && \ +make -e "${ARGS[@]}" -C mdblib && \ +make -e "${ARGS[@]}" -C mdbmth && \ +make -e "${ARGS[@]}" -C meschach && \ +make -e "${ARGS[@]}" -C namelist && \ +make -e "${ARGS[@]}" -C pgapack && \ +make -e "${ARGS[@]}" -C rpns/code && \ +make -e "${ARGS[@]}" -C SDDSlib && \ make -e "${ARGS[@]}" -C SDDSlib clean make "${ARGS[@]}" MPI=1 -C SDDSlib ``` From 3c78bf6a7381e648a74dbac57ff6e9c2400fd309 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Tue, 15 May 2018 11:16:31 +0200 Subject: [PATCH 32/54] H5root: variant with gcc/7.3.0 added --- Compiler/H5root/1/variants | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Compiler/H5root/1/variants b/Compiler/H5root/1/variants index aa89c2a..82c7378 100644 --- a/Compiler/H5root/1/variants +++ b/Compiler/H5root/1/variants @@ -6,5 +6,6 @@ H5root/1.3.2rc4 unstable gcc/5.4.0 b:hdf5_serial/1.8.18 b:H5hut/2.0.0rc3 root/6 H5root/1.3.2rc4-1 unstable b:autoconf/2.69 b:automake/1.14 b:libtool/2.4.2 gcc/5.4.0 b:hdf5_serial/1.8.18 b:H5hut/2.0.0rc3 root/6.08.02 boost/1.62.0 gsl/2.2.1 H5root/1.3.2rc5 unstable b:autoconf/2.69 b:automake/1.14 b:libtool/2.4.2 gcc/5.4.0 b:hdf5_serial/1.8.18 b:H5hut/2.0.0rc3 root/6.08.02 boost/1.62.0 gsl/2.2.1 H5root/1.3.2rc5-1 unstable b:autoconf/2.69 b:automake/1.14 b:libtool/2.4.2 gcc/5.4.0 b:hdf5_serial/1.8.18 b:H5hut/2.0.0rc3 root/6.08.02 boost/1.62.0 gsl/2.2.1 -H5root/1.3.2 unstable b:autoconf/2.69 b:automake/1.14 b:libtool/2.4.2 gcc/5.4.0 b:hdf5_serial/1.8.18 b:H5hut/2.0.0rc3 root/6.08.02 boost/1.62.0 gsl/2.2.1 -H5root/1.3.4 unstable b:autoconf/2.69 b:automake/1.14 b:libtool/2.4.2 gcc/5.4.0 b:hdf5_serial/1.8.18 b:H5hut/2.0.0rc3 root/6.08.02 boost/1.62.0 gsl/2.2.1 +H5root/1.3.2 stable b:autoconf/2.69 b:automake/1.14 b:libtool/2.4.2 gcc/5.4.0 b:hdf5_serial/1.8.18 b:H5hut/2.0.0rc3 root/6.08.02 boost/1.62.0 gsl/2.2.1 +H5root/1.3.4 stable b:autoconf/2.69 b:automake/1.14 b:libtool/2.4.2 gcc/5.4.0 b:hdf5_serial/1.8.18 b:H5hut/2.0.0rc3 root/6.08.02 boost/1.62.0 gsl/2.2.1 +H5root/1.3.4 unstable b:autoconf/2.69 b:automake/1.14 b:libtool/2.4.2 gcc/7.3.0 b:hdf5_serial/1.10.1 b:H5hut/2.0.0rc4 root/6.12.06 boost/1.66.0 gsl/2.4 From a4d8a90ef6734a47cd7c559fe413567eb20130f3 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Tue, 15 May 2018 11:18:14 +0200 Subject: [PATCH 33/54] openmpi: variants for 3.0.1 with gcc/5.5.0,6.4.0,7.3.0 added --- Compiler/openmpi/3.0/variants.Linux | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Compiler/openmpi/3.0/variants.Linux b/Compiler/openmpi/3.0/variants.Linux index bff5698..4f66861 100644 --- a/Compiler/openmpi/3.0/variants.Linux +++ b/Compiler/openmpi/3.0/variants.Linux @@ -2,3 +2,7 @@ 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 intel/17.4 + +openmpi/3.0.1 unstable gcc/5.5.0 +openmpi/3.0.1 unstable gcc/6.4.0 +openmpi/3.0.1 unstable gcc/7.3.0 From 6dfc24b7071c186efaeecc2e9d8405753c1d870c Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Tue, 15 May 2018 11:19:12 +0200 Subject: [PATCH 34/54] openmpi/build: enable build of static libraries --- Compiler/openmpi/build | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Compiler/openmpi/build b/Compiler/openmpi/build index a18cb95..fc3dc31 100755 --- a/Compiler/openmpi/build +++ b/Compiler/openmpi/build @@ -16,6 +16,7 @@ pbuild::configure() { --enable-mpi-profile \ --enable-orterun-prefix-by-default \ --enable-shared \ + --enable-static \ --enable-smp-locks \ --with-sge=yes \ --with-slurm=yes \ @@ -23,6 +24,12 @@ pbuild::configure() { || exit 1 } +pbuild::post_install() { + if [[ -r /usr/lib64/libnuma.a ]]; then + : + fi +} + pbuild::add_to_group 'Compiler' pbuild::set_docfiles 'AUTHORS' 'LICENSE' 'NEWS' 'README' pbuild::make_all From f65d1133ebea53bc5b048c58d265c23ecc0eba10 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Tue, 15 May 2018 11:19:50 +0200 Subject: [PATCH 35/54] OPAL: variant for OPAL/2.0.0rc2 added --- MPI/OPAL/2.0/variants | 1 + 1 file changed, 1 insertion(+) create mode 100644 MPI/OPAL/2.0/variants diff --git a/MPI/OPAL/2.0/variants b/MPI/OPAL/2.0/variants new file mode 100644 index 0000000..0b6c5e3 --- /dev/null +++ b/MPI/OPAL/2.0/variants @@ -0,0 +1 @@ +OPAL/2.0.0rc2 unstable gcc/7.3.0 openmpi/3.0.0 boost/1.66.0 hdf5/1.10.1 H5hut/2.0.0rc4 gsl/2.4 trilinos/12.12.1 b:cmake/3.9.6 b:OpenBLAS/0.2.20 From cf86827839fba332817fcf2c31af15ea20d882b5 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Tue, 15 May 2018 11:21:01 +0200 Subject: [PATCH 36/54] OPAL/build: - SOURCE_URL fixed - enable DKS on version < 2 only - gcc/7.3.0 as supported compiler added --- MPI/OPAL/build | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/MPI/OPAL/build b/MPI/OPAL/build index 4072d08..a10f5d3 100755 --- a/MPI/OPAL/build +++ b/MPI/OPAL/build @@ -1,6 +1,6 @@ #!/usr/bin/env modbuild -SOURCE_URL='http://amas.web.psi.ch/Downloads/$P/$P-$V.tar.bz2' +SOURCE_URL="http://amas.web.psi.ch/Downloads/$P/src/$P-$V.tar.bz2" config_args=() @@ -9,7 +9,9 @@ Darwin ) : ;; Linux ) - config_args+=( '-DENABLE_DKS=ON' ) + if (( V_MAJOR < 2)); then + config_args+=( '-DENABLE_DKS=ON' ) + fi ;; esac @@ -24,6 +26,6 @@ pbuild::configure() { } pbuild::add_to_group 'MPI' -pbuild::set_supported_compilers 'gcc/4.7' 'gcc/4.8' 'gcc/4.9' 'gcc/5.4' +pbuild::set_supported_compilers 'gcc/5.4.0' 'gcc/5.5.0' 'gcc/6.4.0' 'gcc/7.3.0' pbuild::make_all From bead773bfa84d02fa6acf83afdf7c0ea3293ad23 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Tue, 15 May 2018 11:21:27 +0200 Subject: [PATCH 37/54] elegant: typo in modulefile fixed --- MPI/elegant/modulefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MPI/elegant/modulefile b/MPI/elegant/modulefile index 3f4eb34..8d5c272 100644 --- a/MPI/elegant/modulefile +++ b/MPI/elegant/modulefile @@ -1,6 +1,6 @@ #%Module1.0 -module-whatis "an accelerator modeling code th" +module-whatis "an accelerator modeling code" module-url "http://www.aps.anl.gov/Accelerator_Systems_Division/Accelerator_Operations_Physics/elegant.html" module-license "See: http://www.aps.anl.gov/epics/license/index.php" module-maintainer "Achim Gsell " From 3d83003e9ced7d467c21465cf68a82a1908a3415 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Tue, 15 May 2018 11:22:15 +0200 Subject: [PATCH 38/54] Python/build: do not build pandas module --- Programming/Python/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Programming/Python/build b/Programming/Python/build index 6549949..285291d 100755 --- a/Programming/Python/build +++ b/Programming/Python/build @@ -28,7 +28,7 @@ pbuild::post_install() { pip${V_MAJOR} install scipy pip${V_MAJOR} install matplotlib pip${V_MAJOR} install ipython - pip${V_MAJOR} install pandas + #pip${V_MAJOR} install pandas pip${V_MAJOR} install sympy pip${V_MAJOR} install nose #pip${V_MAJOR} install mpi4py From e5091f6df9fd1f74fb73ac3b136e148a9983a224 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Tue, 15 May 2018 11:22:51 +0200 Subject: [PATCH 39/54] vim/build: Python support enabled --- Tools/vim/build | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Tools/vim/build b/Tools/vim/build index 937d1aa..f9173c2 100755 --- a/Tools/vim/build +++ b/Tools/vim/build @@ -7,6 +7,8 @@ pbuild::configure() { cd "${MODULE_SRCDIR}" "${MODULE_SRCDIR}"/configure \ --prefix="${PREFIX}" \ + --enable-pythoninterp=dynamic \ + --enable-python3interp=dynamic \ || exit 1 } From a980654315f24699d0e42d42af12d01a7c92e2de Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Tue, 15 May 2018 12:41:43 +0200 Subject: [PATCH 40/54] OpenBLAS: variants for version 0.2.20 with gcc/5.5.0,6.4.0 added --- Compiler/OpenBLAS/0/variants | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Compiler/OpenBLAS/0/variants b/Compiler/OpenBLAS/0/variants index d77356f..ba11d3c 100644 --- a/Compiler/OpenBLAS/0/variants +++ b/Compiler/OpenBLAS/0/variants @@ -12,6 +12,8 @@ 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 +OpenBLAS/0.2.20 stable gcc/5.5.0 +OpenBLAS/0.2.20 stable gcc/6.4.0 OpenBLAS/0.2.20 stable gcc/7.3.0 OpenBLAS/0.2.20 stable clang-macos/9.0.0 OpenBLAS/0.2.20 stable intel/17.4 From 91b1d8eb1cd2436d7e7d06bc460e1926cbad476e Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Tue, 15 May 2018 12:44:22 +0200 Subject: [PATCH 41/54] boost/variants: - release 1.62.0, 1.64.0, 1.66.0 and 1.67.0 as stable - added variants: 1.66.0 with gcc/5.5.0,6.4.0 and 1.67.0 with gcc/5.5.0,6.4.0,7.3.0 --- Compiler/boost/1/variants | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/Compiler/boost/1/variants b/Compiler/boost/1/variants index 076eed3..6d046f3 100644 --- a/Compiler/boost/1/variants +++ b/Compiler/boost/1/variants @@ -18,11 +18,19 @@ 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 -boost/1.62.0 unstable gcc/7.1.0 Python/2.7.12 +boost/1.62.0 stable gcc/6.3.0 Python/2.7.12 +boost/1.62.0 stable gcc/7.1.0 Python/2.7.12 boost/1.63.0 stable gcc/6.3.0 Python/2.7.12 -boost/1.64.0 unstable gcc/5.4.0 Python/2.7.12 +boost/1.64.0 stable gcc/5.4.0 Python/2.7.12 -boost/1.66.0 unstable gcc/7.3.0 b:Python/2.7.12 -boost/1.66.0 unstable clang-macos/9.0.0 b:Python/2.7.12 -boost/1.66.0 unstable intel/17.4 b:Python/2.7.12 +boost/1.66.0 stable gcc/5.5.0 b:Python/2.7.12 +boost/1.66.0 stable gcc/6.4.0 b:Python/2.7.12 +boost/1.66.0 stable gcc/7.3.0 b:Python/2.7.12 +boost/1.66.0 stable clang-macos/9.0.0 b:Python/2.7.12 +boost/1.66.0 stable intel/17.4 b:Python/2.7.12 + +boost/1.67.0 stable gcc/5.5.0 b:Python/2.7.14 +boost/1.67.0 stable gcc/6.4.0 b:Python/2.7.14 +boost/1.67.0 stable gcc/7.3.0 b:Python/2.7.14 +boost/1.67.0 stable clang-macos/9.0.0 b:Python/2.7.14 +boost/1.67.0 stable intel/17.4 b:Python/2.7.14 From 21cfdc4aefdef34cc6f4e57bcfac408a7d9e427f Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Tue, 15 May 2018 12:45:40 +0200 Subject: [PATCH 42/54] gsl/variants: - release version 2.2.1, 2.4 as stable - version 2.4 with gcc/5.5.0, 6.4.0 added --- Compiler/gsl/2/variants | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/Compiler/gsl/2/variants b/Compiler/gsl/2/variants index e9bd14c..223f710 100644 --- a/Compiler/gsl/2/variants +++ b/Compiler/gsl/2/variants @@ -1,9 +1,11 @@ -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 +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 -gsl/2.4.0 stable gcc/7.3.0 -gsl/2.4.0 stable clang-macos/9.0.0 -gsl/2.4.0 stable intel/17.4 +gsl/2.4 stable gcc/5.5.0 +gsl/2.4 stable gcc/6.4.0 +gsl/2.4 stable gcc/7.3.0 +gsl/2.4 stable clang-macos/9.0.0 +gsl/2.4 stable intel/17.4 From bc79a17b735e58fface48f1a664718a5093fc6f0 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Tue, 15 May 2018 12:46:52 +0200 Subject: [PATCH 43/54] gtest/variants: - version 1.7.0 with gcc/5.5.0,6.4.0 added --- Compiler/gtest/1/variants | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Compiler/gtest/1/variants b/Compiler/gtest/1/variants index 8a77ffc..f90a728 100644 --- a/Compiler/gtest/1/variants +++ b/Compiler/gtest/1/variants @@ -1,3 +1,5 @@ gtest/1.7.0 stable b:cmake b:gcc/5.4.0 +gtest/1.7.0 stable b:cmake b:gcc/5.5.0 +gtest/1.7.0 stable b:cmake b:gcc/6.4.0 gtest/1.7.0 stable b:cmake b:gcc/7.3.0 gtest/1.7.0 stable b:cmake b:clang-macos/9.0.0 From 12f38165ed814c79ca9e906c7e0c95a0811dad75 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Tue, 15 May 2018 12:48:58 +0200 Subject: [PATCH 44/54] hdf5_serial: - version 1.10.2 with gcc/5.5.0,6.4.0,7.3.0 and intel/18.2 added - release old versions as stable - fix SOURCE_URL in build script --- Compiler/hdf5_serial/1/variants.Linux | 22 +++++++++++++++++----- Compiler/hdf5_serial/build | 2 +- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/Compiler/hdf5_serial/1/variants.Linux b/Compiler/hdf5_serial/1/variants.Linux index 9aaba2e..4fee0be 100644 --- a/Compiler/hdf5_serial/1/variants.Linux +++ b/Compiler/hdf5_serial/1/variants.Linux @@ -32,9 +32,12 @@ hdf5_serial/1.8.17 stable gcc/6.2.0 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/5.5.0 hdf5_serial/1.8.18 stable gcc/6.2.0 hdf5_serial/1.8.18 stable gcc/6.3.0 +hdf5_serial/1.8.18 stable gcc/6.4.0 hdf5_serial/1.8.18 stable gcc/7.2.0 +hdf5_serial/1.8.18 stable gcc/7.3.0 hdf5_serial/1.8.19 stable gcc/4.8.5 hdf5_serial/1.8.19 stable gcc/4.9.4 @@ -42,19 +45,28 @@ hdf5_serial/1.8.19 stable gcc/5.4.0 hdf5_serial/1.8.19 stable gcc/6.3.0 hdf5_serial/1.8.19 stable gcc/7.2.0 +hdf5_serial/1.8.20 stable gcc/5.5.0 +hdf5_serial/1.8.20 stable gcc/6.4.0 +hdf5_serial/1.8.20 stable gcc/7.3.0 + hdf5_serial/1.10.1 stable gcc/4.8.5 hdf5_serial/1.10.1 stable gcc/4.9.4 hdf5_serial/1.10.1 stable gcc/5.4.0 +hdf5_serial/1.10.1 stable gcc/5.5.0 hdf5_serial/1.10.1 stable gcc/6.3.0 +hdf5_serial/1.10.1 stable gcc/6.4.0 hdf5_serial/1.10.1 stable gcc/7.2.0 hdf5_serial/1.10.1 stable gcc/7.3.0 -hdf5_serial/1.10.2 stable gcc/7.3.0 -hdf5_serial/1.10.1 unstable intel/17.1 +hdf5_serial/1.10.1 stable intel/17.1 hdf5_serial/1.10.1 stable intel/17.4 -hdf5_serial/1.10.2 unstable intel/18.2 -hdf5_serial/1.10.1 unstable pgi/17.3 -hdf5_serial/1.10.1 unstable pgi/17.7 +hdf5_serial/1.10.1 stable pgi/17.3 +hdf5_serial/1.10.1 stable pgi/17.7 + +hdf5_serial/1.10.2 stable gcc/5.5.0 +hdf5_serial/1.10.2 stable gcc/6.4.0 +hdf5_serial/1.10.2 stable gcc/7.3.0 +hdf5_serial/1.10.2 stable intel/18.2 diff --git a/Compiler/hdf5_serial/build b/Compiler/hdf5_serial/build index c8be78b..5526142 100755 --- a/Compiler/hdf5_serial/build +++ b/Compiler/hdf5_serial/build @@ -1,6 +1,6 @@ #!/usr/bin/env modbuild -SOURCE_URL="https://support.hdfgroup.org/ftp/HDF5/current${V_MAJOR}${V_MINOR}/src/hdf5-$V.tar.bz2" +SOURCE_URL="https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${V_MAJOR}.${V_MINOR}/hdf5-$V/src/hdf5-$V.tar.bz2" pbuild::configure() { test "$(basename "$CPP")" = "pgprepro" && { From c3416f4d412d7b4a51888857f1ff73e95acf4ca2 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Tue, 15 May 2018 12:49:38 +0200 Subject: [PATCH 45/54] mpich/variants - release 3.2.1 with intel/17.4 as stable --- Compiler/mpich/3/variants | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Compiler/mpich/3/variants b/Compiler/mpich/3/variants index 22f9e8b..16deb91 100644 --- a/Compiler/mpich/3/variants +++ b/Compiler/mpich/3/variants @@ -1,3 +1,4 @@ +mpich/3.2.1 stable gcc/5.5.0 mpich/3.2.1 stable gcc/6.4.0 mpich/3.2.1 stable gcc/7.3.0 -mpich/3.2.1 unstable intel/17.4 +mpich/3.2.1 stable intel/17.4 From f937c8c97393e4bb4637a7a2f24f3f83c1d8c656 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Tue, 15 May 2018 12:53:43 +0200 Subject: [PATCH 46/54] openmpi/variants: - variants added for gcc/5.5.0,6.4.0, 7.3.0 to versions 1.10.7,2.1.2,3.0.0 - version 2.1.3 and 3.0.1 with gcc/5.5.0,6.4.0,7.3.0 added --- Compiler/openmpi/1.10/variants.Linux | 2 ++ Compiler/openmpi/2.1/variants.Linux | 13 ++++++++++--- Compiler/openmpi/3.0/variants.Linux | 5 +++++ 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/Compiler/openmpi/1.10/variants.Linux b/Compiler/openmpi/1.10/variants.Linux index 4397553..a930555 100644 --- a/Compiler/openmpi/1.10/variants.Linux +++ b/Compiler/openmpi/1.10/variants.Linux @@ -22,8 +22,10 @@ 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 diff --git a/Compiler/openmpi/2.1/variants.Linux b/Compiler/openmpi/2.1/variants.Linux index 142c19e..9dbd71b 100644 --- a/Compiler/openmpi/2.1/variants.Linux +++ b/Compiler/openmpi/2.1/variants.Linux @@ -1,8 +1,15 @@ -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 -openmpi/2.1.2 stable gcc/7.3.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.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 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 diff --git a/Compiler/openmpi/3.0/variants.Linux b/Compiler/openmpi/3.0/variants.Linux index bff5698..ea5c862 100644 --- a/Compiler/openmpi/3.0/variants.Linux +++ b/Compiler/openmpi/3.0/variants.Linux @@ -1,4 +1,9 @@ +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 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 From 285d6d2741af5d689bb7e8a9e0af5f1dc8cf53ad Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Tue, 15 May 2018 12:55:34 +0200 Subject: [PATCH 47/54] root/variants - version 6.12.06 with gcc/5.5.0,6.4.0 added - versions < 6.12.06 released as stable --- Compiler/root/6/variants | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Compiler/root/6/variants b/Compiler/root/6/variants index 4eff74a..c11624b 100644 --- a/Compiler/root/6/variants +++ b/Compiler/root/6/variants @@ -6,9 +6,11 @@ root/6.08.00 stable gcc/4.9.4 b:Python/2.7.12 b:gsl/1.16 b:cmake/3.6.3 root/6.08.00 stable gcc/5.4.0 b:Python/2.7.12 b:gsl/1.16 b:cmake/3.6.3 root/6.08.00 stable gcc/6.2.0 b:Python/2.7.12 b:gsl/1.16 b:cmake/3.6.3 -root/6.08.02 unstable gcc/4.8.5 b:Python/2.7.12 b:gsl/2.2.1 b:cmake/3.6.3 -root/6.08.02 unstable gcc/4.9.4 b:Python/2.7.12 b:gsl/2.2.1 b:cmake/3.6.3 -root/6.08.02 unstable gcc/5.4.0 b:Python/2.7.12 b:gsl/2.2.1 b:cmake/3.6.3 -root/6.08.02 unstable gcc/6.2.0 b:Python/2.7.12 b:gsl/2.2.1 b:cmake/3.6.3 +root/6.08.02 stable gcc/4.8.5 b:Python/2.7.12 b:gsl/2.2.1 b:cmake/3.6.3 +root/6.08.02 stable gcc/4.9.4 b:Python/2.7.12 b:gsl/2.2.1 b:cmake/3.6.3 +root/6.08.02 stable gcc/5.4.0 b:Python/2.7.12 b:gsl/2.2.1 b:cmake/3.6.3 +root/6.08.02 stable gcc/6.2.0 b:Python/2.7.12 b:gsl/2.2.1 b:cmake/3.6.3 +root/6.12.06 unstable gcc/5.5.0 b:Python/2.7.12 b:gsl/2.4 b:cmake/3.6.3 +root/6.12.06 unstable gcc/6.4.0 b:Python/2.7.12 b:gsl/2.4 b:cmake/3.6.3 root/6.12.06 unstable gcc/7.3.0 b:Python/2.7.12 b:gsl/2.4 b:cmake/3.6.3 From 6138856a1d551b3c5c3626932f5b2e0c66bc5a97 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Tue, 15 May 2018 12:56:42 +0200 Subject: [PATCH 48/54] root/build: - try to install Oracle instant-client libs only if available --- Compiler/root/build | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/Compiler/root/build b/Compiler/root/build index 863eb2b..b6b08d8 100755 --- a/Compiler/root/build +++ b/Compiler/root/build @@ -14,21 +14,24 @@ Darwin ) Linux ) INSTANTCLIENT_INCLUDE_DIR='/usr/include/oracle/12.1/client64' INSTANTCLIENT_LIBRARY_DIR='/usr/lib/oracle/12.1/client64/lib' - EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/libclntshcore.so" ) - EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/libclntshcore.so.12.1" ) - EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/libclntsh.so" ) - EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/libclntsh.so.12.1" ) - EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/libipc1.so" ) - EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/libmql1.so" ) - EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/libnnz12.so" ) - EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/libocci.so" ) - EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/libocci.so.12.1" ) - EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/libociei.so" ) - EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/libocijdbc12.so" ) - EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/libons.so" ) - EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/liboramysql12.so" ) - config_args+=" --with-oracle-incdir=${INSTANTCLIENT_INCLUDE_DIR}" - config_args+=" --with-oracle-libdir=${INSTANTCLIENT_LIBRARY_DIR}" + if [[ -e ${INSTANTCLIENT_INCLUDE_DIR} ]] && \ + [[ -e ${INSTANTCLIENT_LIBRARY_DIR} ]]; then + EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/libclntshcore.so" ) + EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/libclntshcore.so.12.1" ) + EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/libclntsh.so" ) + EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/libclntsh.so.12.1" ) + EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/libipc1.so" ) + EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/libmql1.so" ) + EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/libnnz12.so" ) + EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/libocci.so" ) + EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/libocci.so.12.1" ) + EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/libociei.so" ) + EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/libocijdbc12.so" ) + EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/libons.so" ) + EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/liboramysql12.so" ) + config_args+=" --with-oracle-incdir=${INSTANTCLIENT_INCLUDE_DIR}" + config_args+=" --with-oracle-libdir=${INSTANTCLIENT_LIBRARY_DIR}" + fi ;; *) ;; From 760a791bfa9b9d70b03a8c71cf8dbff28c34e108 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Tue, 15 May 2018 12:57:12 +0200 Subject: [PATCH 49/54] Python/build - do not compile pandas module --- Programming/Python/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Programming/Python/build b/Programming/Python/build index 6549949..285291d 100755 --- a/Programming/Python/build +++ b/Programming/Python/build @@ -28,7 +28,7 @@ pbuild::post_install() { pip${V_MAJOR} install scipy pip${V_MAJOR} install matplotlib pip${V_MAJOR} install ipython - pip${V_MAJOR} install pandas + #pip${V_MAJOR} install pandas pip${V_MAJOR} install sympy pip${V_MAJOR} install nose #pip${V_MAJOR} install mpi4py From 2d56e7795f702df59c63b5e5aa22823d76584c4a Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Tue, 15 May 2018 12:57:35 +0200 Subject: [PATCH 50/54] perl - release 5.26.1 as stable --- Programming/perl/5/variants | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Programming/perl/5/variants b/Programming/perl/5/variants index b36d254..8e95d73 100644 --- a/Programming/perl/5/variants +++ b/Programming/perl/5/variants @@ -1 +1 @@ -perl/5.26.1 unstable +perl/5.26.1 stable From baf5e279ebcaf50f34483756ad4f5696639c3fa6 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Tue, 15 May 2018 12:58:00 +0200 Subject: [PATCH 51/54] asciidoc: - release 8.6.9 as stable --- Tools/asciidoc/8/variants | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tools/asciidoc/8/variants b/Tools/asciidoc/8/variants index f3f1245..6db2654 100644 --- a/Tools/asciidoc/8/variants +++ b/Tools/asciidoc/8/variants @@ -1 +1 @@ -asciidoc/8.6.9 unstable Python/2.7.14 +asciidoc/8.6.9 stable Python/2.7.14 From 0ff2f418741c048f346d1b530836e20b280fbceb Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Tue, 15 May 2018 12:58:51 +0200 Subject: [PATCH 52/54] update_releases - first version of script to update releases according the variant files --- bin/update_releases | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100755 bin/update_releases diff --git a/bin/update_releases b/bin/update_releases new file mode 100755 index 0000000..2efe8b5 --- /dev/null +++ b/bin/update_releases @@ -0,0 +1,28 @@ +#!/bin/bash + +declare buildblock=$1 +declare variants=$2 + +declare -r OS=$(uname -s) + +# File format example +# openmpi/1.10.2 unstable gcc/4.8.5 +declare -a toks=() +declare version='' +declare release='' +declare -a dependencies=() + +while read -a toks; do + # skip comment and empty line + (( ${#toks[@]} == 0 )) && continue + [[ "${toks[0]:0:1}" == "#" ]] && continue + module=${toks[0]} + release=${toks[1]} + dependencies=( ${toks[@]:2} ) + + "${buildblock}" "${module#*/}" "${dependencies[@]/#/--with=}" + if [[ $? != 0 ]]; then + echo "Failed building: ${module} --release=${release} ${dependencies[@]/#/--with=}" 1>&2 + exit 42 + fi +done < "${variants}" From 462b8d97cd2f5b582fd9ec663f71ff1204933d91 Mon Sep 17 00:00:00 2001 From: gsell Date: Tue, 15 May 2018 15:33:59 +0200 Subject: [PATCH 53/54] Update README.md --- MPI/elegant/README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/MPI/elegant/README.md b/MPI/elegant/README.md index 0d92392..8254c23 100644 --- a/MPI/elegant/README.md +++ b/MPI/elegant/README.md @@ -50,8 +50,9 @@ ELEGANT_VERSION=34.2.0 ## Setup Environment ``` -DOWNLOAD_DIR='/afs/psi.ch/software/Pmodules/distfiles/elegant' -PREFIX=/opt/psi/MPI/elegant/${ELEGANT_VERSION}/${MPI}/${MPI_VERSION}/${COMPILER}/${COMPILER_VERSION} +source "${PMODULES_ROOT}/config/modbuild.conf" +DOWNLOAD_DIR="${PMODULES_DISTFILESDIR}/elegant" +PREFIX="${PMODULES_ROOT}/MPI/elegant/${ELEGANT_VERSION}/${MPI}/${MPI_VERSION}/${COMPILER}/${COMPILER_VERSION}" export EPICS_BASE="${PREFIX}/epics/base" export HOST_ARCH=linux-x86_64 From 31d4a0d78f8be670b43f7f5f18a9989a8a22d809 Mon Sep 17 00:00:00 2001 From: Hans-Christian Stadler Kleeb Date: Mon, 2 Jul 2018 09:21:26 +0200 Subject: [PATCH 54/54] openmpi/3.1.1 for gcc/8.1.0 --- Compiler/openmpi/3.0/variants.Linux | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Compiler/openmpi/3.0/variants.Linux b/Compiler/openmpi/3.0/variants.Linux index 1e119ac..8a2c158 100644 --- a/Compiler/openmpi/3.0/variants.Linux +++ b/Compiler/openmpi/3.0/variants.Linux @@ -7,5 +7,8 @@ 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 unstable gcc/8.1.0 +openmpi/3.0.1 stable gcc/7.3.0 +openmpi/3.0.1 stable gcc/8.1.0 openpmi/3.0.1 unstable intel/18.2 + +openmpi/3.1.1 stable gcc/8.1.0