From: Fabian Castelli Date: Tue, 6 Jul 2021 12:25:04 +0000 (+0200) Subject: Minor updates on platform files X-Git-Tag: v9.3.3-r1~1^2~16^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F220%2Fhead;p=candi.git Minor updates on platform files --- diff --git a/deal.II-toolchain/platforms/contributed/cray.platform b/deal.II-toolchain/platforms/contributed/cray.platform index b078096..35fc230 100644 --- a/deal.II-toolchain/platforms/contributed/cray.platform +++ b/deal.II-toolchain/platforms/contributed/cray.platform @@ -18,28 +18,27 @@ # export CXX=CC # export FC=ftn # export FF=ftn -# +# ## PACKAGES="load:dealii-prepare once:cmake once:p4est once:trilinos once:parmetis once:petsc dealii" -TRILINOS_CONFOPTS=" \ --D BUILD_SHARED_LIBS=ON \ --D BLAS_LIBRARY_DIRS=$CRAY_LIBSCI_PREFIX_DIR/lib \ --D BLAS_INCLUDE_DIRS=$CRAY_LIBSCI_PREFIX_DIR/include \ --D BLAS_LIBRARY_NAMES=sci_gnu \ --D LAPACK_LIBRARY_DIRS=$CRAY_LIBSCI_PREFIX_DIR/lib \ --D LAPACK_INCLUDE_DIRS=$CRAY_LIBSCI_PREFIX_DIR/include \ --D LAPACK_LIBRARY_NAMES=sci_gnu" - -DEAL_II_CONFOPTS=" \ --D DEAL_II_COMPILER_HAS_FUSE_LD_GOLD=OFF \ --D DEAL_II_WITH_LAPACK=OFF \ --D DEAL_II_WITH_BLAS=OFF \ --D DEAL_II_WITH_GSL=OFF \ --D DEAL_II_WITH_BZIP2=OFF \ --D DEAL_II_FORCE_BUNDLED_BOOST=ON \ --D DEAL_II_WITH_UMFPACK=OFF \ --D MPI_INCLUDE_PATH=$MPICH_DIR/include \ --D MPI_CXX_LIBRARIES=\"$MPICH_DIR/lib/libmpichcxx.so;$MPICH_DIR/lib/libmpich.so\" " +TRILINOS_CONFOPTS="\ + -D BUILD_SHARED_LIBS:BOOL=ON \ + -D BLAS_LIBRARY_DIRS=${CRAY_LIBSCI_PREFIX_DIR}/lib \ + -D BLAS_INCLUDE_DIRS=${CRAY_LIBSCI_PREFIX_DIR}/include \ + -D BLAS_LIBRARY_NAMES=sci_gnu \ + -D LAPACK_LIBRARY_DIRS=${CRAY_LIBSCI_PREFIX_DIR}/lib \ + -D LAPACK_INCLUDE_DIRS=${CRAY_LIBSCI_PREFIX_DIR}/include \ + -D LAPACK_LIBRARY_NAMES=sci_gnu" +DEAL_II_CONFOPTS="\ + -D DEAL_II_COMPILER_HAS_FUSE_LD_GOLD:BOOL=OFF \ + -D DEAL_II_WITH_LAPACK:BOOL=OFF \ + -D DEAL_II_WITH_BLAS:BOOL=OFF \ + -D DEAL_II_WITH_GSL:BOOL=OFF \ + -D DEAL_II_WITH_BZIP2:BOOL=OFF \ + -D DEAL_II_FORCE_BUNDLED_BOOST:BOOL=ON \ + -D DEAL_II_WITH_UMFPACK:BOOL=OFF \ + -D MPI_INCLUDE_PATH=${MPICH_DIR}/include \ + -D MPI_CXX_LIBRARIES=\"${MPICH_DIR}/lib/libmpichcxx.so;${MPICH_DIR}/lib/libmpich.so\" " diff --git a/deal.II-toolchain/platforms/supported/arch.platform b/deal.II-toolchain/platforms/supported/arch.platform index 3df0229..1d2c519 100644 --- a/deal.II-toolchain/platforms/supported/arch.platform +++ b/deal.II-toolchain/platforms/supported/arch.platform @@ -3,14 +3,13 @@ # This build script assumes that you have several packages already # installed via pacman using the following command: # -# $ sudo pacman -Syu core/gcc extra/openmpi extra/cmake \ -# core/make core/awk core/which core/sed core/gcc-fortran \ -# core/grep core/file core/binutils core/diffutils extra/git \ -# extra/lapack +# > sudo pacman -Syu core/gcc extra/openmpi extra/cmake \ +# core/make core/awk core/which core/sed core/gcc-fortran \ +# core/grep core/file core/binutils core/diffutils extra/git \ +# extra/lapack # ## # # Define the additional packages for this platform. #PACKAGES="once:cmake ${PACKAGES}" - diff --git a/deal.II-toolchain/platforms/supported/centos7.platform b/deal.II-toolchain/platforms/supported/centos7.platform index 2f97bf9..4f16b61 100644 --- a/deal.II-toolchain/platforms/supported/centos7.platform +++ b/deal.II-toolchain/platforms/supported/centos7.platform @@ -3,33 +3,38 @@ # This build script assumes that you have several packages already # installed via CentOS's yum using the following command: # -# sudo yum install patch svn git wget \ -# @development-tools gcc-c++ cmake \ -# centos-release-scl devtoolset-9 \ -# openmpi openmpi-devel \ -# patch \ -# libtool libtool-ltdl libtool-ltdl-devel \ -# lua lua-devel \ -# blas blas-devel lapack lapack-devel \ -# doxygen graphviz graphviz-devel qt-devel \ -# gmp-devel -# +# > sudo yum install patch svn git wget \ +# @development-tools gcc-c++ cmake \ +# centos-release-scl devtoolset-9 \ +# openmpi openmpi-devel \ +# patch \ +# libtool libtool-ltdl libtool-ltdl-devel \ +# lua lua-devel \ +# blas blas-devel lapack lapack-devel \ +# doxygen graphviz graphviz-devel qt-devel \ +# gmp-devel +# # Be sure to switch to the recent compilers with -# $ scl enable devtoolset-9 bash +# +# > scl enable devtoolset-9 bash +# # Please load the 'openmpi' compiler with -# $ module load mpi/openmpi-x86_64 +# +# > module load mpi/openmpi-x86_64 +# # and then set the compiler enviroment variables to -# $ export CC=mpicc; export CXX=mpicxx; export FC=mpif90; export FF=mpif77 +# +# > export CC=mpicc; export CXX=mpicxx; export FC=mpif90; export FF=mpif77 +# # before you continue! ## -# on centos 7 the candi installed parmetis 4.0.3 is not recognized correctly +# on CentOS 7 the candi installed parmetis 4.0.3 is not recognized correctly # for trilinos 12-10-1. We force to assume parmetis version 4.0.3. TRILINOS_PARMETIS_CONFOPTS="\ ${TRILINOS_PARMETIS_CONFOPTS} \ - -D HAVE_PARMETIS_VERSION_4_0_3=ON" + -D HAVE_PARMETIS_VERSION_4_0_3:BOOL=ON" # # Define the additional packages for this platform. PACKAGES="once:cmake ${PACKAGES}" - diff --git a/deal.II-toolchain/platforms/supported/debian.platform b/deal.II-toolchain/platforms/supported/debian.platform index d1c3072..a5f9ccf 100644 --- a/deal.II-toolchain/platforms/supported/debian.platform +++ b/deal.II-toolchain/platforms/supported/debian.platform @@ -16,9 +16,8 @@ # for trilinos 12-10-1. We force to assume parmetis version 4.0.3. TRILINOS_PARMETIS_CONFOPTS="\ ${TRILINOS_PARMETIS_CONFOPTS} \ - -D HAVE_PARMETIS_VERSION_4_0_3=ON" + -D HAVE_PARMETIS_VERSION_4_0_3:BOOL=ON" # # Define the additional packages for this platform. #PACKAGES="once:cmake ${PACKAGES}" - diff --git a/deal.II-toolchain/platforms/supported/fedora.platform b/deal.II-toolchain/platforms/supported/fedora.platform index 7960dc3..ef570aa 100644 --- a/deal.II-toolchain/platforms/supported/fedora.platform +++ b/deal.II-toolchain/platforms/supported/fedora.platform @@ -3,17 +3,21 @@ # This build script assumes that you have several packages already # installed via Fedora's dnf using the following command: # -# $ sudo dnf install \ -# @development-tools gcc-c++ cmake patch libtool lua lua-devel \ -# doxygen graphviz graphviz-devel \ -# blas blas-devel lapack lapack-devel \ -# openmpi openmpi-devel \ -# metis metis-devel -# +# > sudo dnf install \ +# @development-tools gcc-c++ cmake patch libtool lua lua-devel \ +# doxygen graphviz graphviz-devel \ +# blas blas-devel lapack lapack-devel \ +# openmpi openmpi-devel \ +# metis metis-devel +# # Please load the 'openmpi' compiler with -# $ module load mpi/openmpi-x86_64 +# +# > module load mpi/openmpi-x86_64 +# # and then set the compiler enviroment variables to -# $ export CC=mpicc; export CXX=mpicxx; export FC=mpif90; export FF=mpif77 +# +# > export CC=mpicc; export CXX=mpicxx; export FC=mpif90; export FF=mpif77 +# # before you continue! ## diff --git a/deal.II-toolchain/platforms/supported/linux_cluster.platform b/deal.II-toolchain/platforms/supported/linux_cluster.platform index b1ebfd7..60b11d5 100644 --- a/deal.II-toolchain/platforms/supported/linux_cluster.platform +++ b/deal.II-toolchain/platforms/supported/linux_cluster.platform @@ -1,21 +1,24 @@ # linux -# +# # This build script assumes that you have at least the packages: +# # automake, autoconf, cmake, gcc, openmpi, blas, lapack, and # git, cmake, zlib and bzip2 +# # installed. -# +# # The packages +# # git, cmake, zlib and bzip2 +# # can be installed with candi by selecting them in the candi.cfg file. -# +# # Please note that this platform description is only a hint for # dependencies and cannot ensure a successful build. Look into other # platform descriptions for further dependencies. -# +# ## # # Define the additional packages for this platform. #PACKAGES="once:cmake ${PACKAGES}" - diff --git a/deal.II-toolchain/platforms/supported/macos_elcapitan.platform b/deal.II-toolchain/platforms/supported/macos_elcapitan.platform index 62bb54b..b56781a 100644 --- a/deal.II-toolchain/platforms/supported/macos_elcapitan.platform +++ b/deal.II-toolchain/platforms/supported/macos_elcapitan.platform @@ -4,7 +4,7 @@ # - a recent version of xcode with command line tools # - openmpi installed using homebrew and # - cmake -# +# # Detailed Installation Notes: # - install Xcode from AppStore, open it and accept the license. # - Open Terminal, and install Xcode command line tools via @@ -12,27 +12,26 @@ # and then run # $ xcodebuild -license # to accept the license. -# +# # Install Homebrew in a Terminal via # $ /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" -# +# # Install the following via Homebrew # $ brew install cmake # $ brew install openmpi -# +# # (Optional) Install the following via Homebrew # $ brew install wget # $ brew install gnuplot -# +# # $ brew install bash # and follow the shell activation notes. -# +# # $ brew install modules # and follow the activation notes to use the modulefile configuration. -# +# ## # # Define the additional packages for this platform. #PACKAGES="once:cmake ${PACKAGES}" - diff --git a/deal.II-toolchain/platforms/supported/macos_highsierra.platform b/deal.II-toolchain/platforms/supported/macos_highsierra.platform index 0d54c34..d768911 100644 --- a/deal.II-toolchain/platforms/supported/macos_highsierra.platform +++ b/deal.II-toolchain/platforms/supported/macos_highsierra.platform @@ -4,7 +4,7 @@ # - a recent version of xcode with command line tools # - openmpi installed using homebrew and # - cmake -# +# # Detailed Installation Notes: # - install Xcode from AppStore, open it and accept the license. # - Open Terminal, and install Xcode command line tools via @@ -12,23 +12,22 @@ # and then run # $ xcodebuild -license # to accept the license. -# +# # Install Homebrew in a Terminal via # $ /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" -# +# # Install the following via Homebrew # $ brew install cmake # $ brew install openmpi -# +# # (Optional) Install the following via Homebrew # $ brew install wget # $ brew install gnuplot -# +# # $ brew install bash # and follow the shell activation notes. -# +# # $ brew install modules # and follow the activation notes to use the modulefile configuration. -# +# ## - diff --git a/deal.II-toolchain/platforms/supported/macos_sierra.platform b/deal.II-toolchain/platforms/supported/macos_sierra.platform index 1b14dd3..202a98d 100644 --- a/deal.II-toolchain/platforms/supported/macos_sierra.platform +++ b/deal.II-toolchain/platforms/supported/macos_sierra.platform @@ -4,7 +4,7 @@ # - a recent version of xcode with command line tools # - openmpi installed using homebrew and # - cmake -# +# # Detailed Installation Notes: # - install Xcode from AppStore, open it and accept the license. # - Open Terminal, and install Xcode command line tools via @@ -12,23 +12,22 @@ # and then run # $ xcodebuild -license # to accept the license. -# +# # Install Homebrew in a Terminal via # $ /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" -# +# # Install the following via Homebrew # $ brew install cmake # $ brew install openmpi --c++11 --with-mpi-thread-multiple -# +# # (Optional) Install the following via Homebrew # $ brew install wget # $ brew install gnuplot -# +# # $ brew install bash # and follow the shell activation notes. -# +# # $ brew install modules # and follow the activation notes to use the modulefile configuration. -# +# ## - diff --git a/deal.II-toolchain/platforms/supported/rhel7.platform b/deal.II-toolchain/platforms/supported/rhel7.platform index 379c2ee..a2c6377 100644 --- a/deal.II-toolchain/platforms/supported/rhel7.platform +++ b/deal.II-toolchain/platforms/supported/rhel7.platform @@ -3,28 +3,31 @@ # This build script assumes that you have several packages already # installed via RHEL's yum using the following command: # -# sudo yum install svn git wget \ -# @development-tools gcc-c++ cmake \ -# patch \ -# libtool libtool-ltdl libtool-ltdl-devel \ -# lua lua-devel \ -# blas blas-devel lapack lapack-devel \ -# doxygen graphviz graphviz-devel qt-devel -# +# > sudo yum install svn git wget \ +# @development-tools gcc-c++ cmake \ +# patch \ +# libtool libtool-ltdl libtool-ltdl-devel \ +# lua lua-devel \ +# blas blas-devel lapack lapack-devel \ +# doxygen graphviz graphviz-devel qt-devel +# # Please load the 'openmpi' compiler with -# $ module load mpi/openmpi-x86_64 +# +# > module load mpi/openmpi-x86_64 +# # and then set the compiler enviroment variables to -# $ export CC=mpicc; export CXX=mpicxx; export FC=mpif90; export FF=mpif77 +# +# > export CC=mpicc; export CXX=mpicxx; export FC=mpif90; export FF=mpif77 +# # before you continue! ## -# on rhel 7 the candi installed parmetis 4.0.3 is not recognized correctly +# On RHEL 7 the candi installed parmetis 4.0.3 is not recognized correctly # for trilinos 12-10-1. We force to assume parmetis version 4.0.3. TRILINOS_PARMETIS_CONFOPTS="\ ${TRILINOS_PARMETIS_CONFOPTS} \ - -D HAVE_PARMETIS_VERSION_4_0_3=ON" + -D HAVE_PARMETIS_VERSION_4_0_3:BOOL=ON" # # Define the additional packages for this platform. #PACKAGES="once:cmake ${PACKAGES}" -