From 71f6a37b341cf3ba5a6d2009587e99a31707c00b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ole=20Sch=C3=BCtt?= Date: Fri, 8 Jul 2022 22:23:24 +0200 Subject: [PATCH 1/3] Cut release version 2022.1 --- REVISION | 1 + src/cp2k_info.F | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 REVISION diff --git a/REVISION b/REVISION new file mode 100644 index 0000000000..3eb4cea9ad --- /dev/null +++ b/REVISION @@ -0,0 +1 @@ +git:2caeb6f diff --git a/src/cp2k_info.F b/src/cp2k_info.F index 92df505075..ce6a36e566 100644 --- a/src/cp2k_info.F +++ b/src/cp2k_info.F @@ -38,7 +38,7 @@ MODULE cp2k_info #endif ! The cp2k_version string should be changed for release branches. - CHARACTER(LEN=*), PARAMETER :: cp2k_version = "CP2K development version" + CHARACTER(LEN=*), PARAMETER :: cp2k_version = "CP2K version 2022.1" CHARACTER(LEN=*), PARAMETER :: cp2k_year = "2022" CHARACTER(LEN=*), PARAMETER :: cp2k_home = "https://www.cp2k.org/" From a95ec4033747cff22669506ef08e06d7d5f32936 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ole=20Sch=C3=BCtt?= Date: Sun, 2 Oct 2022 22:00:15 +0200 Subject: [PATCH 2/3] Toolchain: Download all package from cp2k.org --- tools/toolchain/scripts/stage0/install_cmake.sh | 6 +++--- tools/toolchain/scripts/stage4/install_cosma.sh | 3 +-- tools/toolchain/scripts/stage6/install_plumed.sh | 2 +- tools/toolchain/scripts/stage7/install_spglib.sh | 3 +-- tools/toolchain/scripts/stage8/install_sirius.sh | 3 +-- tools/toolchain/scripts/stage8/install_spfft.sh | 4 +--- tools/toolchain/scripts/stage8/install_spla.sh | 4 +--- 7 files changed, 9 insertions(+), 16 deletions(-) diff --git a/tools/toolchain/scripts/stage0/install_cmake.sh b/tools/toolchain/scripts/stage0/install_cmake.sh index 8504f8d01f..8d6e267c37 100755 --- a/tools/toolchain/scripts/stage0/install_cmake.sh +++ b/tools/toolchain/scripts/stage0/install_cmake.sh @@ -22,10 +22,10 @@ case "${with_cmake}" in echo "==================== Installing CMake ====================" cmake_ver="3.22.1" if [ "${OPENBLAS_ARCH}" = "arm64" ]; then - cmake_arch="Linux-aarch64" + cmake_arch="linux-aarch64" cmake_sha256="ff886c6c16be867229a6c1fe4bc963ff77ae24187d5a8d64ef72a06f84c1a25c" elif [ "${OPENBLAS_ARCH}" = "x86_64" ]; then - cmake_arch="Linux-x86_64" + cmake_arch="linux-x86_64" cmake_sha256="808a712bcb039fd71f6960dca82a9befb977d8bdb074718218cf7646fd08bb7a" else report_error ${LINENO} \ @@ -41,7 +41,7 @@ case "${with_cmake}" in echo "cmake-${cmake_ver}-${cmake_arch}.sh is found" else download_pkg ${DOWNLOADER_FLAGS} ${cmake_sha256} \ - https://github.com/Kitware/CMake/releases/download/v${cmake_ver}/cmake-${cmake_ver}-${cmake_arch}.sh + "https://www.cp2k.org/static/downloads/cmake-${cmake_ver}-${cmake_arch}.sh" fi echo "Installing from scratch into ${pkg_install_dir}" mkdir -p ${pkg_install_dir} diff --git a/tools/toolchain/scripts/stage4/install_cosma.sh b/tools/toolchain/scripts/stage4/install_cosma.sh index 4163b0c436..6b0251b6ea 100755 --- a/tools/toolchain/scripts/stage4/install_cosma.sh +++ b/tools/toolchain/scripts/stage4/install_cosma.sh @@ -35,8 +35,7 @@ case "$with_cosma" in echo "COSMA-v${cosma_ver}.tar.gz is found" else download_pkg ${DOWNLOADER_FLAGS} ${cosma_sha256} \ - "https://github.com/eth-cscs/COSMA/releases/download/v${cosma_ver}/COSMA-v${cosma_ver}.tar.gz" \ - -o COSMA-v${cosma_ver}.tar.gz + "https://www.cp2k.org/static/downloads/COSMA-v${cosma_ver}.tar.gz" fi echo "Installing from scratch into ${pkg_install_dir}" [ -d COSMA-${cosma_ver} ] && rm -rf COSMA-${cosma_ver} diff --git a/tools/toolchain/scripts/stage6/install_plumed.sh b/tools/toolchain/scripts/stage6/install_plumed.sh index 3ee4639b50..f424e56df4 100755 --- a/tools/toolchain/scripts/stage6/install_plumed.sh +++ b/tools/toolchain/scripts/stage6/install_plumed.sh @@ -36,7 +36,7 @@ case "$with_plumed" in echo "${plumed_pkg} is found" else download_pkg ${DOWNLOADER_FLAGS} ${plumed_sha256} \ - "https://github.com/plumed/plumed2/releases/download/v${plumed_ver}/${plumed_pkg}" + "https://www.cp2k.org/static/downloads/${plumed_pkg}" fi [ -d plumed-${plumed_ver} ] && rm -rf plumed-${plumed_ver} diff --git a/tools/toolchain/scripts/stage7/install_spglib.sh b/tools/toolchain/scripts/stage7/install_spglib.sh index 34afd3b139..b4d3a4c19f 100755 --- a/tools/toolchain/scripts/stage7/install_spglib.sh +++ b/tools/toolchain/scripts/stage7/install_spglib.sh @@ -31,8 +31,7 @@ case "$with_spglib" in echo "spglib-${spglib_ver}.tar.gz is found" else download_pkg ${DOWNLOADER_FLAGS} ${spglib_sha256} \ - https://github.com/atztogo/spglib/archive/v${spglib_ver}.tar.gz \ - -o spglib-${spglib_ver}.tar.gz + "https://www.cp2k.org/static/downloads/spglib-${spglib_ver}.tar.gz" fi echo "Installing from scratch into ${pkg_install_dir}" diff --git a/tools/toolchain/scripts/stage8/install_sirius.sh b/tools/toolchain/scripts/stage8/install_sirius.sh index f114e67464..5ae5679d0a 100755 --- a/tools/toolchain/scripts/stage8/install_sirius.sh +++ b/tools/toolchain/scripts/stage8/install_sirius.sh @@ -95,8 +95,7 @@ case "$with_sirius" in echo "sirius_${sirius_ver}.tar.gz is found" else download_pkg ${DOWNLOADER_FLAGS} ${sirius_sha256} \ - "https://github.com/electronic-structure/SIRIUS/archive/v${sirius_ver}.tar.gz" \ - -o SIRIUS-${sirius_ver}.tar.gz + "https://www.cp2k.org/static/downloads/SIRIUS-${sirius_ver}.tar.gz" fi echo "Installing from scratch into ${pkg_install_dir}" diff --git a/tools/toolchain/scripts/stage8/install_spfft.sh b/tools/toolchain/scripts/stage8/install_spfft.sh index 2bf7bad299..6cc01fc55f 100755 --- a/tools/toolchain/scripts/stage8/install_spfft.sh +++ b/tools/toolchain/scripts/stage8/install_spfft.sh @@ -31,9 +31,7 @@ case "${with_spfft}" in echo "SpFFT-${spfft_ver}.tar.gz is found" else download_pkg ${DOWNLOADER_FLAGS} ${spfft_sha256} \ - "https://github.com/eth-cscs/SpFFT/archive/v${spfft_ver}.tar.gz" \ - -o SpFFT-${spfft_ver}.tar.gz - + "https://www.cp2k.org/static/downloads/SpFFT-${spfft_ver}.tar.gz" fi if [ "${MATH_MODE}" = "mkl" ]; then EXTRA_CMAKE_FLAGS="-DSPFFT_MKL=ON -DSPFFT_FFTW_LIB=MKL" diff --git a/tools/toolchain/scripts/stage8/install_spla.sh b/tools/toolchain/scripts/stage8/install_spla.sh index 00b71df918..c50b680415 100755 --- a/tools/toolchain/scripts/stage8/install_spla.sh +++ b/tools/toolchain/scripts/stage8/install_spla.sh @@ -31,9 +31,7 @@ case "${with_spla}" in echo "SpLA-${spla_ver}.tar.gz is found" else download_pkg ${DOWNLOADER_FLAGS} ${spla_sha256} \ - "https://github.com/eth-cscs/Spla/archive/v${spla_ver}.tar.gz" \ - -o SpLA-${spla_ver}.tar.gz - + "https://www.cp2k.org/static/downloads/SpLA-${spla_ver}.tar.gz" fi echo "Installing from scratch into ${pkg_install_dir}" [ -d SpLA-${spla_ver} ] && rm -rf SpLA-${spla_ver} From 0cbbc3ee3c7ccc2e6ba7bce008740518670c9f19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ole=20Sch=C3=BCtt?= Date: Tue, 4 Oct 2022 14:51:06 +0200 Subject: [PATCH 3/3] Cut release version 2022.2 --- REVISION | 2 +- src/cp2k_info.F | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/REVISION b/REVISION index 3eb4cea9ad..79c9542e01 100644 --- a/REVISION +++ b/REVISION @@ -1 +1 @@ -git:2caeb6f +git:a95ec40 diff --git a/src/cp2k_info.F b/src/cp2k_info.F index ce6a36e566..03107ab227 100644 --- a/src/cp2k_info.F +++ b/src/cp2k_info.F @@ -38,7 +38,7 @@ MODULE cp2k_info #endif ! The cp2k_version string should be changed for release branches. - CHARACTER(LEN=*), PARAMETER :: cp2k_version = "CP2K version 2022.1" + CHARACTER(LEN=*), PARAMETER :: cp2k_version = "CP2K version 2022.2" CHARACTER(LEN=*), PARAMETER :: cp2k_year = "2022" CHARACTER(LEN=*), PARAMETER :: cp2k_home = "https://www.cp2k.org/"