Toolchain: Remove options for installing development versions

tools/toolchain/install_cp2k_toolchain.sh

@@ -119,14 +119,6 @@ The --enable-FEATURE options follow the rules:
   --enable-FEATURE        The option keyword alone is equivalent to
                           --enable-FEATURE=yes
 
-  --enable-gcc-master     If you are installing GCC using this script
-                          this option forces the master development version
-                          to be installed.
-                          Default = no
-  --enable-libxsmm-master If you are installing libxsmm using this script
-                          this option forces the master development version
-                          to be installed.
-                          Default = no
   --enable-cuda           Turn on GPU (CUDA) support (can be combined
                           with --enable-opencl).
                           Default = no
@@ -338,8 +330,6 @@ fi
 dry_run="__FALSE__"
 no_arch_files="__FALSE__"
 enable_tsan="__FALSE__"
-enable_gcc_master="__FALSE__"
-enable_libxsmm_master="__FALSE__"
 enable_opencl="__FALSE__"
 enable_cuda="__FALSE__"
 enable_hip="__FALSE__"
@@ -477,20 +467,6 @@ while [ $# -ge 1 ]; do
         exit 1
       fi
       ;;
-    --enable-gcc-master*)
-      enable_gcc_master=$(read_enable $1)
-      if [ "${enable_gcc_master}" = "__INVALID__" ]; then
-        report_error "invalid value for --enable-gcc-master, please use yes or no"
-        exit 1
-      fi
-      ;;
-    --enable-libxsmm-master*)
-      enable_libxsmm_master=$(read_enable $1)
-      if [ "${enable_libxsmm_master}" = "__INVALID__" ]; then
-        report_error "invalid value for --enable-libxsmm-master, please use yes or no"
-        exit 1
-      fi
-      ;;
     --enable-cuda*)
       enable_cuda=$(read_enable $1)
       if [ $enable_cuda = "__INVALID__" ]; then
@@ -646,8 +622,6 @@ export ENABLE_CUDA="${enable_cuda}"
 export ENABLE_HIP="${enable_hip}"
 export ENABLE_OPENCL="${enable_opencl}"
 export ENABLE_CRAY="${enable_cray}"
-[ "${enable_gcc_master}" = "__TRUE__" ] && export gcc_ver="master"
-[ "${enable_libxsmm_master}" = "__TRUE__" ] && export libxsmm_ver="master"
 
 # ------------------------------------------------------------------------
 # Check and solve known conflicts before installations proceed

tools/toolchain/scripts/stage0/install_gcc.sh

@@ -31,19 +31,15 @@ case "${with_gcc}" in
     if verify_checksums "${install_lock_file}"; then
       echo "gcc-${gcc_ver} is already installed, skipping it."
     else
-      if [ "${gcc_ver}" = "master" ]; then
-        [ -d gcc-master ] && rm -rf gcc-master
-        svn checkout svn://gcc.gnu.org/svn/gcc/trunk gcc-master > svn-gcc.log 2>&1 || tail -n ${LOG_LINES} svn-gcc.log
+      if [ -f gcc-${gcc_ver}.tar.gz ]; then
+        echo "gcc-${gcc_ver}.tar.gz is found"
       else
-        if [ -f gcc-${gcc_ver}.tar.gz ]; then
-          echo "gcc-${gcc_ver}.tar.gz is found"
-        else
-          download_pkg ${DOWNLOADER_FLAGS} ${gcc_sha256} \
-            "https://www.cp2k.org/static/downloads/gcc-${gcc_ver}.tar.gz"
-        fi
-        [ -d gcc-${gcc_ver} ] && rm -rf gcc-${gcc_ver}
-        tar -xzf gcc-${gcc_ver}.tar.gz
+        download_pkg ${DOWNLOADER_FLAGS} ${gcc_sha256} \
+          "https://www.cp2k.org/static/downloads/gcc-${gcc_ver}.tar.gz"
       fi
