add progress bar

Author: omlins

juhpc

@@ -65,11 +65,41 @@ check_dir() {
 
 julia_pref() {
   local cmd="$1"
+  local progress="${2:-}"  # The second argument is optional, default to an empty string if not provided
+
   if [[ "$JUHPC_VERBOSE" -gt 1 ]]; then
     julia --project="$JULIA_PREFDIR" -e "$cmd" 2>&1 | tee -a "$JUHPC_SETUP_INSTALLLOG"
   else
     julia --project="$JULIA_PREFDIR" -e "$cmd" >> "$JUHPC_SETUP_INSTALLLOG" 2>&1
   fi
+
+  if [[ -n "$progress" ]]; then
+    progress_bar "$progress"
+  fi
+}
+
+percent() {
+    local p=00$(($1*100000/$2))
+    printf -v "$3" %.2f ${p::-3}.${p: -3}
+}
+
+progress_bar() {
+    local progress=$1
+    local width=${2:-50}  # Default to a width of 50 if not provided
+    local percent_var
+    percent "$progress" 100 percent_var  # Always assume total is 100
+    local filled_length=$((width * progress / 100))
+    local bar=""
+
+    if [[ "$JUHPC_VERBOSE" -lt 2 ]]; then
+        for ((i=0; i<filled_length; i++)); do
+            bar+="█"
+        done
+        for ((i=filled_length; i<width; i++)); do
+            bar+="░"
+        done   
+        printf '\r|%s| %s%%' "$bar" "$percent_var"
+    fi
 }
 
 
@@ -144,15 +174,17 @@ export JULIA_PREF_PROJECT="$JULIA_PREFDIR/Project.toml"
 export JULIA_PREFS="$JULIA_PREFDIR/LocalPreferences.toml"
 mkdir -p "$JULIA_PREFDIR" || { error "failed to create directory: $JULIA_PREFDIR"; }
 
+progress_bar 1 # Initialize progress bar.
+
 if [[ -n "${JUHPC_CUDA_HOME}" || -n "${JUHPC_ROCM_HOME}" ]]; then
-    julia_pref 'using Pkg; Pkg.add("Preferences")'
+    julia_pref 'using Pkg; Pkg.add("Preferences")' 5
     echo "[extras]" >> "$JULIA_PREF_PROJECT"
 fi
 
 if [ -n "${JUHPC_CUDA_HOME}" ]; then  # Set preference for using the local CUDA runtime before any installation of CUDA.jl to avoid downloading of artifacts
     echo 'CUDA_Runtime_jll = "76a88914-d11a-5bdc-97e0-2f5a05c973a2"' >> "$JULIA_PREF_PROJECT"
 
-    julia_pref 'using Preferences; set_preferences!("CUDA_Runtime_jll", "local"=>true)'
+    julia_pref 'using Preferences; set_preferences!("CUDA_Runtime_jll", "local"=>true)' 10
     if [ -n "${JUHPC_CUDA_RUNTIME_VERSION}" ]; then
         julia_pref 'using Preferences; set_preferences!("CUDA_Runtime_jll", "version"=>join(split(ENV["JUHPC_CUDA_RUNTIME_VERSION"],".")[1:2],"."))'
     fi
@@ -161,28 +193,28 @@ fi
 if [ -n "${JUHPC_ROCM_HOME}" ]; then  # Set preference for using the local ROCm runtime before any installation of AMDGPU.jl to avoid downloading of artifacts
     echo 'AMDGPU = "21141c5a-9bdb-4563-92ae-f87d6854732e"' >> "$JULIA_PREF_PROJECT"
 
-    julia_pref 'using Preferences; set_preferences!("AMDGPU", "use_artifacts"=>false, "eager_gc"=>false)'
+    julia_pref 'using Preferences; set_preferences!("AMDGPU", "use_artifacts"=>false, "eager_gc"=>false)' 15
 fi
 
 if [ -n "${JUHPC_CUDA_HOME}" ]; then export CUDA_HOME="$JUHPC_CUDA_HOME"; fi
 if [ -n "${JUHPC_ROCM_HOME}" ]; then export ROCM_PATH="$JUHPC_ROCM_HOME"; fi
 
-julia_pref 'using Pkg; Pkg.add([p for (p,l) in [("MPIPreferences", "JUHPC_MPI_VENDOR"), ("MPIPreferences", "JUHPC_MPI_HOME"), ("CUDA", "JUHPC_CUDA_HOME"), ("AMDGPU", "JUHPC_ROCM_HOME"), ("HDF5", "JUHPC_HDF5_HOME")] if haskey(ENV,l) && ENV[l]!=""])'
+julia_pref 'using Pkg; Pkg.add([p for (p,l) in [("MPIPreferences", "JUHPC_MPI_VENDOR"), ("MPIPreferences", "JUHPC_MPI_HOME"), ("CUDA", "JUHPC_CUDA_HOME"), ("AMDGPU", "JUHPC_ROCM_HOME"), ("HDF5", "JUHPC_HDF5_HOME")] if haskey(ENV,l) && ENV[l]!=""])' 50
 
 if [ -n "${JUHPC_CUDA_HOME}" ]; then  # Set  preference for using the local CUDA runtime in a more stable way (in case the previous would not be valid anymore)
-    julia_pref 'using CUDA; CUDA.set_runtime_version!((VersionNumber(join(split(ENV[key],".")[1:2],".")) for key in ["JUHPC_CUDA_RUNTIME_VERSION"] if haskey(ENV,key) && ENV[key]!=="")...; local_toolkit=true)'
+    julia_pref 'using CUDA; CUDA.set_runtime_version!((VersionNumber(join(split(ENV[key],".")[1:2],".")) for key in ["JUHPC_CUDA_RUNTIME_VERSION"] if haskey(ENV,key) && ENV[key]!=="")...; local_toolkit=true)' 60
 fi
 
 if [ -n "${JUHPC_ROCM_HOME}" ]; then  # Set preference for using the local ROCm runtime in a more stable way (in case the previous would not be valid anymore)
-    julia_pref 'using AMDGPU; AMDGPU.ROCmDiscovery.use_artifacts!(false)'
+    julia_pref 'using AMDGPU; AMDGPU.ROCmDiscovery.use_artifacts!(false)' 70
 fi
 
 if [ -n "${JUHPC_MPI_VENDOR}" ]; then
     check_var "JUHPC_MPI_EXEC"
-    julia_pref 'using MPIPreferences; MPIPreferences.use_system_binary(mpiexec=split(ENV["JUHPC_MPI_EXEC"]), vendor=ENV["JUHPC_MPI_VENDOR"])'
+    julia_pref 'using MPIPreferences; MPIPreferences.use_system_binary(mpiexec=split(ENV["JUHPC_MPI_EXEC"]), vendor=ENV["JUHPC_MPI_VENDOR"])' 90
 elif [ -n "${JUHPC_MPI_HOME}" ]; then
     check_var "JUHPC_MPI_EXEC"
-    julia_pref 'using MPIPreferences; MPIPreferences.use_system_binary(mpiexec=split(ENV["JUHPC_MPI_EXEC"]), extra_paths=["$(ENV["JUHPC_MPI_HOME"])/lib"])'
+    julia_pref 'using MPIPreferences; MPIPreferences.use_system_binary(mpiexec=split(ENV["JUHPC_MPI_EXEC"]), extra_paths=["$(ENV["JUHPC_MPI_HOME"])/lib"])' 90
 fi
 
 if [ -n "${JUHPC_HDF5_HOME}" ]; then
@@ -191,6 +223,8 @@ fi
 
 if [ ! -s "$JULIA_PREFS" ]; then error "preferences file is missing or empty."; fi
 
+progress_bar 100 # Finalize progress bar.
+
 info "Preferences:\n$(cat "$JULIA_PREFS")" 1
 
 info "... done: preferences created."
@@ -295,7 +329,9 @@ info "... done: activate script created."
 
 if [ -n "${JUHPC_POST_INSTALL_JL}" ]; then
     info "Executing site-specific post-installation julia script (using the project where preferences were set)..."
+    progress_bar 1 # Initialize progress bar.
     julia --project="$JULIA_PREFDIR" "$JUHPC_POST_INSTALL_JL"
+    progress_bar 100 # Finalize progress bar.
     info "... done: post-installation script completed."
 fi