Print setup info in arch files

cp2k · Apr 19, 2023 · 9d075a8 · 9d075a8
1 parent 2c8478b
commit 9d075a8
Show file tree

Hide file tree

Showing 9 changed files with 49 additions and 9 deletions.
diff --git a/arch/CRAY-XC40-gnu.psmp b/arch/CRAY-XC40-gnu.psmp
@@ -11,7 +11,7 @@
 #        A full toolchain installation is performed as default.
 #        Replace or adapt the "module add" commands below if needed.
 #
-# Author: Matthias Krack (18.04.2023)
+# Author: Matthias Krack (19.04.2023)
 #
 # \
    if [ "${0}" = "${BASH_SOURCE}" ]; then \
@@ -51,12 +51,15 @@
    source ${PWD}/tools/toolchain/install/setup; \
    printf "done\n"; \
    echo "Check the output above for error messages and consistency!"; \
+   echo; \
    echo "If everything is OK, you can build a CP2K production binary with"; \
    echo "   make -j ARCH=${this_file%.*} VERSION=${this_file##*.}"; \
+   echo; \
    echo "Alternatively, you can add further checks, e.g. for regression testing, with"; \
    echo "   make -j ARCH=${this_file%.*} VERSION=${this_file##*.} DO_CHECKS=yes"; \
    echo "or build CP2K as a library with"; \
    echo "   make -j ARCH=${this_file%.*} VERSION=${this_file##*.} libcp2k"; \
+   echo; \
    return
 
 # Set options

diff --git a/arch/CRAY-XC50-gnu.psmp b/arch/CRAY-XC50-gnu.psmp
@@ -11,7 +11,7 @@
 #        A full toolchain installation is performed as default.
 #        Replace or adapt the "module add" commands below if needed.
 #
-# Author: Matthias Krack (18.04.2023)
+# Author: Matthias Krack (19.04.2023)
 #
 # \
    if [ "${0}" = "${BASH_SOURCE}" ]; then \
@@ -53,12 +53,15 @@
    source ${PWD}/tools/toolchain/install/setup; \
    printf "done\n"; \
    echo "Check the output above for error messages and consistency!"; \
+   echo; \
    echo "If everything is OK, you can build a CP2K production binary with"; \
    echo "   make -j ARCH=${this_file%.*} VERSION=${this_file##*.}"; \
+   echo; \
    echo "Alternatively, you can add further checks, e.g. for regression testing, with"; \
    echo "   make -j ARCH=${this_file%.*} VERSION=${this_file##*.} DO_CHECKS=yes"; \
    echo "or build CP2K as a library with"; \
    echo "   make -j ARCH=${this_file%.*} VERSION=${this_file##*.} libcp2k"; \
+   echo; \
    return
 
 # Set options

diff --git a/arch/Darwin-gnu-arm64.psmp b/arch/Darwin-gnu-arm64.psmp
@@ -11,7 +11,7 @@
 #
 # Usage: Source this arch file and then run make as instructed.
 #
-# Author: Matthias Krack (18.04.2023)
+# Author: Matthias Krack (19.04.2023)
 #
 # \
    if [[ "${0}" == "${BASH_SOURCE}" ]]; then \
@@ -41,10 +41,16 @@
    cd ../..; \
    echo; \
    echo "Check the output above for error messages and consistency!"; \
+   echo; \
    echo "If everything is OK, you can build a CP2K production binary with"; \
    echo "   make -j ARCH=${this_file%.*} VERSION=${this_file##*.}"; \
+   echo; \
    echo "Alternatively, you can add further checks, e.g. for regression testing, with"; \
    echo "   make -j ARCH=${this_file%.*} VERSION=${this_file##*.} DO_CHECKS=yes"; \
+   echo; \
+   echo "Run always the following command before using the CP2K binary"; \
+   echo "   source ${PWD}/tools/toolchain/install/setup"; \
+   echo; \
    return
 
 # Set options

diff --git a/arch/Darwin-gnu-arm64.ssmp b/arch/Darwin-gnu-arm64.ssmp
@@ -9,7 +9,7 @@
 #
 # Usage: Source this arch file and then run make as instructed.
 #
-# Author: Matthias Krack (12.01.2023)
+# Author: Matthias Krack (19.04.2023)
 #
 # \
    if [[ "${0}" == "${BASH_SOURCE}" ]]; then \
@@ -37,10 +37,16 @@
    cd ../..; \
    echo; \
    echo "Check the output above for error messages and consistency!"; \
+   echo; \
    echo "If everything is OK, you can build a CP2K production binary with"; \
    echo "   make -j ARCH=${this_file%.*} VERSION=${this_file##*.}"; \
+   echo; \
    echo "Alternatively, you can add further checks, e.g. for regression testing, with"; \
    echo "   make -j ARCH=${this_file%.*} VERSION=${this_file##*.} DO_CHECKS=yes"; \
+   echo; \
+   echo "Run always the following command before using the CP2K binary"; \
+   echo "   source ${PWD}/tools/toolchain/install/setup"; \
+   echo; \
    return
 
 # Set options

diff --git a/arch/Linux-gnu-aarch64-static.ssmp b/arch/Linux-gnu-aarch64-static.ssmp
@@ -7,7 +7,7 @@
 #
 # Usage: Source this arch file and then run make as instructed.
 #
-# Author: Matthias Krack (12.01.2023)
+# Author: Matthias Krack (19.04.2023)
 #
 # \
    if [[ "${0}" == "${BASH_SOURCE}" ]]; then \
@@ -23,9 +23,11 @@
    cd ../..; \
    echo; \
    echo "Check the output above for error messages and consistency!"; \
