Merge branch 'master' of gitlab.psi.ch:Pmodules/buildblocks

2017-05-10 12:03:27 +02:00
parent 3e35ae3df5 d0e43c4ab9
commit 95c3b2c85f
19 changed files with 109 additions and 24 deletions
--- a/Compiler/OpenBLAS/build
+++ b/Compiler/OpenBLAS/build
@@ -1,6 +1,6 @@
 #!/usr/bin/env modbuild

-#SOURCE_URL="http://github.com/xianyi/$P/archive/v$V.tar.gz"
+SOURCE_URL="http://github.com/xianyi/$P/archive/v$V.tar.gz"

 pbuild::configure() {
 	case ${COMPILER} in
@@ -21,6 +21,8 @@ DRVOPTS  = \$(NOOPT)
 ARCHFLAGS= -ru
 EOF
 	echo "USE_SIMPLE_THREADED_LEVEL3 = 1" >> "${MODULE_SRCDIR}/Makefile.rule"
+	echo "NO_AVX = 1" >> "${MODULE_SRCDIR}/Makefile.rule"
+	echo "NO_AVX2 = 1" >> "${MODULE_SRCDIR}/Makefile.rule"
 	sed -i.bak "s/MACOSX_DEPLOYMENT_TARGET=.*/MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET/" "${MODULE_SRCDIR}/Makefile.system"
 }

--- a/Compiler/boost/build
+++ b/Compiler/boost/build
@@ -1,6 +1,7 @@
 #!/usr/bin/env modbuild

-SOURCE_URL="https://sourceforge.net/projects/boost/files/$P/$V/boost_${V_MAJOR}_${V_MINOR}_${V_PATCHLVL}.tar.gz"
+SOURCE_URL="https://netcologne.dl.sourceforge.net/project/boost/boost/$V/boost_${V_MAJOR}_${V_MINOR}_${V_PATCHLVL}.tar.gz"
+
 BOOST_BUILD_PATH="${MODULE_BUILDDIR}"

 pbuild::configure() {
--- a/Compiler/root/6/cmake_oracle12.patch
+++ b/Compiler/root/6/cmake_oracle12.patch
@@ -0,0 +1,12 @@
+diff -ur root-6.08.02.orig/cmake/modules/FindOracle.cmake root-6.08.02/cmake/modules/FindOracle.cmake
+--- root-6.08.02.orig/cmake/modules/FindOracle.cmake	2016-12-03 00:07:29.000000000 +0100
+++ root-6.08.02/cmake/modules/FindOracle.cmake	2017-03-30 15:40:50.682127137 +0200
+@@ -55,7 +55,7 @@
+ )
+ FIND_LIBRARY(
+     ORACLE_LIBRARY_LNNZ
+-    NAMES libnnz10 nnz10 libnnz11 nnz11 ociw32
+    NAMES libnnz10 nnz10 libnnz11 nnz11 nnz12 ociw32
+     PATHS ${ORACLE_LIB_LOCATION}
+ )
+ 
--- a/Compiler/root/build6
+++ b/Compiler/root/build6
@@ -28,6 +28,10 @@ Linux )
 	;;
 esac

