#2: update setup script output

DARMA-tasking · Sep 30, 2024 · 0c28fe0 · 0c28fe0
1 parent db62189
commit 0c28fe0
Show file tree

Hide file tree

Showing 9 changed files with 369 additions and 198 deletions.
diff --git a/ci/setup-template.sh b/ci/setup-template.sh
@@ -14,6 +14,15 @@ SCRIPTS_INSTALL_DIR=/opt/scripts/ci
 # TODO: change 2-implement-common-docker-containers to master once scripts when PR is ready
 SCRIPTS_DEPS_URL="https://raw.githubusercontent.com/DARMA-tasking/workflows/refs/heads/2-implement-common-docker-containers/ci/shared/scripts/deps"
 
+echo "------------- Setup --------------"
+echo "Operating system: $OS_NAME / Version: $OS_VERSION"
+echo "In docker: $DOCKER_RUN"
+echo "----------------------------------"
+
+# Save setup environment to ~/.setuprc (used by packages.sh dep for example)
+echo "--"
+echo "-- Sharing setup information (SETUP_ID, OS_NAME, OS_VERSION, DOCKER_RUN) into ~/.setuprc"
+echo "--"
 OS=
 OS_VERSION=
 UNAME=$(uname)
@@ -27,28 +36,14 @@ then
     OS_NAME=$(cat /etc/os-release | grep -E "^NAME=*" | cut -d = -f 2 | tr -d '"')
     OS_VERSION=$(cat /etc/os-release | grep -E "^VERSION_ID=*" | cut -d = -f 2 | tr -d '"')
 fi
-
-# Save setup environment
-echo "export OS_NAME=\"$OS_NAME\"" >> ~/.setuprc
-echo "export OS_VERSION=\"$OS_VERSION\"" >> ~/.setuprc
 echo "export SETUP_ID=\"$SETUP_ID\"" >> ~/.setuprc
 echo "export DOCKER_RUN=\"$DOCKER_RUN\"" >> ~/.setuprc
-
-echo "/////////////////////////////////////////////////"
-echo "Setup script"
-echo "/////////////////////////////////////////////////"
-echo "Operating system: $OS_NAME / Version: $OS_VERSION"
-echo "Setup configuration:"
-echo "> Setup Id (SETUP_ID): $SETUP_ID"
-echo "> C Compiler (CC): $CC"
-echo "> C++ Compiler (CXX): $CXX"
-echo "> Fortran Compiler (FC): $FC"
-echo "> Build type (CMAKE_BUILD_TYPE): $CMAKE_BUILD_TYPE"
-echo "> C++ Standard (CMAKE_CXX_STANDARD): $CMAKE_CXX_STANDARD"
-
-echo "/////////////////////////////////////////////////"
+echo "export OS_NAME=\"$OS_NAME\"" >> ~/.setuprc
+echo "export OS_VERSION=\"$OS_VERSION\"" >> ~/.setuprc
 
 ### UPDATE PACKAGE LIST AND INSTALL START-UP PACKAGES: git, wget, bash.
+echo "--"
+echo "-- Installing Core packages..."
 if [ "$OS_NAME" = "Ubuntu" ]
 then
     apt-get update -y -q
@@ -65,7 +60,16 @@ else
     exit 1
 fi
 
+echo "--"
+echo "-- Core packages installed !"
+echo "--"
+
 ### SETUP DEPENDENCIES
+
+echo "--"
+echo "-- Installing dependencies..."
+echo "--"
+
 mkdir -p $SCRIPTS_INSTALL_DIR
 mkdir -p $SCRIPTS_INSTALL_DIR/deps
 # 1. Download dependency installation script
