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 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 diff --git a/Compiler/atlas/3/variants b/Compiler/atlas/3/variants index 751bf86..eda70bd 100644 --- a/Compiler/atlas/3/variants +++ b/Compiler/atlas/3/variants @@ -2,4 +2,7 @@ atlas/3.10.3 unstable gcc/4.8.5 atlas/3.10.2 deprecated gcc/4.9.2 atlas/3.10.3 unstable gcc/4.9.4 atlas/3.10.3 unstable gcc/5.4.0 +atlas/3.10.3 unstable gcc/5.5.0 atlas/3.10.3 unstable gcc/6.2.0 +atlas/3.10.3 unstable gcc/6.4.0 +atlas/3.10.3 unstable gcc/7.3.0 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 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 diff --git a/Compiler/gtest/1/variants b/Compiler/gtest/1/variants index e7a7d4d..f90a728 100644 --- a/Compiler/gtest/1/variants +++ b/Compiler/gtest/1/variants @@ -1,2 +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 diff --git a/Compiler/hdf5_serial/1/variants.Linux b/Compiler/hdf5_serial/1/variants.Linux index 992b860..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,15 +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.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.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" && { 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 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..8a2c158 100644 --- a/Compiler/openmpi/3.0/variants.Linux +++ b/Compiler/openmpi/3.0/variants.Linux @@ -1,4 +1,14 @@ +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 +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 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 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 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 ;; *) ;; 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 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 \ diff --git a/Libraries/mpc/1/variants b/Libraries/mpc/1/variants index 6c43014..a0caba7 100644 --- a/Libraries/mpc/1/variants +++ b/Libraries/mpc/1/variants @@ -3,4 +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 unstable b:gmp/6.1.2 b:mpfr/4.0.1 +mpc/1.1.0-1 stable b:gmp/6.1.2 b:mpfr/4.0.1 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 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 diff --git a/MPI/OPAL/build b/MPI/OPAL/build index 3ba06d5..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/OPAL/OPAL-1.6.0rc6.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 diff --git a/MPI/elegant/README.md b/MPI/elegant/README.md new file mode 100644 index 0000000..8254c23 --- /dev/null +++ b/MPI/elegant/README.md @@ -0,0 +1,139 @@ +# 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`. 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 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 OpenBLAS/0.2.20 mpich/3.2.1 +``` + +## Set used versions +``` +SDDS_VERSION=3.6.1 +ELEGANT_VERSION=34.2.0 +``` + +## Setup Environment +``` +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 +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 -rc" ) +ARGS+=( "RANLIB=/usr/bin/ranlib" ) +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 + +EPICS base configuration +``` +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 -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" +sed -i "s/clean::/clean:/" RULES_PYTHON +make -e "${ARGS[@]}" +``` + +> +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 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 +``` + +## Compile (P)elegant + +``` +cd "${PREFIX}" +tar xvf "${DOWNLOAD_DIR}/elegant.${ELEGANT_VERSION}.tar.gz" + +PATH+=":${PREFIX}/bin" + +cd "${PREFIX}/oag/apps/src/elegant" +make -e "${ARGS[@]}" +make clean +make "${ARGS[@]}" Pelegant +``` 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 " 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 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 diff --git a/Programming/Python/build b/Programming/Python/build index 6b24c55..285291d 100755 --- a/Programming/Python/build +++ b/Programming/Python/build @@ -28,10 +28,10 @@ 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 + #pip${V_MAJOR} install mpi4py } pbuild::add_to_group 'Programming' 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 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 diff --git a/Programming/gcc/8/variants b/Programming/gcc/8/variants new file mode 100644 index 0000000..b128666 --- /dev/null +++ b/Programming/gcc/8/variants @@ -0,0 +1 @@ +gcc/8.1.0 unstable b:gmp/6.1.2 b:mpfr/4.0.1 b:mpc/1.1.0 diff --git a/Programming/perl/5/variants b/Programming/perl/5/variants new file mode 100644 index 0000000..8e95d73 --- /dev/null +++ b/Programming/perl/5/variants @@ -0,0 +1 @@ +perl/5.26.1 stable 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'. +" + diff --git a/Tools/asciidoc/8/variants b/Tools/asciidoc/8/variants new file mode 100644 index 0000000..6db2654 --- /dev/null +++ b/Tools/asciidoc/8/variants @@ -0,0 +1 @@ +asciidoc/8.6.9 stable 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. +" + diff --git a/Tools/git/2/variants b/Tools/git/2/variants index 1f597be..59357c2 100644 --- a/Tools/git/2/variants +++ b/Tools/git/2/variants @@ -2,5 +2,5 @@ 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 stable Tcl/8.6.4 Tk/8.6.4 -git/2.16.2 stable Tcl/8.6.4 Tk/8.6.4 +git/2.13.0 stable Tcl/8.6.4 Tk/8.6.4 b:perl b:asciidoc b:xmlto +git/2.16.2 stable 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 } 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 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 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 } 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) +" + 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}"