+      [ -d gcc-${gcc_ver} ] && rm -rf gcc-${gcc_ver}
+      tar -xzf gcc-${gcc_ver}.tar.gz
+
       echo "Installing GCC from scratch into ${pkg_install_dir}"
       cd gcc-${gcc_ver}
       ./contrib/download_prerequisites > prereq.log 2>&1 || tail -n ${LOG_LINES} prereq.log

tools/toolchain/scripts/stage4/install_libxsmm.sh

@@ -25,8 +25,7 @@ cd "${BUILDDIR}"
 case "$with_libxsmm" in
   __INSTALL__)
     echo "==================== Installing Libxsmm ===================="
-    if [[ ("$OPENBLAS_ARCH" != "x86_64") && (\
-      "$OPENBLAS_ARCH" != "arm64" || "$libxsmm_ver" != "master") ]]; then
+    if [[ ("$OPENBLAS_ARCH" != "x86_64") && ("$OPENBLAS_ARCH" != "arm64") ]]; then
       report_warning $LINENO "libxsmm is not supported on arch ${OPENBLAS_ARCH}"
       cat << EOF > "${BUILDDIR}/setup_libxsmm"
 with_libxsmm="__DONTUSE__"
@@ -38,22 +37,15 @@ EOF
     if verify_checksums "${install_lock_file}"; then
       echo "libxsmm-${libxsmm_ver} is already installed, skipping it."
     else
-      if [ "$libxsmm_ver" = "master" ]; then
-        download_pkg_no_checksum ${DOWNLOADER_FLAGS} \
-          -o libxsmm-master.zip \
-          https://github.com/hfp/libxsmm/archive/master.zip
-        [ -d libxsmm-master ] && rm -rf libxsmm-master
-        unzip -q -o libxsmm-master.zip
+      if [ -f libxsmm-${libxsmm_ver}.tar.gz ]; then
+        echo "libxsmm-${libxsmm_ver}.tar.gz is found"
       else
-        if [ -f libxsmm-${libxsmm_ver}.tar.gz ]; then
-          echo "libxsmm-${libxsmm_ver}.tar.gz is found"
-        else
-          download_pkg ${DOWNLOADER_FLAGS} ${libxsmm_sha256} \
-            https://www.cp2k.org/static/downloads/libxsmm-${libxsmm_ver}.tar.gz
-        fi
-        [ -d libxsmm-${libxsmm_ver} ] && rm -rf libxsmm-${libxsmm_ver}
-        tar -xzf libxsmm-${libxsmm_ver}.tar.gz
+        download_pkg ${DOWNLOADER_FLAGS} ${libxsmm_sha256} \
+          https://www.cp2k.org/static/downloads/libxsmm-${libxsmm_ver}.tar.gz
       fi
+      [ -d libxsmm-${libxsmm_ver} ] && rm -rf libxsmm-${libxsmm_ver}
+      tar -xzf libxsmm-${libxsmm_ver}.tar.gz
+
       echo "Installing from scratch into ${pkg_install_dir}"
       # note that we do not have to set -L flags to ld for the
       # linked math libraries for the libxsmm build, as for a

tools/toolchain/scripts/tool_kit.sh

@@ -618,33 +618,6 @@ checksum() {
   fi
 }
 
-# downloader for the package tars, excludes checksum
-download_pkg_no_checksum() {
-  # usage: download_pkg_no_checksum [-n] [-o output_filename] url
-  local __wget_flags='--quiet'
-  local __url=''
-  while [ $# -ge 1 ]; do
-    case "$1" in
-      -n)
-        local __wget_flags="$__wget_flags --no-check-certificate"
-        ;;
-      -o)
-        shift
-        __wget_flags="$__wget_flags -O $1"
-        ;;
-      *)
-        __url="$1"
-        ;;
-    esac
-    shift
-  done
-  # download
-  if ! wget $__wget_flags $__url; then
-    report_error "failed to download $__url"
-    return 1
-  fi
-}
-
 # downloader for the package tars, includes checksum
 download_pkg() {
   # usage: download_pkg [-n] [-o output_filename] sha256 url