From: Fabian Castelli Date: Tue, 6 Jul 2021 11:59:56 +0000 (+0200) Subject: Unify and update Ubuntu platform files X-Git-Tag: v9.3.3-r1~1^2~18^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=84ac1c560cac6f8e0aa157d969a24ad81febc9a8;p=candi.git Unify and update Ubuntu platform files --- diff --git a/candi.sh b/candi.sh index 1904c1e..55d8436 100755 --- a/candi.sh +++ b/candi.sh @@ -633,7 +633,7 @@ guess_platform() { echo debian${OS_MAJOR_VER} elif [ "$OS_ID" == "ubuntu" ]; then - echo ubuntu${OS_MAJOR_VER} + echo ubuntu elif [ "${OS_NAME}" == "openSUSE Leap" ]; then echo opensuse15 diff --git a/deal.II-toolchain/platforms/supported/ubuntu20.platform b/deal.II-toolchain/platforms/supported/ubuntu.platform similarity index 68% rename from deal.II-toolchain/platforms/supported/ubuntu20.platform rename to deal.II-toolchain/platforms/supported/ubuntu.platform index b474e83..3213bcb 100644 --- a/deal.II-toolchain/platforms/supported/ubuntu20.platform +++ b/deal.II-toolchain/platforms/supported/ubuntu.platform @@ -1,9 +1,9 @@ -# Ubuntu 20.04 +# Ubuntu # # This build script assumes that you have several packages already # installed via ubuntu's apt-get using the following commands: # -# > sudo apt-get install lsb-release git subversion wget bc libgmp-dev \ +# sudo apt-get install lsb-release git subversion wget bc libgmp-dev \ # build-essential autoconf automake cmake libtool gfortran python \ # libboost-all-dev zlib1g-dev \ # openmpi-bin openmpi-common libopenmpi-dev \ @@ -11,10 +11,14 @@ # # Then run candi again. # +# If the default compiler is older than the hardware generation, a newer +# compiler version is necessary to use native optimizations. +# For example, to update the GNU Compiler Collection from the default v9 to +# v10, install the new compilers # -# To use native compiler optimizations on Intel's 11th-Gen (TigerLake) -# you may need to use the GNU Compiler collection Version 10 or newer. -# To priorize v10 over the default v9, do +# sudo apt-get install gcc-10 g++-10 gfortran-10 +# +# and update the symbolic links to gcc, g++ and gfortran by # # update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 10 \ # update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 20 @@ -27,6 +31,3 @@ # # with super-user privileges and invoke an operating system update. ## - -# Define the additional packages for this platform. -#PACKAGES="once:cmake ${PACKAGES}" diff --git a/deal.II-toolchain/platforms/supported/ubuntu18.platform b/deal.II-toolchain/platforms/supported/ubuntu18.platform deleted file mode 100644 index 454824a..0000000 --- a/deal.II-toolchain/platforms/supported/ubuntu18.platform +++ /dev/null @@ -1,19 +0,0 @@ -# ubuntu 18 LTS -# -# 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 lsb-release wget \ -# bc python automake autoconf gfortran \ -# openmpi-bin openmpi-common libopenmpi-dev cmake subversion git \ -# libblas-dev liblapack-dev libblas3 liblapack3 \ -# libsuitesparse-dev libtool libboost-all-dev zlib1g-dev \ -# splint tcl tcl-dev environment-modules qt4-dev-tools -# -# Then run candi again. -## - -# -# Define the additional packages for this platform. -#PACKAGES="once:cmake ${PACKAGES}" -