Merge pull request #3 from omlins/initial

Update configurations and version number extractions

Author: omlins

configs/cscs/craype_config renamed to configs/cscs/alps/gh200/craype_config

@@ -27,9 +27,11 @@ export JUHPC_ADIOS2_HOME=                                     # Used for ADIOS2.
 
 
 # Call JUHPC
+git clone https://github.com/omlins/JUHPC
+JUHPC=./JUHPC/src/juhpc
 JUHPC_SETUP_INSTALLDIR=$SCRATCH/${HOSTNAME%%-*}/juhpc_setup   # HPC setup installation environment variables must be expanded during installation.
 JULIAUP_INSTALLDIR="\$SCRATCH/\${HOSTNAME%%-*}/juliaup"       # User environment variables SCRATCH and HOSTNAME must not be expanded during uenv build, but during usage. Separate installation by HOSTNAME is required, because different hosts with different architectures can share the same file system (e.g., daint and eiger on ALPS).
-bash -l ./juhpc $JUHPC_SETUP_INSTALLDIR $JULIAUP_INSTALLDIR   # NOTE: The juhpc script must be in the current directory.
+bash -l $JUHPC $JUHPC_SETUP_INSTALLDIR $JULIAUP_INSTALLDIR
 
 
 # Activate the HPC setup environment variables

configs/cscs/daint/gpu/craype_config

@@ -0,0 +1,62 @@
+#!/bin/bash
+
+# Author: Samuel Omlin, CSCS (omlins)
+#
+# Description: Definition of site specific variables and call of JUHPC.
+# Site: ALPS:todi, Swiss National Supercomputing Centre (CSCS)
+# Base: craype
+
+
+# Load required modules (including correct CPU and GPU target modules)
+module load daint-gpu
+module switch PrgEnv-cray PrgEnv-gnu
+module load cudatoolkit craype-accel-nvidia60
+module load cray-hdf5-parallel
+module list
+
+
+# Environment variables for HPC key packages that require system libraries that require system libraries (MPI.jl, CUDA.jl, HDF5.jl and ADIOS2.jl)
+export JUHPC_CUDA_HOME=$CUDA_HOME                             # Used for CUDA.jl runtime discovery (set as CUDA_HOME in the uenv view / activate script).
+export JUHPC_CUDA_RUNTIME_VERSION=$CRAY_CUDATOOLKIT_VERSION   # Used for CUDA.jl runtime version definition (set in preferences).
+export JUHPC_ROCM_HOME=                                       # Used for AMDGPU.jl runtime discovery (set as ROCM_PATH in the uenv view / activate script).
+export JUHPC_MPI_HOME=$MPICH_DIR                              # Used for MPI.jl system binary discovery (set in preferences).
+export JUHPC_MPI_VENDOR=                                      # Used for MPI.jl system binary discovery (used to set preferences).
+export JUHPC_MPI_EXEC="srun -C gpu"                           # Used for MPI.jl exec command discovery (set in preferences). Arguments are space separated, e.g. "srun -C gpu".
+export JUHPC_HDF5_HOME=$HDF5_DIR                              # Used for HDF5.jl library discovery (set in preferences).
+export JUHPC_ADIOS2_HOME=                                     # Used for ADIOS2.jl library discovery (set as JULIA_ADIOS2_PATH in the uenv view / activate script).
+
+
+# Call JUHPC
+git clone https://github.com/omlins/JUHPC
+JUHPC=./JUHPC/src/juhpc
+JUHPC_SETUP_INSTALLDIR=$SCRATCH/${HOSTNAME%%-*}/juhpc_setup   # HPC setup installation environment variables must be expanded during installation.
+JULIAUP_INSTALLDIR="\$SCRATCH/\${HOSTNAME%%-*}/juliaup"       # User environment variables SCRATCH and HOSTNAME must not be expanded during uenv build, but during usage. Separate installation by HOSTNAME is required, because different hosts with different architectures can share the same file system (e.g., daint and eiger on ALPS).
+bash -l $JUHPC $JUHPC_SETUP_INSTALLDIR $JULIAUP_INSTALLDIR
+
+
+# Activate the HPC setup environment variables
+. $JUHPC_SETUP_INSTALLDIR/activate
+
+# Call juliaup to install juliaup and latest julia on scratch
+juliaup
+
+# Call juliaup to see its options
+juliaup
+
+# Call julia Pkg 
+julia -e 'using Pkg; Pkg.status()'
+
+# Add CUDA.jl
+julia -e 'using Pkg; Pkg.add("CUDA"); using CUDA; CUDA.versioninfo()'
+
+# Add MPI.jl
+julia -e 'using Pkg; Pkg.add("MPI"); using MPI; MPI.versioninfo()'
+
+# Add HDF5.jl
+julia -e 'using Pkg; Pkg.add("HDF5"); using HDF5; @show HDF5.has_parallel()'
+
+# Test CUDA-aware MPI
+cd ~/cudaaware
+MPICH_GPU_SUPPORT_ENABLED=1 srun -Acsstaff -C'gpu' -N2 -n2 julia cudaaware.jl
+
+# julia -e 'import Pkg; Pkg.test("MPI"; test_args=["--backend=CUDA"])'

