From 1beb37444105336baffda7bb0bd121b743e612a5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20K=C3=B6cher?= Date: Tue, 10 Nov 2015 16:32:09 +0100 Subject: [PATCH] candi: deal.II: use of default.packages --- candi.sh | 7 +++-- deal.II-toolchain/packages/default.packages | 12 +++++++++ .../platforms/supported/centos7.platform | 15 ++--------- .../platforms/supported/fedora22.platform | 15 ++--------- .../platforms/supported/fedora23.platform | 15 ++--------- .../supported/linux_cluster.platform | 18 +++---------- .../platforms/supported/opensuse12.platform | 17 ++---------- .../platforms/supported/opensuse13.platform | 17 ++---------- .../platforms/supported/rhel7.platform | 15 ++--------- .../platforms/supported/ubuntu12.platform | 26 +++++-------------- .../platforms/supported/ubuntu14.platform | 21 +++------------ .../platforms/supported/ubuntu15.platform | 26 +++++++------------ 12 files changed, 50 insertions(+), 154 deletions(-) create mode 100644 deal.II-toolchain/packages/default.packages diff --git a/candi.sh b/candi.sh index 604b5d9..c4a9cda 100755 --- a/candi.sh +++ b/candi.sh @@ -655,12 +655,11 @@ else fi # Source default PLATFORM variables, if present -PLATFORM_DEFAULT=${PROJECT}/platforms/default.packages -if [ -e ${PLATFORM_DEFAULT} ]; then - source ${PLATFORM_DEFAULT} +DEFAULT_PACKAGES=${PROJECT}/packages/default.packages +if [ -e ${DEFAULT_PACKAGES} ]; then + source ${DEFAULT_PACKAGES} fi - # Source PLATFORM variables if set up correctly if [ -z ${PLATFORM} ]; then cecho ${BAD} "Please contact the authors, if you have not changed candi!" diff --git a/deal.II-toolchain/packages/default.packages b/deal.II-toolchain/packages/default.packages new file mode 100644 index 0000000..7e62724 --- /dev/null +++ b/deal.II-toolchain/packages/default.packages @@ -0,0 +1,12 @@ +PACKAGES=( +load:dealii-prepare +once:opencascade +once:parmetis +once:superlu_dist +once:hdf5 +once:p4est +once:trilinos +once:petsc +once:slepc +dealii +) diff --git a/deal.II-toolchain/platforms/supported/centos7.platform b/deal.II-toolchain/platforms/supported/centos7.platform index 58e01f8..a47dfb4 100644 --- a/deal.II-toolchain/platforms/supported/centos7.platform +++ b/deal.II-toolchain/platforms/supported/centos7.platform @@ -20,16 +20,5 @@ ## # -# Define the packages this platform needs -PACKAGES=( -load:dealii-prepare -once:opencascade -once:parmetis -once:superlu_dist -once:hdf5 -once:p4est -once:trilinos -once:petsc -once:slepc -dealii -) +# Define the additional packages for this platform. +#PACKAGES="once:cmake ${PACKAGES}" diff --git a/deal.II-toolchain/platforms/supported/fedora22.platform b/deal.II-toolchain/platforms/supported/fedora22.platform index abc38a8..290e917 100644 --- a/deal.II-toolchain/platforms/supported/fedora22.platform +++ b/deal.II-toolchain/platforms/supported/fedora22.platform @@ -18,16 +18,5 @@ ## # -# Define the packages this platform needs -PACKAGES=( -load:dealii-prepare -once:opencascade -once:parmetis -once:superlu_dist -once:hdf5 -once:p4est -once:trilinos -once:petsc -once:slepc -dealii -) +# Define the additional packages for this platform. +#PACKAGES="once:cmake ${PACKAGES}" diff --git a/deal.II-toolchain/platforms/supported/fedora23.platform b/deal.II-toolchain/platforms/supported/fedora23.platform index ba41b1a..844000a 100644 --- a/deal.II-toolchain/platforms/supported/fedora23.platform +++ b/deal.II-toolchain/platforms/supported/fedora23.platform @@ -18,16 +18,5 @@ ## # -# Define the packages this platform needs -PACKAGES=( -load:dealii-prepare -once:opencascade -once:parmetis -once:superlu_dist -once:hdf5 -once:p4est -once:trilinos -once:petsc -once:slepc -dealii -) +# Define the additional packages for this platform. +#PACKAGES="once:cmake ${PACKAGES}" diff --git a/deal.II-toolchain/platforms/supported/linux_cluster.platform b/deal.II-toolchain/platforms/supported/linux_cluster.platform index 7c86e4d..50b297e 100644 --- a/deal.II-toolchain/platforms/supported/linux_cluster.platform +++ b/deal.II-toolchain/platforms/supported/linux_cluster.platform @@ -14,21 +14,11 @@ # ## + # -# Define the packages this platform needs -PACKAGES=( -load:dealii-prepare +# Define the additional packages for this platform. +PACKAGES=" once:zlib once:bzip2 once:boost -once:opencascade -once:parmetis -once:superlu_dist -once:hdf5 -once:p4est -once:trilinos -once:petsc -once:slepc -dealii -) - +${PACKAGES}" diff --git a/deal.II-toolchain/platforms/supported/opensuse12.platform b/deal.II-toolchain/platforms/supported/opensuse12.platform index abde052..a8c4703 100644 --- a/deal.II-toolchain/platforms/supported/opensuse12.platform +++ b/deal.II-toolchain/platforms/supported/opensuse12.platform @@ -20,18 +20,5 @@ ## # -# Define the packages this platform needs -PACKAGES=( -load:dealii-prepare -#once:boost -once:opencascade -once:parmetis -once:superlu_dist -once:hdf5 -once:p4est -once:trilinos -once:petsc -once:slepc -dealii -) - +# Define the additional packages for this platform. +#PACKAGES="once:cmake ${PACKAGES}" diff --git a/deal.II-toolchain/platforms/supported/opensuse13.platform b/deal.II-toolchain/platforms/supported/opensuse13.platform index ad8f52f..4d06c2d 100644 --- a/deal.II-toolchain/platforms/supported/opensuse13.platform +++ b/deal.II-toolchain/platforms/supported/opensuse13.platform @@ -15,18 +15,5 @@ ## # -# Define the packages this platform needs -PACKAGES=( -load:dealii-prepare -#once:boost -once:opencascade -once:parmetis -once:superlu_dist -once:hdf5 -once:p4est -once:trilinos -once:petsc -once:slepc -dealii -) - +# Define the additional packages for this platform. +#PACKAGES="once:cmake ${PACKAGES}" diff --git a/deal.II-toolchain/platforms/supported/rhel7.platform b/deal.II-toolchain/platforms/supported/rhel7.platform index 3900fe8..1527a4c 100644 --- a/deal.II-toolchain/platforms/supported/rhel7.platform +++ b/deal.II-toolchain/platforms/supported/rhel7.platform @@ -19,16 +19,5 @@ ## # -# Define the packages this platform needs -PACKAGES=( -load:dealii-prepare -once:opencascade -once:parmetis -once:superlu_dist -once:hdf5 -once:p4est -once:trilinos -once:petsc -once:slepc -dealii -) +# Define the additional packages for this platform. +#PACKAGES="once:cmake ${PACKAGES}" diff --git a/deal.II-toolchain/platforms/supported/ubuntu12.platform b/deal.II-toolchain/platforms/supported/ubuntu12.platform index 16ebbc4..c4a380a 100644 --- a/deal.II-toolchain/platforms/supported/ubuntu12.platform +++ b/deal.II-toolchain/platforms/supported/ubuntu12.platform @@ -1,6 +1,5 @@ # ubuntu 12 -# -# +# # This build script assumes that you have several packages already # installed via ubuntu's apt-get using the following commands: # @@ -8,33 +7,21 @@ # openmpi-bin openmpi-common libopenmpi-dev cmake subversion \ # git libblas-dev liblapack-dev libblas3gf liblapack3gf splint \ # tcl tcl-dev libsuitesparse-dev libtool libboost-all-dev qt4-dev-tools -# +# # Then reboot. -# +# # Afterwards, you should set your compilers safely: # > export CC=mpicc; export CXX=mpicxx; export FC=mpif90; export FF=mpif77 # and rerun candi again. -# +# # To compile deal.II applications, you need to set the following variables # > export DEAL_II_DIR=${INSTALL_PATH} (see below for your settings) # > export PATH=$DEAL_II_DIR/bin:$PATH ## # -# Define the packages this platform needs -PACKAGES=( -once:cmake -load:dealii-prepare -once:opencascade -once:parmetis -once:superlu_dist -once:hdf5 -once:p4est -once:trilinos -once:petsc -once:slepc -dealii -) +# Define the additional packages for this platform. +PACKAGES="once:cmake ${PACKAGES}" # The default compiler on ubuntu12 does not support Trilinos 12. # Anyhow, the user can decide to use Trilinos 11 or 12, if the @@ -44,4 +31,3 @@ dealii if [ ${TRILINOS_MAJOR_VERSION} == "AUTO" ]; then TRILINOS_MAJOR_VERSION=11 fi - diff --git a/deal.II-toolchain/platforms/supported/ubuntu14.platform b/deal.II-toolchain/platforms/supported/ubuntu14.platform index c4abc03..c09cc62 100644 --- a/deal.II-toolchain/platforms/supported/ubuntu14.platform +++ b/deal.II-toolchain/platforms/supported/ubuntu14.platform @@ -1,6 +1,5 @@ # ubuntu 14 -# -# +# # This build script assumes that you have several packages already # installed via ubuntu's apt-get using the following commands: # @@ -9,24 +8,13 @@ # git libblas-dev liblapack-dev libblas3gf liblapack3gf splint \ # tcl tcl-dev environment-modules libsuitesparse-dev \ # libtool libboost-all-dev qt4-dev-tools -# +# # Then reboot and run candi again. ## # -# Define the packages this platform needs -PACKAGES=( -load:dealii-prepare -once:opencascade -once:parmetis -once:superlu_dist -once:hdf5 -once:p4est -once:trilinos -once:petsc -once:slepc -dealii -) +# Define the additional packages for this platform. +#PACKAGES="once:cmake ${PACKAGES}" # The default compiler on ubuntu14 does not support Trilinos 12 # together with deal.II v8.3.0. @@ -39,4 +27,3 @@ dealii if [ ${STABLE_BUILD} == "true" ] && [ ${DEAL_II_VERSION} == "v8.3.0" ] && [ ${TRILINOS_MAJOR_VERSION} == "AUTO" ]; then TRILINOS_MAJOR_VERSION=11 fi - diff --git a/deal.II-toolchain/platforms/supported/ubuntu15.platform b/deal.II-toolchain/platforms/supported/ubuntu15.platform index ce0ce4a..bb207da 100644 --- a/deal.II-toolchain/platforms/supported/ubuntu15.platform +++ b/deal.II-toolchain/platforms/supported/ubuntu15.platform @@ -1,25 +1,17 @@ # ubuntu 15 -# +# # This build script assumes that you have several packages already # installed via ubuntu's apt-get using the following commands: # -# > sudo apt-get install build-essential automake autoconf gfortran openmpi-bin openmpi-common libopenmpi-dev cmake subversion git libblas-dev liblapack-dev libblas3gf liblapack3gf splint tcl tcl-dev environment-modules libsuitesparse-dev libtool libboost-all-dev qt4-dev-tools -# +# > sudo apt-get install build-essential automake autoconf gfortran \ +# openmpi-bin openmpi-common libopenmpi-dev cmake subversion git \ +# libblas-dev liblapack-dev libblas3gf liblapack3gf splint tcl tcl-dev \ +# environment-modules libsuitesparse-dev libtool libboost-all-dev \ +# qt4-dev-tools +# # Then reboot and run candi again. ## # -# Define the packages this platform needs -PACKAGES=( -load:dealii-prepare -once:opencascade -once:parmetis -once:superlu_dist -once:hdf5 -once:p4est -once:trilinos -once:petsc -once:slepc -dealii -) - +# Define the additional packages for this platform. +#PACKAGES="once:cmake ${PACKAGES}" -- 2.39.5