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

This commit is contained in:
2017-02-15 17:26:43 +01:00
15 changed files with 37 additions and 27 deletions

View File

@@ -10,3 +10,4 @@ OpenBLAS/0.2.19 stable gcc/4.9.4
OpenBLAS/0.2.19 stable gcc/5.3.0
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

View File

@@ -3,12 +3,16 @@ boost/1.55.0 stable gcc/4.8.3 b:Python/3.4.0
boost/1.55.0 stable gcc/4.8.4 b:Python/3.4.0
boost/1.55.0 stable gcc/4.8.5 b:Python/2.7.11
boost/1.55.0 stable gcc/4.9.2 b:Python/3.4.0
boost/1.58.0 stable gcc/4.8.4 b:Python/3.4.0
boost/1.58.0 stable gcc/4.8.5 b:Python/2.7.11
boost/1.58.0 stable gcc/4.9.3 b:Python/2.7.11
boost/1.61.0 stable gcc/4.8.5 b:Python/2.7.11
boost/1.61.0 stable gcc/6.2.0 b:Python/2.7.11
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

View File

@@ -2,3 +2,4 @@ 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

View File

@@ -1,5 +1,5 @@
hdf5_serial/1.8.12 stable gcc/4.7.4
hdf5_serial/1.8.12 deprecated gcc/4.8.3
hdf5_serial/1.8.12 stable gcc/4.8.3
hdf5_serial/1.8.12 deprecated gcc/4.8.4
#hdf5_serial/1.8.12 stable gcc/4.8.5
hdf5_serial/1.8.12 deprecated gcc/4.9.2
@@ -33,3 +33,4 @@ 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/6.2.0
hdf5_serial/1.8.18 stable gcc/6.3.0

View File

@@ -1,6 +1,7 @@
openmpi/1.10.0 deprecated gcc/4.8.4
openmpi/1.10.0 deprecated gcc/4.9.2
openmpi/1.10.0 deprecated gcc/4.9.3
openmpi/1.10.2 stable gcc/4.8.5
openmpi/1.10.2 stable gcc/4.9.3
openmpi/1.10.2 stable gcc/4.9.4
@@ -9,9 +10,11 @@ openmpi/1.10.2 stable gcc/5.3.0
openmpi/1.10.2 stable gcc/5.4.0
openmpi/1.10.2 stable gcc/6.1.0
openmpi/1.10.2 stable gcc/6.2.0
openmpi/1.10.4 stable gcc/4.8.5
openmpi/1.10.4 stable gcc/4.9.4
openmpi/1.10.4 stable gcc/5.4.0
openmpi/1.10.4 stable gcc/6.2.0
openmpi/1.10.4 unstable gcc/6.3.0
openmpi/1.10.2 unstable intel/15.3

View File

@@ -1,3 +1,7 @@
2.0.0 unstable gcc/6.1.0
2.0.0 unstable intel/16.3
2.0.1 unstable gcc/6.2.0
openmpi/2.0.0 stable gcc/6.1.0
openmpi/2.0.1 unstable gcc/4.8.5
openmpi/2.0.1 unstable gcc/4.9.4
openmpi/2.0.1 unstable gcc/5.4.0
openmpi/2.0.1 unstable gcc/6.2.0
openmpi/2.0.1 unstable gcc/6.3.0

View File

@@ -1,2 +1,4 @@
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-20170210 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

View File

@@ -0,0 +1,2 @@
OPAL/1.5.0-20170126 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

View File

@@ -1,5 +1,15 @@
#!/usr/bin/env modbuild
config_args=()
case ${OS} in
Darwin )
:
;;
Linux )
: #config_args+=( '-DENABLE_DKS=ON' )
;;
esac
# add -fopenmp to CC and CXX, if you want to compile with OpenMP
pbuild::configure() {
@@ -7,7 +17,7 @@ pbuild::configure() {
-DCMAKE_INSTALL_PREFIX="${PREFIX}" \
-DCMAKE_BUILD_TYPE=RELEASE \
-DENABLE_SAAMG_SOLVER=TRUE \
-DENABLE_DKS=ON \
"${config_args[@]}" \
"${MODULE_SRCDIR}"
}

View File

@@ -1,9 +0,0 @@
gcc/4.8.3
openmpi/1.8.2
ippl/1.1.4
hdf5/1.8.12
H5hut/1.99.13
trilinos/11.10.2
boost/1.55.0
gsl/1.15
root/5.34.19

View File

@@ -0,0 +1 @@
dks/1.0.1 unstable gcc/5.4.0 openmpi/1.10.4 boost/1.62.0 b:cmake/3.6.3

View File

@@ -0,0 +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

View File

@@ -0,0 +1 @@
opt-pilot/0.1.3-20170126 unstable gcc/5.4.0 openmpi/1.10.4 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 b:cmake/3.6.3

View File

@@ -11,8 +11,6 @@ pbuild::configure() {
}
pbuild::add_to_group 'OPAL'
pbuild::set_runtime_dependencies "${COMPILER}" "${MPI}"
pbuild::set_build_dependencies 'cmake' "${COMPILER}" "${MPI}" 'boost' 'hdf5' 'H5hut' 'trilinos' 'gsl' 'boost' 'OPAL'
pbuild::set_supported_compilers 'gcc/4.8'
pbuild::set_supported_compilers 'gcc/4.8' 'gcc/5.4'
pbuild::make_all

View File

@@ -1,10 +0,0 @@
gcc/4.8.3
openmpi/1.8.2
ippl/1.1.4
hdf5/1.8.12
H5hut/1.99.13
trilinos/11.10.2
boost/1.55.0
gsl/1.15
root/5.34.19
OPAL/1.3.2