src/juhpc

@@ -101,7 +101,7 @@ if [ -n "${JUHPC_CUDA_HOME}" ]; then  # Set preference for using the local CUDA
 
     julia --project=$JULIA_PREFDIR -e 'using Preferences; set_preferences!("CUDA_Runtime_jll", "local"=>true)'
     if [ -n "${JUHPC_CUDA_RUNTIME_VERSION}" ]; then
-        julia --project=$JULIA_PREFDIR -e 'using Preferences; v=VersionNumber(ENV["JUHPC_CUDA_RUNTIME_VERSION"]); set_preferences!("CUDA_Runtime_jll", "version"=> "$(v.major).$(v.minor)")'
+        julia --project=$JULIA_PREFDIR -e 'using Preferences; set_preferences!("CUDA_Runtime_jll", "version"=>join(split(ENV["JUHPC_CUDA_RUNTIME_VERSION"],".")[1:2],"."))'
     fi
 fi
 
@@ -117,7 +117,7 @@ if [ -n "${JUHPC_ROCM_HOME}" ]; then export ROCM_PATH=$JUHPC_ROCM_HOME; fi
 julia --project=$JULIA_PREFDIR -e '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]!=""])'
 
 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 --project=$JULIA_PREFDIR -e 'using CUDA; CUDA.set_runtime_version!((VersionNumber(ENV[key]) for key in ["JUHPC_CUDA_RUNTIME_VERSION"] if haskey(ENV,key) && ENV[key]!=="")...; local_toolkit=true)'
+    julia --project=$JULIA_PREFDIR -e '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)'
 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)
@@ -151,8 +151,8 @@ julia -e '
 println("""#!/bin/bash
 
 info() {
-    local message="$1"
-    echo -e "$JUHPC $message" >&2
+    local message="\$1"
+    echo -e "$(ENV["JUHPC"]) \$message" >&2
 }
 
 if [ ! -f $(ENV["JULIAUP_BINDIR"])/juliaup ]; then
@@ -181,6 +181,11 @@ export JULIA_DEPOT=$JULIAUP_INSTALLDIR/depot
 export ACTIVATE_SCRIPT=$JUHPC_SETUP_INSTALLDIR/activate
 
 julia -e 'println("""
+info() {
+    local message="\$1"
+    echo -e "$(ENV["JUHPC"]) \$message" >&2
+}
+info "activating HPC setup for juliaup, julia and HPC key packages requiring system libraries..."
 export PATH=$(ENV["JULIAUP_WRAPPER_BINDIR"]):$(ENV["JULIAUP_BINDIR"]):\$PATH # The wrapper must be before the juliaup bindir
 export JULIAUP_DEPOT_PATH=$(ENV["JULIAUP_DEPOT"])
 export JULIA_DEPOT_PATH=$(ENV["JULIA_DEPOT"])