Merge remote-tracking branch 'origin/develop' into mccoords_abstraction

tests/test_automation/github-actions/ci/run_step.sh

@@ -31,6 +31,15 @@ case "$1" in
       ;; 
     esac
 
+    if [[ "${GH_JOBNAME}" =~ (-CUDA) ]]
+    then
+      echo "Set CUDACXX CMake environment variable to nvcc standard location"
+      export CUDACXX=/usr/local/cuda/bin/nvcc
+
+      # Make current environment variables available to subsequent steps
+      echo "CUDACXX=/usr/local/cuda/bin/nvcc" >> $GITHUB_ENV
+    fi 
+
     # Sanitizer
     case "${GH_JOBNAME}" in
       *"ASan"*)
@@ -267,7 +276,8 @@ case "$1" in
       echo "Enabling OpenMPI oversubscription"
       export OMPI_MCA_rmaps_base_oversubscribe=1
       export OMPI_MCA_hwloc_base_binding_policy=none
-      if [[ "$HOST_NAME" =~ (sulfur) ]]
+
+      if [[ "$HOST_NAME" =~ (sulfur) || "$HOST_NAME" =~ (nitrogen) ]]
       then
         echo "Set the management layer to ucx"
         export OMPI_MCA_pml=ucx