refactor variable names according to changes in Pmodules/0.99.15 in build-scripts of group 'MPI'

This commit is contained in:
2018-07-11 10:49:42 +02:00
parent 8c5d93f59b
commit d1b712b976
12 changed files with 21 additions and 21 deletions

View File

@@ -4,7 +4,7 @@ pbuild::configure() {
CC=$MPICC CXX=$MPICXX cmake \ CC=$MPICC CXX=$MPICXX cmake \
-DCMAKE_INSTALL_PREFIX="${PREFIX}" \ -DCMAKE_INSTALL_PREFIX="${PREFIX}" \
-DCMAKE_BUILD_TYPE=RELEASE \ -DCMAKE_BUILD_TYPE=RELEASE \
"${MODULE_SRCDIR}" "${SRC_DIR}"
} }
pbuild::add_to_group 'MPI' pbuild::add_to_group 'MPI'

View File

@@ -10,7 +10,7 @@ pbuild::configure() {
-DCMAKE_INSTALL_PREFIX="${PREFIX}" \ -DCMAKE_INSTALL_PREFIX="${PREFIX}" \
-DCMAKE_BUILD_TYPE=RELEASE \ -DCMAKE_BUILD_TYPE=RELEASE \
-DENABLE_SAAMG_SOLVER=TRUE \ -DENABLE_SAAMG_SOLVER=TRUE \
"${MODULE_SRCDIR}" "${SRC_DIR}"
} }
pbuild::add_to_group 'MPI' pbuild::add_to_group 'MPI'

View File

@@ -22,7 +22,7 @@ pbuild::configure() {
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DENABLE_SAAMG_SOLVER=TRUE \ -DENABLE_SAAMG_SOLVER=TRUE \
"${config_args[@]}" \ "${config_args[@]}" \
"${MODULE_SRCDIR}" "${SRC_DIR}"
} }
pbuild::add_to_group 'MPI' pbuild::add_to_group 'MPI'

View File

