From e138eb0074e5abb5788ba0296b5943ac95fa73bc Mon Sep 17 00:00:00 2001 From: Fabian Castelli Date: Fri, 28 May 2021 12:46:58 +0200 Subject: [PATCH] Rename to DEAL_II_CONFOPTS --- .github/workflows/main.yml | 6 +++--- candi.cfg | 2 +- .../packages/dealii-prepare.package | 8 ++++---- deal.II-toolchain/packages/dealii.package | 16 ++++++++-------- deal.II-toolchain/packages/openblas.package | 2 +- .../platforms/contributed/cray.platform | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8e36095..bbd98fb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,7 +19,7 @@ jobs: cmake --version - name: build run: | - echo 'DEAL_CONFOPTS="-D CMAKE_BUILD_TYPE=Debug"' >> candi.cfg + echo 'DEAL_II_CONFOPTS="-D CMAKE_BUILD_TYPE=Debug"' >> candi.cfg ./candi.sh -j 2 --packages="once:p4est dealii" cd ~/deal.ii-candi/tmp/build/deal.II-* && cat detailed.log && make test @@ -61,7 +61,7 @@ jobs: cmake --version - name: build run: | - echo 'DEAL_CONFOPTS="-D CMAKE_BUILD_TYPE=Debug"' >> candi.cfg + echo 'DEAL_II_CONFOPTS="-D CMAKE_BUILD_TYPE=Debug"' >> candi.cfg ./candi.sh -j 2 --packages="dealii" cd ~/deal.ii-candi/tmp/build/deal.II-* && cat detailed.log && make test @@ -87,6 +87,6 @@ jobs: export OMPI_CXX=g++-9 export OMPI_CC=gcc-9 export OMPI_FC=gfortran-9 - echo 'DEAL_CONFOPTS="-D CMAKE_BUILD_TYPE=Debug"' >> candi.cfg + echo 'DEAL_II_CONFOPTS="-D CMAKE_BUILD_TYPE=Debug"' >> candi.cfg ./candi.sh -j 2 --packages="once:p4est once:petsc dealii" cd ~/deal.ii-candi/tmp/build/deal.II-* && cat detailed.log && make test diff --git a/candi.cfg b/candi.cfg index b9e9dab..ee969b0 100644 --- a/candi.cfg +++ b/candi.cfg @@ -28,7 +28,7 @@ MIRROR="https://tjhei.info/candi-mirror/ https://cecas.clemson.edu/dealii/mirror ######################################################################### # Choose additional configuration and components of deal.II -DEAL_CONFOPTS="" +DEAL_II_CONFOPTS="" # Option {ON|OFF}: Enable machine-specific optimizations (e.g. -march=native)? NATIVE_OPTIMIZATIONS=OFF diff --git a/deal.II-toolchain/packages/dealii-prepare.package b/deal.II-toolchain/packages/dealii-prepare.package index 9dd2d45..e03bcff 100644 --- a/deal.II-toolchain/packages/dealii-prepare.package +++ b/deal.II-toolchain/packages/dealii-prepare.package @@ -2,9 +2,9 @@ NAME=dealii-prepare BUILDCHAIN=ignore ################################################################################ -# Loop over the options in DEAL_CONFOPTS and if the package is turned off, add -# it to the PACKAGES_OFF list. -for option in ${DEAL_CONFOPTS[@]}; do +# Loop over the options in DEAL_II_CONFOPTS and if the package is turned off, +# add it to the PACKAGES_OFF list. +for option in ${DEAL_II_CONFOPTS[@]}; do case ${option} in *DEAL_II_WITH*:BOOL=OFF) PACKAGE_NAME=${option##*WITH_}; @@ -20,7 +20,7 @@ PACKAGES_OFF=`echo "$PACKAGES_OFF" | tr '[:upper:]' '[:lower:]'` if [ ! -z "${PACKAGES_OFF}" ]; then cecho ${WARN} "deal.II: forcing package skip for: ${PACKAGES_OFF}" - cecho ${INFO} "This is coming from your personal DEAL_CONFOPTS settings!" + cecho ${INFO} "This is coming from your personal DEAL_II_CONFOPTS settings!" echo cecho ${GOOD} "Please confirm this behaviour by pressing enter..." read diff --git a/deal.II-toolchain/packages/dealii.package b/deal.II-toolchain/packages/dealii.package index 2f24ef5..0ea6e4d 100644 --- a/deal.II-toolchain/packages/dealii.package +++ b/deal.II-toolchain/packages/dealii.package @@ -43,7 +43,7 @@ fi # add the user-specified flags at the end (so things can be overriden): CONFOPTS="${CONFOPTS} \ -${DEAL_CONFOPTS}" +${DEAL_II_CONFOPTS}" ################################################################################ @@ -89,7 +89,7 @@ fi # metis if [[ ${PACKAGES_OFF} =~ 'metis' ]]; then - # Disable METIS for deal.II, if a special DEAL_CONFOPTS together with + # Disable METIS for deal.II, if a special DEAL_II_CONFOPTS together with # the dealii-prepare loop forces metis to be off if [ ! -z "${METIS_DIR}" ]; then cecho ${INFO} "deal.II: unset METIS_DIR due to forced DEAL_II_WITH_METIS:BOOL=OFF option" @@ -115,7 +115,7 @@ fi # p4est if [[ ${PACKAGES_OFF} =~ 'p4est' ]]; then - # Disable p4est for deal.II, if a special DEAL_CONFOPTS together with + # Disable p4est for deal.II, if a special DEAL_II_CONFOPTS together with # the dealii-prepare loop forces p4est to be off if [ ! -z "${P4EST_DIR}" ]; then cecho ${INFO} "deal.II: unset P4EST_DIR due to forced DEAL_II_WITH_P4EST:BOOL=OFF option" @@ -133,7 +133,7 @@ fi # hdf5 if [[ ${PACKAGES_OFF} =~ 'hdf5' ]]; then - # Disable hdf5 for deal.II, if a special DEAL_CONFOPTS together with + # Disable hdf5 for deal.II, if a special DEAL_II_CONFOPTS together with # the dealii-prepare loop forces hdf5 to be off if [ ! -z "${HDF5_DIR}" ]; then cecho ${INFO} "deal.II: unset HDF5_DIR due to forced DEAL_II_WITH_HDF5:BOOL=OFF option" @@ -151,7 +151,7 @@ fi # trilinos if [[ ${PACKAGES_OFF} =~ 'trilinos' ]]; then - # Disable trilinos for deal.II, if a special DEAL_CONFOPTS together with + # Disable trilinos for deal.II, if a special DEAL_II_CONFOPTS together with # the dealii-prepare loop forces trilinos to be off if [ ! -z "${TRILINOS_DIR}" ]; then cecho ${INFO} "deal.II: unset TRILINOS_DIR due to forced DEAL_II_WITH_TRILINOS:BOOL=OFF option" @@ -169,7 +169,7 @@ fi # petsc if [[ ${PACKAGES_OFF} =~ 'petsc' ]]; then - # Disable petsc for deal.II, if a special DEAL_CONFOPTS together with + # Disable petsc for deal.II, if a special DEAL_II_CONFOPTS together with # the dealii-prepare loop forces petsc to be off if [ ! -z "${PETSC_DIR}" ]; then cecho ${INFO} "deal.II: unset PETSC_DIR due to forced DEAL_II_WITH_PETSC:BOOL=OFF option" @@ -187,7 +187,7 @@ fi # slepc if [[ ${PACKAGES_OFF} =~ 'slepc' ]]; then - # Disable slepc for deal.II, if a special DEAL_CONFOPTS together with + # Disable slepc for deal.II, if a special DEAL_II_CONFOPTS together with # the dealii-prepare loop forces slepc to be off if [ ! -z "${SLEPC_DIR}" ]; then cecho ${INFO} "deal.II: unset SLEPC_DIR due to forced DEAL_II_WITH_SLEPC:BOOL=OFF option" @@ -205,7 +205,7 @@ fi # opencascade if [[ ${PACKAGES_OFF} =~ 'opencascade' ]]; then - # Disable OPENCASCADE for deal.II, if a special DEAL_CONFOPTS together with + # Disable OPENCASCADE for deal.II, if a special DEAL_II_CONFOPTS together with # the dealii-prepare loop forces opencascade to be off if [ ! -z "${OPENCASCADE_DIR}" ]; then cecho ${INFO} "deal.II: unset OPENCASCADE_DIR due to forced DEAL_II_WITH_OPENCASCADE:BOOL=OFF option" diff --git a/deal.II-toolchain/packages/openblas.package b/deal.II-toolchain/packages/openblas.package index dad0fbd..00a343e 100644 --- a/deal.II-toolchain/packages/openblas.package +++ b/deal.II-toolchain/packages/openblas.package @@ -33,7 +33,7 @@ package_specific_register () { export BLAS_LIB=${INSTALL_PATH}/lib/libopenblas.${LDSUFFIX} # older cmake (for example 3.5) does not detect openblas by default so # we force detection by adding to the deal.II configure line: - export DEAL_CONFOPTS="-D LAPACK_FOUND=true -D LAPACK_LIBRARIES=${INSTALL_PATH}/lib/libopenblas.${LDSUFFIX} ${DEAL_CONFOPTS}" + export DEAL_II_CONFOPTS="-D LAPACK_FOUND=true -D LAPACK_LIBRARIES=${INSTALL_PATH}/lib/libopenblas.${LDSUFFIX} ${DEAL_II_CONFOPTS}" } package_specific_conf () { diff --git a/deal.II-toolchain/platforms/contributed/cray.platform b/deal.II-toolchain/platforms/contributed/cray.platform index 5cdfb76..b078096 100644 --- a/deal.II-toolchain/platforms/contributed/cray.platform +++ b/deal.II-toolchain/platforms/contributed/cray.platform @@ -32,7 +32,7 @@ TRILINOS_CONFOPTS=" \ -D LAPACK_INCLUDE_DIRS=$CRAY_LIBSCI_PREFIX_DIR/include \ -D LAPACK_LIBRARY_NAMES=sci_gnu" -DEAL_CONFOPTS=" \ +DEAL_II_CONFOPTS=" \ -D DEAL_II_COMPILER_HAS_FUSE_LD_GOLD=OFF \ -D DEAL_II_WITH_LAPACK=OFF \ -D DEAL_II_WITH_BLAS=OFF \ -- 2.39.5