From d1b712b976e8eb81e8de9fd7cdbcdedefdb6366f Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Wed, 11 Jul 2018 10:49:42 +0200 Subject: [PATCH] refactor variable names according to changes in Pmodules/0.99.15 in build-scripts of group 'MPI' --- MPI/BoxLib/build | 2 +- MPI/OPAL.14/build | 2 +- MPI/OPAL/build | 2 +- MPI/SuperLU_DIST/build | 6 +++--- MPI/cpmd/build | 4 ++-- MPI/dks/build | 2 +- MPI/gromacs/build | 2 +- MPI/hdf5/build | 2 +- MPI/ippl/build | 2 +- MPI/lammps/build | 6 +++--- MPI/parmetis/build | 10 +++++----- MPI/trilinos/build | 2 +- 12 files changed, 21 insertions(+), 21 deletions(-) diff --git a/MPI/BoxLib/build b/MPI/BoxLib/build index 55ffa86..987e709 100755 --- a/MPI/BoxLib/build +++ b/MPI/BoxLib/build @@ -4,7 +4,7 @@ pbuild::configure() { CC=$MPICC CXX=$MPICXX cmake \ -DCMAKE_INSTALL_PREFIX="${PREFIX}" \ -DCMAKE_BUILD_TYPE=RELEASE \ - "${MODULE_SRCDIR}" + "${SRC_DIR}" } pbuild::add_to_group 'MPI' diff --git a/MPI/OPAL.14/build b/MPI/OPAL.14/build index 1ed1be2..695a1cf 100755 --- a/MPI/OPAL.14/build +++ b/MPI/OPAL.14/build @@ -10,7 +10,7 @@ pbuild::configure() { -DCMAKE_INSTALL_PREFIX="${PREFIX}" \ -DCMAKE_BUILD_TYPE=RELEASE \ -DENABLE_SAAMG_SOLVER=TRUE \ - "${MODULE_SRCDIR}" + "${SRC_DIR}" } pbuild::add_to_group 'MPI' diff --git a/MPI/OPAL/build b/MPI/OPAL/build index a10f5d3..2eb5dee 100755 --- a/MPI/OPAL/build +++ b/MPI/OPAL/build @@ -22,7 +22,7 @@ pbuild::configure() { -DCMAKE_BUILD_TYPE=Release \ -DENABLE_SAAMG_SOLVER=TRUE \ "${config_args[@]}" \ - "${MODULE_SRCDIR}" + "${SRC_DIR}" } pbuild::add_to_group 'MPI' diff --git a/MPI/SuperLU_DIST/build b/MPI/SuperLU_DIST/build index e71ee8c..68335f9 100755 --- a/MPI/SuperLU_DIST/build +++ b/MPI/SuperLU_DIST/build @@ -12,7 +12,7 @@ pbuild::configure() { die 3 "Oops: unknown compiler: ${COMPILER}" ;; esac - cat < "${MODULE_SRCDIR}/make.inc" + cat < "${SRC_DIR}/make.inc" PLAT = DSuperLUroot = \${PREFIX} DSUPERLULIB = \$(DSuperLUroot)/lib/libsuperlu_dist.a @@ -37,7 +37,7 @@ EOF } pbuild::build() { - cd "${MODULE_SRCDIR}" + cd "${SRC_DIR}" mkdir -p "${PREFIX}/lib" make } @@ -45,7 +45,7 @@ pbuild::build() { pbuild::install() { make install mkdir -p "${PREFIX}/include" - install -m 0444 "${MODULE_SRCDIR}"/SRC/*.h "${PREFIX}/include" + install -m 0444 "${SRC_DIR}"/SRC/*.h "${PREFIX}/include" } diff --git a/MPI/cpmd/build b/MPI/cpmd/build index 152802a..202260e 100755 --- a/MPI/cpmd/build +++ b/MPI/cpmd/build @@ -12,7 +12,7 @@ case $OS in esac pbuild::configure() { - cp -v "${BUILD_BLOCK_DIR}/${target}" "${MODULE_BUILDDIR}/configure" + cp -v "${BUILDBLOCK_DIR}/${target}" "${BUILD_DIR}/configure" ./configure.sh "${target}" || exit 1 } @@ -22,7 +22,7 @@ pbuild::build() { pbuild::install() { mkdir -p "${PREFIX}/bin" - cp "${MODULE_SRCDIR}/bin/cpmd.x" "${PREFIX}/bin" + cp "${SRC_DIR}/bin/cpmd.x" "${PREFIX}/bin" } pbuild::add_to_group 'MPI' diff --git a/MPI/dks/build b/MPI/dks/build index fa4793d..b286846 100755 --- a/MPI/dks/build +++ b/MPI/dks/build @@ -22,7 +22,7 @@ pbuild::configure() { cmake \ -DCMAKE_INSTALL_PREFIX="${PREFIX}" \ "${conf[@]}" \ - "${MODULE_SRCDIR}" \ + "${SRC_DIR}" \ || exit 1 } diff --git a/MPI/gromacs/build b/MPI/gromacs/build index 78bfb81..defc365 100755 --- a/MPI/gromacs/build +++ b/MPI/gromacs/build @@ -10,7 +10,7 @@ pbuild::configure() { -DGMX_GPU=off \ -DGMX_SIMD=SSE2 \ -DGMX_BUILD_OWN_FFTW=on \ - "${MODULE_SRCDIR}" \ + "${SRC_DIR}" \ || exit 1 } diff --git a/MPI/hdf5/build b/MPI/hdf5/build index 338bcc0..44f26bd 100755 --- a/MPI/hdf5/build +++ b/MPI/hdf5/build @@ -27,7 +27,7 @@ pbuild::configure() { #config_args+=( "--enable-threadsafe" ) config_args+=( "--with-pic" ) - "${MODULE_SRCDIR}"/configure \ + "${SRC_DIR}"/configure \ --prefix="${PREFIX}" \ "${config_args[@]}" \ || exit 1 diff --git a/MPI/ippl/build b/MPI/ippl/build index 2c4d9e5..c40eef8 100755 --- a/MPI/ippl/build +++ b/MPI/ippl/build @@ -12,7 +12,7 @@ pbuild::configure() { cmake \ -DCMAKE_BUILD_TYPE=RELEASE \ -DCMAKE_INSTALL_PREFIX="${PREFIX}" \ - "${MODULE_SRCDIR}" \ + "${SRC_DIR}" \ || exit 1 } diff --git a/MPI/lammps/build b/MPI/lammps/build index 5dd6318..baef74f 100755 --- a/MPI/lammps/build +++ b/MPI/lammps/build @@ -1,14 +1,14 @@ #!/usr/bin/env modbuild pbuild::add_to_group 'MPI' -pbuild::set_download_url="file:///lammps-2017.8.tar.gz" +pbuild::set_download_url https://gitlab.psi.ch/Pmodules/download/raw/master/$P-$V.tar.gz pbuild::set_docfiles \ LICENSE \ README pbuild::compile_in_sourcetree pbuild::configure() { - cp -v "${BUILD_BLOCK_DIR}/files/Makefile.PSI" "${MODULE_BUILDDIR}/src/MAKE/MINE" + cp -v "${BUILDBLOCK_DIR}/files/Makefile.PSI" "${BUILD_DIR}/src/MAKE/MINE" } pbuild::build() { @@ -17,7 +17,7 @@ pbuild::build() { pbuild::install() { install -m 0755 -d "${PREFIX}/bin" - install -m 0755 "${MODULE_BUILDDIR}/src/lmp_PSI" "${PREFIX}/bin/lmp_omp" + install -m 0755 "${BUILD_DIR}/src/lmp_PSI" "${PREFIX}/bin/lmp_omp" strip "${PREFIX}/bin/lmp_omp" } diff --git a/MPI/parmetis/build b/MPI/parmetis/build index b8366b7..a6553f3 100755 --- a/MPI/parmetis/build +++ b/MPI/parmetis/build @@ -25,9 +25,9 @@ pbuild::configure() { if (( MAJOR_VERSION == 4 )) ; then cmake \ -DCMAKE_INSTALL_PREFIX="${PREFIX}" \ - -DMETIS_PATH="${MODULE_SRCDIR}/metis" \ - -DGKLIB_PATH="${MODULE_SRCDIR}/metis/GKlib" \ - "${MODULE_SRCDIR}" \ + -DMETIS_PATH="${SRC_DIR}/metis" \ + -DGKLIB_PATH="${SRC_DIR}/metis/GKlib" \ + "${SRC_DIR}" \ || exit 1 fi } @@ -40,7 +40,7 @@ pbuild::build() { FC=$MPIFC FORTRAN=$MPIFORTRAN if (( MAJOR_VERSION == 3 )) ; then - cd "${MODULE_SRCDIR}" + cd "${SRC_DIR}" make -e -j3 || exit 1 mkdir -p $PREFIX/include/metis @@ -54,7 +54,7 @@ pbuild::build() { make install LIBMETIS_A=$(find . -name libmetis.a) - METIS_H=$(find "${MODULE_SRCDIR}" -name metis.h) + METIS_H=$(find "${SRC_DIR}" -name metis.h) install -m 0644 $METIS_H $PREFIX/include install -m 0644 $LIBMETIS_A $PREFIX/lib diff --git a/MPI/trilinos/build b/MPI/trilinos/build index 355d667..47ab3be 100755 --- a/MPI/trilinos/build +++ b/MPI/trilinos/build @@ -77,7 +77,7 @@ pbuild::configure() { -DTrilinos_ENABLE_Tpetra:BOOL=ON \ -DTrilinos_ENABLE_TESTS:BOOL=OFF \ "${config_args[@]}" \ - "${MODULE_SRCDIR}" || exit 1 + "${SRC_DIR}" || exit 1 } pbuild::add_to_group 'HDF5'