@@ -12,7 +12,7 @@ pbuild::configure() {
die 3 "Oops: unknown compiler: ${COMPILER}" die 3 "Oops: unknown compiler: ${COMPILER}"
;; ;;
esac esac
cat <<EOF > "${MODULE_SRCDIR}/make.inc" cat <<EOF > "${SRC_DIR}/make.inc"
PLAT = PLAT =
DSuperLUroot = \${PREFIX} DSuperLUroot = \${PREFIX}
DSUPERLULIB = \$(DSuperLUroot)/lib/libsuperlu_dist.a DSUPERLULIB = \$(DSuperLUroot)/lib/libsuperlu_dist.a
@@ -37,7 +37,7 @@ EOF
} }
pbuild::build() { pbuild::build() {
cd "${MODULE_SRCDIR}" cd "${SRC_DIR}"
mkdir -p "${PREFIX}/lib" mkdir -p "${PREFIX}/lib"
make make
} }
@@ -45,7 +45,7 @@ pbuild::build() {
pbuild::install() { pbuild::install() {
make install make install
mkdir -p "${PREFIX}/include" mkdir -p "${PREFIX}/include"
install -m 0444 "${MODULE_SRCDIR}"/SRC/*.h "${PREFIX}/include" install -m 0444 "${SRC_DIR}"/SRC/*.h "${PREFIX}/include"
} }

View File

@@ -12,7 +12,7 @@ case $OS in
esac esac
pbuild::configure() { pbuild::configure() {
cp -v "${BUILD_BLOCK_DIR}/${target}" "${MODULE_BUILDDIR}/configure" cp -v "${BUILDBLOCK_DIR}/${target}" "${BUILD_DIR}/configure"
./configure.sh "${target}" || exit 1 ./configure.sh "${target}" || exit 1
} }
@@ -22,7 +22,7 @@ pbuild::build() {
pbuild::install() { pbuild::install() {
mkdir -p "${PREFIX}/bin" 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' pbuild::add_to_group 'MPI'

View File

@@ -22,7 +22,7 @@ pbuild::configure() {
cmake \ cmake \
-DCMAKE_INSTALL_PREFIX="${PREFIX}" \ -DCMAKE_INSTALL_PREFIX="${PREFIX}" \
"${conf[@]}" \ "${conf[@]}" \
"${MODULE_SRCDIR}" \ "${SRC_DIR}" \
|| exit 1 || exit 1
} }

View File

@@ -10,7 +10,7 @@ pbuild::configure() {
-DGMX_GPU=off \ -DGMX_GPU=off \
-DGMX_SIMD=SSE2 \ -DGMX_SIMD=SSE2 \
-DGMX_BUILD_OWN_FFTW=on \ -DGMX_BUILD_OWN_FFTW=on \
"${MODULE_SRCDIR}" \ "${SRC_DIR}" \
|| exit 1 || exit 1
} }

View File

@@ -27,7 +27,7 @@ pbuild::configure() {
#config_args+=( "--enable-threadsafe" ) #config_args+=( "--enable-threadsafe" )
config_args+=( "--with-pic" ) config_args+=( "--with-pic" )
"${MODULE_SRCDIR}"/configure \ "${SRC_DIR}"/configure \
--prefix="${PREFIX}" \ --prefix="${PREFIX}" \
"${config_args[@]}" \ "${config_args[@]}" \
|| exit 1 || exit 1

View File

@@ -12,7 +12,7 @@ pbuild::configure() {
cmake \ cmake \
-DCMAKE_BUILD_TYPE=RELEASE \ -DCMAKE_BUILD_TYPE=RELEASE \
-DCMAKE_INSTALL_PREFIX="${PREFIX}" \ -DCMAKE_INSTALL_PREFIX="${PREFIX}" \
"${MODULE_SRCDIR}" \ "${SRC_DIR}" \
|| exit 1 || exit 1
} }

View File

@@ -1,14 +1,14 @@
#!/usr/bin/env modbuild #!/usr/bin/env modbuild
pbuild::add_to_group 'MPI' 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 \ pbuild::set_docfiles \
LICENSE \ LICENSE \
README README
pbuild::compile_in_sourcetree pbuild::compile_in_sourcetree
pbuild::configure() { 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() { pbuild::build() {
@@ -17,7 +17,7 @@ pbuild::build() {
pbuild::install() { pbuild::install() {
install -m 0755 -d "${PREFIX}/bin" 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" strip "${PREFIX}/bin/lmp_omp"
} }

View File

@@ -25,9 +25,9 @@ pbuild::configure() {
if (( MAJOR_VERSION == 4 )) ; then if (( MAJOR_VERSION == 4 )) ; then
cmake \ cmake \
-DCMAKE_INSTALL_PREFIX="${PREFIX}" \ -DCMAKE_INSTALL_PREFIX="${PREFIX}" \
-DMETIS_PATH="${MODULE_SRCDIR}/metis" \ -DMETIS_PATH="${SRC_DIR}/metis" \
-DGKLIB_PATH="${MODULE_SRCDIR}/metis/GKlib" \ -DGKLIB_PATH="${SRC_DIR}/metis/GKlib" \
"${MODULE_SRCDIR}" \ "${SRC_DIR}" \
|| exit 1 || exit 1
fi fi
} }
@@ -40,7 +40,7 @@ pbuild::build() {
FC=$MPIFC FC=$MPIFC
FORTRAN=$MPIFORTRAN FORTRAN=$MPIFORTRAN
if (( MAJOR_VERSION == 3 )) ; then if (( MAJOR_VERSION == 3 )) ; then
cd "${MODULE_SRCDIR}" cd "${SRC_DIR}"
make -e -j3 || exit 1 make -e -j3 || exit 1
mkdir -p $PREFIX/include/metis mkdir -p $PREFIX/include/metis
@@ -54,7 +54,7 @@ pbuild::build() {
make install make install
LIBMETIS_A=$(find . -name libmetis.a) 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 $METIS_H $PREFIX/include
install -m 0644 $LIBMETIS_A $PREFIX/lib install -m 0644 $LIBMETIS_A $PREFIX/lib

View File

@@ -77,7 +77,7 @@ pbuild::configure() {
-DTrilinos_ENABLE_Tpetra:BOOL=ON \ -DTrilinos_ENABLE_Tpetra:BOOL=ON \
-DTrilinos_ENABLE_TESTS:BOOL=OFF \ -DTrilinos_ENABLE_TESTS:BOOL=OFF \
"${config_args[@]}" \ "${config_args[@]}" \
"${MODULE_SRCDIR}" || exit 1 "${SRC_DIR}" || exit 1
} }
pbuild::add_to_group 'HDF5' pbuild::add_to_group 'HDF5'