@@ -82,6 +86,10 @@ if [ "$DOCKER_RUN" = "1" ]; then
     rm -rf /var/lib/apt/lists/*
 fi
 
+echo "--"
+echo "-- Dependencies installed !"
+echo "--"
+
 ### CLEAN-UP
 if [ "$OS_NAME" = "Ubuntu" ]
 then
@@ -96,7 +104,18 @@ else
     echo "No cleanup instructions defined for OS=$OS."
 fi
 
-if [ -e "opt/nvcc_wrapper/bin/nvcc_wrapper" ] 
-then
-    export CXX=nvcc_wrapper
-fi
+echo "---------- Setup OK ! ------------"
+echo "--"
+echo "Operating system: $OS_NAME / Version: $OS_VERSION"
+echo "--"
+echo "Setup id: $SETUP_ID"
+echo "--"
+echo "Environment:"
+echo "  CC=$CC"
+echo "  CXX=$CXX"
+echo "  CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE"
+echo "  CMAKE_CXX_STANDARD=$CMAKE_CXX_STANDARD"
+echo "  FC=$FC"
+echo "--"
+echo "-------- Ready to test ! ---------"
+echo "--"
diff --git a/ci/shared/scripts/setup-amd64-alpine-clang-13-clang-13-cpp.sh b/ci/shared/scripts/setup-amd64-alpine-clang-13-clang-13-cpp.sh
@@ -14,6 +14,15 @@ SCRIPTS_INSTALL_DIR=/opt/scripts/ci
 # TODO: change 2-implement-common-docker-containers to master once scripts when PR is ready
 SCRIPTS_DEPS_URL="https://raw.githubusercontent.com/DARMA-tasking/workflows/refs/heads/2-implement-common-docker-containers/ci/shared/scripts/deps"
 
+echo "------------- Setup --------------"
+echo "Operating system: $OS_NAME / Version: $OS_VERSION"
+echo "In docker: $DOCKER_RUN"
+echo "----------------------------------"
+
+# Save setup environment to ~/.setuprc (used by packages.sh dep for example)
+echo "--"
+echo "-- Sharing setup information (SETUP_ID, OS_NAME, OS_VERSION, DOCKER_RUN) into ~/.setuprc"
+echo "--"
 OS=
 OS_VERSION=
 UNAME=$(uname)
@@ -27,28 +36,14 @@ then
     OS_NAME=$(cat /etc/os-release | grep -E "^NAME=*" | cut -d = -f 2 | tr -d '"')
     OS_VERSION=$(cat /etc/os-release | grep -E "^VERSION_ID=*" | cut -d = -f 2 | tr -d '"')
 fi
-
-# Save setup environment
-echo "export OS_NAME=\"$OS_NAME\"" >> ~/.setuprc
-echo "export OS_VERSION=\"$OS_VERSION\"" >> ~/.setuprc
 echo "export SETUP_ID=\"$SETUP_ID\"" >> ~/.setuprc
 echo "export DOCKER_RUN=\"$DOCKER_RUN\"" >> ~/.setuprc
-
-echo "/////////////////////////////////////////////////"
-echo "Setup script"
-echo "/////////////////////////////////////////////////"
-echo "Operating system: $OS_NAME / Version: $OS_VERSION"
-echo "Setup configuration:"
-echo "> Setup Id (SETUP_ID): $SETUP_ID"
-echo "> C Compiler (CC): $CC"
-echo "> C++ Compiler (CXX): $CXX"
-echo "> Fortran Compiler (FC): $FC"
-echo "> Build type (CMAKE_BUILD_TYPE): $CMAKE_BUILD_TYPE"
-echo "> C++ Standard (CMAKE_CXX_STANDARD): $CMAKE_CXX_STANDARD"
-
-echo "/////////////////////////////////////////////////"
+echo "export OS_NAME=\"$OS_NAME\"" >> ~/.setuprc
+echo "export OS_VERSION=\"$OS_VERSION\"" >> ~/.setuprc
 
 ### UPDATE PACKAGE LIST AND INSTALL START-UP PACKAGES: git, wget, bash.
+echo "--"
+echo "-- Installing Core packages..."
 if [ "$OS_NAME" = "Ubuntu" ]
 then
     apt-get update -y -q
@@ -65,7 +60,16 @@ else
     exit 1
 fi
 
+echo "--"
+echo "-- Core packages installed !"
+echo "--"
+
 ### SETUP DEPENDENCIES
+
+echo "--"
+echo "-- Installing dependencies..."
+echo "--"
+
 mkdir -p $SCRIPTS_INSTALL_DIR
 mkdir -p $SCRIPTS_INSTALL_DIR/deps
 # 1. Download dependency installation script
@@ -84,6 +88,10 @@ if [ "$DOCKER_RUN" = "1" ]; then
     rm -rf /var/lib/apt/lists/*
 fi
 
+echo "--"
+echo "-- Dependencies installed !"
+echo "--"
+
 ### CLEAN-UP
 if [ "$OS_NAME" = "Ubuntu" ]
 then
@@ -98,7 +106,18 @@ else
     echo "No cleanup instructions defined for OS=$OS."
 fi
 
-if [ -e "opt/nvcc_wrapper/bin/nvcc_wrapper" ] 
-then
-    export CXX=nvcc_wrapper
-fi
+echo "---------- Setup OK ! ------------"
+echo "--"
+echo "Operating system: $OS_NAME / Version: $OS_VERSION"
+echo "--"
+echo "Setup id: $SETUP_ID"
+echo "--"
+echo "Environment:"
+echo "  CC=$CC"
+echo "  CXX=$CXX"
+echo "  CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE"
+echo "  CMAKE_CXX_STANDARD=$CMAKE_CXX_STANDARD"
+echo "  FC=$FC"
+echo "--"
+echo "-------- Ready to test ! ---------"
+echo "--"
diff --git a/ci/shared/scripts/setup-amd64-ubuntu-20.04-gcc-9-11.2.2-cpp.sh b/ci/shared/scripts/setup-amd64-ubuntu-20.04-gcc-9-11.2.2-cpp.sh
@@ -14,6 +14,15 @@ SCRIPTS_INSTALL_DIR=/opt/scripts/ci
 # TODO: change 2-implement-common-docker-containers to master once scripts when PR is ready
 SCRIPTS_DEPS_URL="https://raw.githubusercontent.com/DARMA-tasking/workflows/refs/heads/2-implement-common-docker-containers/ci/shared/scripts/deps"
 
+echo "------------- Setup --------------"
+echo "Operating system: $OS_NAME / Version: $OS_VERSION"
+echo "In docker: $DOCKER_RUN"
+echo "----------------------------------"
+
+# Save setup environment to ~/.setuprc (used by packages.sh dep for example)
+echo "--"
+echo "-- Sharing setup information (SETUP_ID, OS_NAME, OS_VERSION, DOCKER_RUN) into ~/.setuprc"
+echo "--"
 OS=
 OS_VERSION=
 UNAME=$(uname)
@@ -27,28 +36,14 @@ then
     OS_NAME=$(cat /etc/os-release | grep -E "^NAME=*" | cut -d = -f 2 | tr -d '"')
     OS_VERSION=$(cat /etc/os-release | grep -E "^VERSION_ID=*" | cut -d = -f 2 | tr -d '"')
 fi
-
-# Save setup environment
-echo "export OS_NAME=\"$OS_NAME\"" >> ~/.setuprc
-echo "export OS_VERSION=\"$OS_VERSION\"" >> ~/.setuprc
 echo "export SETUP_ID=\"$SETUP_ID\"" >> ~/.setuprc
 echo "export DOCKER_RUN=\"$DOCKER_RUN\"" >> ~/.setuprc
-
-echo "/////////////////////////////////////////////////"
-echo "Setup script"
-echo "/////////////////////////////////////////////////"
-echo "Operating system: $OS_NAME / Version: $OS_VERSION"
-echo "Setup configuration:"
-echo "> Setup Id (SETUP_ID): $SETUP_ID"
-echo "> C Compiler (CC): $CC"
-echo "> C++ Compiler (CXX): $CXX"
-echo "> Fortran Compiler (FC): $FC"
-echo "> Build type (CMAKE_BUILD_TYPE): $CMAKE_BUILD_TYPE"
-echo "> C++ Standard (CMAKE_CXX_STANDARD): $CMAKE_CXX_STANDARD"
-
-echo "/////////////////////////////////////////////////"
+echo "export OS_NAME=\"$OS_NAME\"" >> ~/.setuprc
+echo "export OS_VERSION=\"$OS_VERSION\"" >> ~/.setuprc
 
 ### UPDATE PACKAGE LIST AND INSTALL START-UP PACKAGES: git, wget, bash.
+echo "--"
+echo "-- Installing Core packages..."
 if [ "$OS_NAME" = "Ubuntu" ]
 then
     apt-get update -y -q
@@ -65,7 +60,16 @@ else
     exit 1
 fi
 
+echo "--"
+echo "-- Core packages installed !"
+echo "--"
+
 ### SETUP DEPENDENCIES
+
+echo "--"
+echo "-- Installing dependencies..."
+echo "--"
+
 mkdir -p $SCRIPTS_INSTALL_DIR
 mkdir -p $SCRIPTS_INSTALL_DIR/deps
 # 1. Download dependency installation script
@@ -88,6 +92,10 @@ if [ "$DOCKER_RUN" = "1" ]; then
     rm -rf /var/lib/apt/lists/*
 fi
 
+echo "--"
+echo "-- Dependencies installed !"
+echo "--"
+
 ### CLEAN-UP
 if [ "$OS_NAME" = "Ubuntu" ]
 then
@@ -102,7 +110,18 @@ else
     echo "No cleanup instructions defined for OS=$OS."
 fi
 
-if [ -e "opt/nvcc_wrapper/bin/nvcc_wrapper" ] 
-then
-    export CXX=nvcc_wrapper
-fi
+echo "---------- Setup OK ! ------------"
+echo "--"
+echo "Operating system: $OS_NAME / Version: $OS_VERSION"
+echo "--"
+echo "Setup id: $SETUP_ID"
+echo "--"
+echo "Environment:"
+echo "  CC=$CC"
+echo "  CXX=$CXX"
+echo "  CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE"
+echo "  CMAKE_CXX_STANDARD=$CMAKE_CXX_STANDARD"
+echo "  FC=$FC"
+echo "--"
+echo "-------- Ready to test ! ---------"
+echo "--"
diff --git a/ci/shared/scripts/setup-amd64-ubuntu-20.04-gcc-9-12.2.0-cpp.sh b/ci/shared/scripts/setup-amd64-ubuntu-20.04-gcc-9-12.2.0-cpp.sh
@@ -14,6 +14,15 @@ SCRIPTS_INSTALL_DIR=/opt/scripts/ci
 # TODO: change 2-implement-common-docker-containers to master once scripts when PR is ready
 SCRIPTS_DEPS_URL="https://raw.githubusercontent.com/DARMA-tasking/workflows/refs/heads/2-implement-common-docker-containers/ci/shared/scripts/deps"
 
+echo "------------- Setup --------------"
+echo "Operating system: $OS_NAME / Version: $OS_VERSION"
+echo "In docker: $DOCKER_RUN"
+echo "----------------------------------"
+
+# Save setup environment to ~/.setuprc (used by packages.sh dep for example)
+echo "--"
+echo "-- Sharing setup information (SETUP_ID, OS_NAME, OS_VERSION, DOCKER_RUN) into ~/.setuprc"
+echo "--"
 OS=
 OS_VERSION=
 UNAME=$(uname)
@@ -27,28 +36,14 @@ then
     OS_NAME=$(cat /etc/os-release | grep -E "^NAME=*" | cut -d = -f 2 | tr -d '"')
     OS_VERSION=$(cat /etc/os-release | grep -E "^VERSION_ID=*" | cut -d = -f 2 | tr -d '"')
 fi
-
-# Save setup environment
-echo "export OS_NAME=\"$OS_NAME\"" >> ~/.setuprc
-echo "export OS_VERSION=\"$OS_VERSION\"" >> ~/.setuprc
 echo "export SETUP_ID=\"$SETUP_ID\"" >> ~/.setuprc
 echo "export DOCKER_RUN=\"$DOCKER_RUN\"" >> ~/.setuprc
-
-echo "/////////////////////////////////////////////////"
-echo "Setup script"
-echo "/////////////////////////////////////////////////"
-echo "Operating system: $OS_NAME / Version: $OS_VERSION"
-echo "Setup configuration:"
-echo "> Setup Id (SETUP_ID): $SETUP_ID"
-echo "> C Compiler (CC): $CC"
-echo "> C++ Compiler (CXX): $CXX"
-echo "> Fortran Compiler (FC): $FC"
-echo "> Build type (CMAKE_BUILD_TYPE): $CMAKE_BUILD_TYPE"
-echo "> C++ Standard (CMAKE_CXX_STANDARD): $CMAKE_CXX_STANDARD"
-
-echo "/////////////////////////////////////////////////"
+echo "export OS_NAME=\"$OS_NAME\"" >> ~/.setuprc
+echo "export OS_VERSION=\"$OS_VERSION\"" >> ~/.setuprc
 
 ### UPDATE PACKAGE LIST AND INSTALL START-UP PACKAGES: git, wget, bash.
+echo "--"
+echo "-- Installing Core packages..."
 if [ "$OS_NAME" = "Ubuntu" ]
 then
     apt-get update -y -q
@@ -65,7 +60,16 @@ else
     exit 1
 fi
 
+echo "--"
+echo "-- Core packages installed !"
+echo "--"
+
 ### SETUP DEPENDENCIES
+
+echo "--"
+echo "-- Installing dependencies..."
+echo "--"
+
 mkdir -p $SCRIPTS_INSTALL_DIR
 mkdir -p $SCRIPTS_INSTALL_DIR/deps
 # 1. Download dependency installation script
@@ -88,6 +92,10 @@ if [ "$DOCKER_RUN" = "1" ]; then
     rm -rf /var/lib/apt/lists/*
 fi
 
+echo "--"
+echo "-- Dependencies installed !"
+echo "--"
+
 ### CLEAN-UP
 if [ "$OS_NAME" = "Ubuntu" ]
 then
@@ -102,7 +110,18 @@ else
     echo "No cleanup instructions defined for OS=$OS."
 fi
 
-if [ -e "opt/nvcc_wrapper/bin/nvcc_wrapper" ] 
-then
-    export CXX=nvcc_wrapper
-fi
+echo "---------- Setup OK ! ------------"
+echo "--"
+echo "Operating system: $OS_NAME / Version: $OS_VERSION"
+echo "--"
+echo "Setup id: $SETUP_ID"
+echo "--"
+echo "Environment:"
+echo "  CC=$CC"
+echo "  CXX=$CXX"
+echo "  CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE"
+echo "  CMAKE_CXX_STANDARD=$CMAKE_CXX_STANDARD"
+echo "  FC=$FC"
+echo "--"
+echo "-------- Ready to test ! ---------"
+echo "--"