+   echo; \
    echo "If everything is OK, you can build a CP2K production binary with"; \
    echo "   make -j ARCH=${this_file%.*} VERSION=${this_file##*.}"; \
    echo "Further checks are performed, if DO_CHECKS=yes is added."; \
+   echo; \
    return
 
 # Set options

diff --git a/arch/Linux-gnu-aarch64.psmp b/arch/Linux-gnu-aarch64.psmp
@@ -10,7 +10,7 @@
 # Usage: Source this arch file and then run make as instructed.
 #        A full toolchain installation is performed as default.
 #
-# Author: Matthias Krack (18.04.2023)
+# Author: Matthias Krack (19.04.2023)
 #
 # \
    if [[ "${0}" == "${BASH_SOURCE}" ]]; then \
@@ -27,14 +27,20 @@
    cd ../..; \
    echo; \
    echo "Check the output above for error messages and consistency!"; \
+   echo; \
    echo "If everything is OK, you can build a CP2K production binary with"; \
    echo "   make -j ARCH=${this_file%.*} VERSION=${this_file##*.}"; \
+   echo; \
    echo "Alternatively, you can add further checks, e.g. for regression testing, with"; \
    echo "   make -j ARCH=${this_file%.*} VERSION=${this_file##*.} DO_CHECKS=yes"; \
    echo "or build CP2K only with shared libraries using"; \
    echo "   make -j ARCH=${this_file%.*} VERSION=${this_file##*.} SHARED=yes"; \
    echo "or build CP2K as a library with"; \
    echo "   make -j ARCH=${this_file%.*} VERSION=${this_file##*.} libcp2k"; \
+   echo; \
+   echo "Run always the following command before using the CP2K binary"; \
+   echo "   source ${PWD}/tools/toolchain/install/setup"; \
+   echo; \
    return
 
 # Set options

diff --git a/arch/Linux-gnu-x86_64-static.ssmp b/arch/Linux-gnu-x86_64-static.ssmp
@@ -7,7 +7,7 @@
 #
 # Usage: Source this arch file and then run make as instructed.
 #
-# Author: Matthias Krack (12.01.2023)
+# Author: Matthias Krack (19.01.2023)
 #
 # \
    if [[ "${0}" == "${BASH_SOURCE}" ]]; then \
@@ -23,9 +23,11 @@
    cd ../..; \
    echo; \
    echo "Check the output above for error messages and consistency!"; \
+   echo; \
    echo "If everything is OK, you can build a CP2K production binary with"; \
    echo "   make -j ARCH=${this_file%.*} VERSION=${this_file##*.}"; \
    echo "Further checks are performed, if DO_CHECKS=yes is added, but this disables static linking."; \
+   echo; \
    return
 
 # Set options

diff --git a/arch/Linux-gnu-x86_64.psmp b/arch/Linux-gnu-x86_64.psmp
@@ -13,7 +13,7 @@
 #        Optionally, GNU compiler and MPI implementation can be specified as arguments.
 #        Replace or adapt the "module add" commands below if needed.
 #
-# Author: Matthias Krack (18.04.2023)
+# Author: Matthias Krack (19.04.2023)
 #
 # \
    if [[ "${0}" == "${BASH_SOURCE}" ]]; then \
@@ -42,14 +42,20 @@
    cd ../..; \
    echo; \
    echo "Check the output above for error messages and consistency!"; \
+   echo; \
    echo "If everything is OK, you can build a CP2K production binary with"; \
    echo "   make -j ARCH=${this_file%.*} VERSION=${this_file##*.}"; \
+   echo; \
    echo "Alternatively, you can add further checks, e.g. for regression testing, with"; \
    echo "   make -j ARCH=${this_file%.*} VERSION=${this_file##*.} DO_CHECKS=yes"; \
    echo "or build CP2K only with shared libraries using"; \
    echo "   make -j ARCH=${this_file%.*} VERSION=${this_file##*.} SHARED=yes"; \
    echo "or build CP2K as a library with"; \
    echo "   make -j ARCH=${this_file%.*} VERSION=${this_file##*.} libcp2k"; \
+   echo; \
+   echo "Run always the following command before using the CP2K binary"; \
+   echo "   source ${PWD}/tools/toolchain/install/setup"; \
+   echo; \
    return
 
 # Set options

diff --git a/arch/Linux-intel-x86_64.psmp b/arch/Linux-intel-x86_64.psmp
@@ -12,7 +12,7 @@
 #        Optionally, the Intel compiler version can be specified as argument.
 #        Replace or adapt the "module add" commands below if needed.
 #
-# Author: Matthias Krack (18.04.2023)
+# Author: Matthias Krack (19.04.2023)
 #
 # \
    if [[ "${0}" == "${BASH_SOURCE}" ]]; then \
@@ -32,14 +32,20 @@
    cd ../..; \
    echo; \
    echo "Check the output above for error messages and consistency!"; \
+   echo; \
    echo "If everything is OK, you can build a CP2K production binary with"; \
    echo "   make -j ARCH=${this_file%.*} VERSION=${this_file##*.}"; \
+   echo; \
    echo "Alternatively, you can add further checks, e.g. for regression testing, with"; \
    echo "   make -j ARCH=${this_file%.*} VERSION=${this_file##*.} DO_CHECKS=yes"; \
    echo "or build CP2K only with shared libraries using"; \
    echo "   make -j ARCH=${this_file%.*} VERSION=${this_file##*.} SHARED=yes"; \
    echo "or build CP2K as a library with"; \
    echo "   make -j ARCH=${this_file%.*} VERSION=${this_file##*.} libcp2k"; \
+   echo; \
+   echo "Run always the following command before using the CP2K binary"; \
+   echo "   source ${PWD}/tools/toolchain/install/setup"; \
+   echo; \
    return
 
 # Set options