diff --git a/Compiler/openmpi/build b/Compiler/openmpi/build index 52f47b1..40931ab 100755 --- a/Compiler/openmpi/build +++ b/Compiler/openmpi/build @@ -46,6 +46,7 @@ pbuild::pre_configure() { pbuild::add_configure_args "--enable-mpi-fortran" pbuild::add_configure_args "--without-verbs" fi + } pbuild::post_install() { diff --git a/Compiler/openmpi/files/variants.merlin6 b/Compiler/openmpi/files/variants.merlin6 index abfe006..7e2911c 100644 --- a/Compiler/openmpi/files/variants.merlin6 +++ b/Compiler/openmpi/files/variants.merlin6 @@ -37,7 +37,7 @@ openmpi/4.0.7-1_slurm stable gcc/10.2.0 cuda/11.4.3 b:ucx/1.11.2-1_slurm openmpi/4.1.1_slurm unstable gcc/10.2.0 cuda/11.3.0 b:ucx/1.11.2_slurm openmpi/4.1.1-1_slurm unstable gcc/10.2.0 cuda/11.3.0 b:ucx/1.10.0_slurm -openmpi/4.1.3_slurm unstable gcc/11.2.0 cuda/11.5.1 b:ucx/1.12.1_slurm +openmpi/4.1.3_slurm unstable gcc/{9.3.0,10.3.0,11.2.0} cuda/11.5.1 b:ucx/1.12.1_slurm openmpi/4.0.5-1_dgx deprecated gcc/{8.4.0,9.3.0,10.2.0} cuda/11.2.2 b:ucx/1.10.0-1_dgx openmpi/4.1.0-1_dgx deprecated gcc/10.2.0 cuda/11.2.2 b:ucx/1.10.0-1_dgx diff --git a/Compiler/scalapack/build b/Compiler/scalapack/build new file mode 100755 index 0000000..95acbbf --- /dev/null +++ b/Compiler/scalapack/build @@ -0,0 +1,32 @@ +#!/usr/bin/env modbuild + +# Check 'version-to-gitcommit.txt' +# - If version exists, we will compile directly from GIT cloned commit. +# - If version does not exist, install from GIT repository package (tag). +COMMIT=$(grep -E "^${V}" files/version-to-gitcommit.txt | awk '{print $2}') + +if [[ ! -n ${COMMIT} ]]; then + pbuild::set_download_url "https://github.com/Reference-ScaLAPACK/scalapack/archive/refs/tags/v${V_PKG}.tar.gz" +else + pbuild::pre_prep() { + # Only deploy package if it does not exist + echo HERE + if [[ ! -f $PMODULES_DISTFILESDIR/$P-$V.tar.gz ]]; then + git clone https://github.com/Reference-ScaLAPACK/scalapack.git scalapack + cd scalapack + git fetch -a + git checkout ${COMMIT} + cd .. + tar --remove-files -cvzf $PMODULES_DISTFILESDIR/$P-$V.tar.gz scalapack + fi + } + pbuild::set_download_url "https://github.com/Reference-ScaLAPACK/scalapack/archive/refs/tags/v${V_PKG}.tar.gz" "$P-$V.tar.gz" +fi + +pbuild::add_to_group 'Compiler' +pbuild::install_docfiles 'README' 'LICENSE' + +pbuild::pre_configure_Linux() { + pbuild::use_cmake +} + diff --git a/Compiler/scalapack/files/variants.rhel7 b/Compiler/scalapack/files/variants.rhel7 new file mode 100644 index 0000000..b83fcf3 --- /dev/null +++ b/Compiler/scalapack/files/variants.rhel7 @@ -0,0 +1 @@ +scalapack/2.2.1-1 unstable gcc/{9.3.0,10.3.0} openmpi/4.1.3_slurm b:boost/1.79.0_slurm b:OpenBLAS/0.3.15 b:lapack/3.10.0 b:cmake/3.20.5 diff --git a/Compiler/scalapack/files/version-to-gitcommit.txt b/Compiler/scalapack/files/version-to-gitcommit.txt new file mode 100644 index 0000000..191dc12 --- /dev/null +++ b/Compiler/scalapack/files/version-to-gitcommit.txt @@ -0,0 +1 @@ +2.2.1-1 5bad7487f496c811192334640ce4d3fc5f88144b diff --git a/Compiler/scalapack/modulefile b/Compiler/scalapack/modulefile new file mode 100644 index 0000000..225aef5 --- /dev/null +++ b/Compiler/scalapack/modulefile @@ -0,0 +1,20 @@ +#%Module1.0 + +module-whatis "ScaLAPACK — Scalable Linear Algebra PACKage" +module-url "http://www.netlib.org/scalapack/" +module-license "See $PREFIX/share/doc/openmpi/LICENSE" +module-maintainer "Marc Caubet Serrabou " +module-help " +ScaLAPACK, version 2.0, includes routines for the solution of dense, +band, and tridiagonal linear systems of equations, condition estimation and +iterative refinement, for LU and Cholesky factorization, matrix inversion, +full-rank linear least squares problems, orthogonal and generalized orthogonal +factorizations, orthogonal transformation routines, reductions to upper +Hessenberg, bidiagonal and tridiagonal form, reduction of a symmetric-definite/ +Hermitian-definite generalized eigenproblem to standard form, the +symmetric/Hermitian, divide-and-conquer symmetric/Hermitian, generalized +symmetric/Hermitian and the nonsymmetric eigenproblem, and the singular value +decomposition. With the exception of the singular value decomposition, +most routines are available in four types: single precision real, double +precision real, single precision complex, and double precision complex. +" diff --git a/MPI/boost/build b/MPI/boost/build index 320fda8..81d3cd4 100755 --- a/MPI/boost/build +++ b/MPI/boost/build @@ -1,6 +1,7 @@ #!/usr/bin/env modbuild -pbuild::set_download_url "https://netcologne.dl.sourceforge.net/project/boost/boost/$V/boost_${V_PKG//./_}.tar.gz" +# pbuild::set_download_url "https://netcologne.dl.sourceforge.net/project/boost/boost/$V/boost_${V_PKG//./_}.tar.gz" +pbuild::set_download_url "https://boostorg.jfrog.io/artifactory/main/release/${V_PKG}/source/boost_${V_PKG//./_}.tar.gz" pbuild::add_to_group 'MPI' diff --git a/MPI/boost/files/variants.merlin6 b/MPI/boost/files/variants.merlin6 index ee49e0f..10f47cc 100644 --- a/MPI/boost/files/variants.merlin6 +++ b/MPI/boost/files/variants.merlin6 @@ -4,4 +4,4 @@ boost/1.73.0_slurm stable gcc/8.4.0 openmpi/4.0.5_slurm b:zlib/1.2.11 boost/1.73.0-1_slurm stable gcc/{8.4.0,9.3.0,10.2.0} openmpi/4.0.5-1_slurm b:zlib/1.2.11 boost/1.73.0_dgx deprecated gcc/{8.4.0,9.3.0,10.2.0} openmpi/4.0.5-1_dgx boost/1.76.0_slurm stable gcc/{10.2.0,10.3.0} openmpi/4.0.5-1_slurm b:zlib/1.2.11 - +boost/1.79.0_slurm unstable gcc/{9.3.0,10.3.0} openmpi/4.1.3_slurm b:zlib/1.2.11