+pbuild::patch_sources_Linux() {
+	patch -p1 < "${BUILD_BLOCK_DIR}/${V_MAJOR}/cmake_oracle12.patch"
+}
+
 pbuild::configure() {
 	cmake "${MODULE_SRCDIR}" \
 		${config_args} \
--- a/Libraries/gmp/build
+++ b/Libraries/gmp/build
@@ -1,5 +1,7 @@
 #!/usr/bin/env modbuild

+SOURCE_URL="https://gmplib.org/download/$P/$P-$V.tar.bz2"
+
 pbuild::configure() {
 	"${MODULE_SRCDIR}"/configure \
 		--prefix="${PREFIX}" \
--- a/Libraries/mpc/1/variants
+++ b/Libraries/mpc/1/variants
@@ -1,3 +1,4 @@
 mpc/1.0.2	stable		b:gmp/5.1.1 b:mpfr/3.1.2
 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
--- a/Libraries/mpc/build
+++ b/Libraries/mpc/build
@@ -1,5 +1,7 @@
 #!/usr/bin/env modbuild

+SOURCE_URL="ftp://ftp.gnu.org/gnu/$P/$P-$V_MAJOR.$V_MINOR.$V_PATCHLVL.tar.gz"
+
 pbuild::configure() {
 	"${MODULE_SRCDIR}"/configure \
 		--prefix="${PREFIX}" \
--- a/Libraries/mpfr/build
+++ b/Libraries/mpfr/build
@@ -1,5 +1,7 @@
 #!/usr/bin/env modbuild

+SOURCE_URL="http://www.mpfr.org/$P-current/$P-$V.tar.gz"
+
 pbuild::configure() {
 	"${MODULE_SRCDIR}"/configure \
 		--prefix="${PREFIX}" \
--- a/MPI/OPAL/1.5/variants
+++ b/MPI/OPAL/1.5/variants
@@ -1,4 +1,3 @@
-OPAL/1.5.0-20161209	unstable gcc/5.4.0 openmpi/1.10.4 dks/1.0.1 boost/1.62.0 hdf5/1.8.18 H5hut/2.0.0rc3 gsl/2.2.1 trilinos/12.10.1 cuda/8.0.44 b:cmake/3.6.3 b:OpenBLAS/0.2.19
-OPAL/1.5.0-20170126	unstable gcc/5.4.0 openmpi/1.10.4 dks/1.0.1 boost/1.62.0 hdf5/1.8.18 H5hut/2.0.0rc3 gsl/2.2.1 trilinos/12.10.1 cuda/8.0.44 b:cmake/3.6.3 b:OpenBLAS/0.2.19
-OPAL/1.5.1-20170216	unstable gcc/5.4.0 openmpi/1.10.4 dks/1.0.1 boost/1.62.0 hdf5/1.8.18 H5hut/2.0.0rc3 gsl/2.2.1 trilinos/12.10.1 cuda/8.0.44 b:cmake/3.6.3 b:OpenBLAS/0.2.19
+OPAL/1.5.1-20170217	unstable gcc/5.4.0 openmpi/1.10.4 dks/1.0.1 boost/1.62.0 hdf5/1.8.18 H5hut/2.0.0rc3 gsl/2.2.1 trilinos/12.10.1 cuda/8.0.44 b:cmake/3.6.3 b:OpenBLAS/0.2.19
+OPAL/1.5.2	unstable gcc/5.4.0 openmpi/1.10.4 dks/1.0.2 boost/1.62.0 hdf5/1.8.18 H5hut/2.0.0rc3 gsl/2.2.1 trilinos/12.10.1 cuda/8.0.44 b:cmake/3.6.3 b:OpenBLAS/0.2.19

--- a/MPI/OPAL/1.6/variants
+++ b/MPI/OPAL/1.6/variants
@@ -0,0 +1,2 @@
+OPAL/1.6.0rc1	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.1 b:cmake/3.6.3 b:OpenBLAS/0.2.19
+
--- a/MPI/OPAL/1.6/variants.Darwin
+++ b/MPI/OPAL/1.6/variants.Darwin
@@ -0,0 +1,2 @@
+OPAL/1.6.0rc1	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 b:cmake/3.6.3 b:OpenBLAS/0.2.19
+
--- a/MPI/OPAL/build
+++ b/MPI/OPAL/build
@@ -7,7 +7,7 @@ Darwin )
 	:
 	;;
 Linux )
-	: #config_args+=( '-DENABLE_DKS=ON' )
+	config_args+=( '-DENABLE_DKS=ON' )
 	;;
 esac

--- a/MPI/dks/1/variants
+++ b/MPI/dks/1/variants
@@ -1,3 +1,6 @@
 dks/1.0.1	unstable	gcc/4.8.5 openmpi/1.10.4 boost/1.62.0 cuda/8.0.44 b:cmake/3.6.3
 dks/1.0.1	unstable	gcc/4.9.4 openmpi/1.10.4 boost/1.62.0 cuda/8.0.44 b:cmake/3.6.3
 dks/1.0.1	unstable	gcc/5.4.0 openmpi/1.10.4 boost/1.62.0 cuda/8.0.44 b:cmake/3.6.3
+dks/1.0.2	unstable	gcc/5.4.0 openmpi/1.10.4 boost/1.62.0 cuda/8.0.44 b:cmake/3.6.3
+dks/1.1.0	unstable	gcc/5.4.0 openmpi/1.10.4 boost/1.62.0 cuda/8.0.44 b:cmake/3.6.3
+dks/1.1.1	unstable	gcc/5.4.0 openmpi/1.10.4 boost/1.62.0 cuda/8.0.44 b:cmake/3.6.3
--- a/MPI/dks/build
+++ b/MPI/dks/build
@@ -1,10 +1,19 @@
 #!/usr/bin/env modbuild

+declare -ra vers=( ${V//./ } )
+
+conf=()
+if (( ${vers[0]} >= 1 && ${vers[1]} >= 1 )); then
+	conf+=("-DDKS_FULL=ON")
+fi
+
 pbuild::configure() {
 	export CXX=mpicxx
 	export CC=mpicc
 	cmake \
-		-DCMAKE_INSTALL_PREFIX="${PREFIX}"  "${MODULE_SRCDIR}" \
+		-DCMAKE_INSTALL_PREFIX="${PREFIX}" \
+		"${conf[@]}" \
+		"${MODULE_SRCDIR}" \
 		|| exit 1
 }

--- a/MPI/parmetis/build
+++ b/MPI/parmetis/build
@@ -1,5 +1,7 @@
 #!/usr/bin/env modbuild

+unset MACOSX_DEPLOYMENT_TARGET
+
 SOURCE_URL="http://glaros.dtc.umn.edu/gkhome/fetch/sw/$P/$P-$V.tar.gz"

 declare -ri MAJOR_VERSION=${V%%.*}
@@ -20,9 +22,23 @@ pbuild::configure() {
 	F90=$MPIF90
 	FC=$MPIFC
 	FORTRAN=$MPIFORTRAN
+	if (( MAJOR_VERSION == 4 )) ; then
+		cmake \
+			-DCMAKE_INSTALL_PREFIX="${PREFIX}" \
+			-DMETIS_PATH="${MODULE_SRCDIR}/metis" \
+			-DGKLIB_PATH="${MODULE_SRCDIR}/metis/GKlib" \
+			"${MODULE_SRCDIR}" \
+			|| exit 1
+	fi
 }

 pbuild::build() {
+	CC=$MPICC
+	CXX=$MPICXX
+	F77=$MPIF77
+	F90=$MPIF90
+	FC=$MPIFC
+	FORTRAN=$MPIFORTRAN
 	if (( MAJOR_VERSION == 3 )) ; then
 		cd "${MODULE_SRCDIR}"
 		make -e -j3 || exit 1
@@ -34,13 +50,11 @@ pbuild::build() {
 		cp METISLib/*.h $PREFIX/include/metis
 		cp lib*.a $PREFIX/lib
 	elif (( MAJOR_VERSION == 4 )); then
-		cd "${MODULE_SRCDIR}"
-		make config prefix=$PREFIX || exit 1
 		make -j3 || exit 1
 		make install

 		LIBMETIS_A=$(find . -name libmetis.a)
-		METIS_H=$(find . -name metis.h)
+		METIS_H=$(find "${MODULE_SRCDIR}" -name metis.h)

 		install -m 0644 $METIS_H    $PREFIX/include
 		install -m 0644 $LIBMETIS_A $PREFIX/lib
--- a/OPAL/opt-pilot/0/variants
+++ b/OPAL/opt-pilot/0/variants
@@ -1 +1 @@
-opt-pilot/0.1.3-20170126	unstable gcc/5.4.0 openmpi/1.10.4 dks/1.0.1 hdf5/1.8.18 H5hut/2.0.0rc3 trilinos/12.10.1 boost/1.62.0 gsl/2.2.1 root/6.08.02 OPAL/1.5.0-20170126 cuda/8.0.44 b:cmake/3.6.3
+opt-pilot/0.1.3-20170217	unstable gcc/5.4.0 openmpi/1.10.4 dks/1.0.1 hdf5/1.8.18 H5hut/2.0.0rc3 trilinos/12.10.1 parmetis/4.0.3 boost/1.62.0 gsl/2.2.1 root/6.08.02 cuda/8.0.44 OPAL/1.5.1-20170217 b:cmake/3.6.3
--- a/Programming/Tk/build
+++ b/Programming/Tk/build
@@ -9,6 +9,8 @@ pbuild::configure() {
 		;;
 	Darwin )
 		srcdir="${MODULE_SRCDIR}/macosx"
+		C_INCLUDE_PATH+=":/opt/local/include"
+		LIBRARY_PATH+=":/opt/local/lib"
 		;;
 	esac
 	"${srcdir}"/configure \
--- a/Programming/gcc/5/variants
+++ b/Programming/gcc/5/variants
@@ -1,5 +1,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.0 b:mpfr/3.1.4 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

--- a/Programming/gcc/build
+++ b/Programming/gcc/build
@@ -1,5 +1,7 @@
 #!/usr/bin/env modbuild

+SOURCE_URL="https://ftp.gnu.org/gnu/gcc/$P-$V/$P-$V.tar.bz2"
+
 pbuild::patch_sources_Darwin() {
 	if (( V_MAJOR == 4 && V_MINOR <= 8 )) || \
 	   (( V_MAJOR == 4 && V_MINOR == 9 && V_PATCHLVL < 4)); then
@@ -12,18 +14,44 @@ pbuild::patch_sources_Darwin() {
 }

 pbuild::configure() {
-	"${MODULE_SRCDIR}"/configure \
-		--prefix="${PREFIX}" \
-		--enable-languages=c,c++,objc,obj-c++,lto,fortran \
-		--with-gmp="${GMP_PREFIX}" \
-		--with-mpfr="${MPFR_PREFIX}" \
-		--with-mpc="${MPC_PREFIX}" \
-		--enable-lto \
-		--disable-multilib \
-		--with-build-config=bootstrap-debug \
-		--with-pkgversion="PSI Environment Module" \
-		--with-build-config=bootstrap-debug \
-		|| exit 1
+	local -a conf_args=()
+	conf_args+=( "--enable-languages=c,c++,objc,obj-c++,lto,fortran" )
+	conf_args+=( "--with-gmp=${GMP_PREFIX}" )
+	conf_args+=( "--with-mpfr=${MPFR_PREFIX}" )
+	conf_args+=( "--with-mpc=${MPC_PREFIX}" )
+	conf_args+=( "--enable-lto" )
+	conf_args+=( "--disable-multilib" )
+	conf_args+=( "--with-build-config=bootstrap-debug" )
+	conf_args+=( "--with-pkgversion='PSI Environment Module'" )
+	conf_args+=( "--with-build-config=bootstrap-debug" )
+
+	case "${OS}" in
+	Darwin )
+		local -r prefix='/opt/local'
+		"${MODULE_SRCDIR}"/configure \
+			--prefix="${PREFIX}" \
+			"${conf_args[@]}" \
+			--with-as=${prefix}/bin/as \
+			--with-ld=${prefix}/bin/ld \
+			--with-ar=${prefix}/bin/ar \
+			AR_FOR_TARGET=${prefix}/bin/ar \
+			AS_FOR_TARGET=${prefix}/bin/as \
+			LD_FOR_TARGET=${prefix}/bin/ld \
+			NM_FOR_TARGET=${prefix}/bin/nm \
+			OBJDUMP_FOR_TARGET=${prefix}/bin/objdump \
+			RANLIB_FOR_TARGET=${prefix}/bin/ranlib \
+			STRIP_FOR_TARGET=${prefix}/bin/strip \
+			OTOOL=${prefix}/bin/otool \
+			OTOOL64=${prefix}/bin/otool \
+			|| exit 1
+		;;
+	Linux )
+		"${MODULE_SRCDIR}"/configure \
+			--prefix="${PREFIX}" \
+			"${conf_args[@]}" \
+			|| exit 1
+		;;
+	esac
 }

 # use system gcc to compile
				`@@ -0,0 +1,2 @@`
				`OPAL/1.6.0rc1 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.1 b:cmake/3.6.3 b:OpenBLAS/0.2.19`