Merge branch 'develop' into f/env-location

share/spack/gitlab/cloud_pipelines/stacks/aws-isc-aarch64/spack.yaml

@@ -70,12 +70,6 @@ spack:
     # - intel-oneapi-compilers@2022.1
     # - nvhpc
 
-  - cuda_specs:
-    # Depends on ctffind which embeds fsincos (x86-specific asm) within code. Will not build on ARM
-    #- relion +cuda cuda_arch=70
-    - raja +cuda cuda_arch=70
-    - mfem +cuda cuda_arch=70
-
   - app_specs:
     - bwa
 # Depends on simde which requires newer compiler?
@@ -133,11 +127,6 @@ spack:
 
   specs:
 
-  - matrix:
-    - - $cuda_specs
-    - - $compiler
-    - - $target
-
   - matrix:
     - - $app_specs
     - - $compiler

share/spack/gitlab/cloud_pipelines/stacks/build_systems/spack.yaml

@@ -16,7 +16,6 @@ spack:
     - default_specs:
       - lz4  # MakefilePackage
       - mpich~fortran  # AutotoolsPackage
-      - tut  # WafPackage
       - py-setuptools  # PythonPackage
       - openjpeg  # CMakePackage
       - r-rcpp  # RPackage

share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml

@@ -178,6 +178,7 @@ spack:
   - mfem +cuda cuda_arch=80
   - papi +cuda
   - petsc +cuda cuda_arch=80
+  - py-torch +cuda cuda_arch=80
   - raja +cuda cuda_arch=80
   - slate +cuda cuda_arch=80
   - slepc +cuda cuda_arch=80

share/spack/gitlab/cloud_pipelines/stacks/radiuss-aws-aarch64/spack.yaml

@@ -30,18 +30,12 @@ spack:
     - ascent
     - blt
     - caliper
-    - caliper +cuda cuda_arch=70
     - camp
-    - camp +cuda
     - chai
-    - chai +cuda +raja
     - mfem
     - mfem +superlu-dist+petsc+sundials
-    - mfem +cuda cuda_arch=70 ^hypre+cuda
     - raja
-    - raja +cuda cuda_arch=70
     - umpire
-    - umpire +cuda
 
   - compiler:
     - '%gcc@7.3.1'

share/spack/qa/run-unit-tests

@@ -46,21 +46,35 @@ $coverage_run $(which spack) python -c "import spack.pkg.builtin.mpileaks; repr(
 #-----------------------------------------------------------
 # Run unit tests with code coverage
 #-----------------------------------------------------------
-if [[ "$ONLY_PACKAGES" == "true" ]]; then
-  echo "ONLY PACKAGE RECIPES CHANGED [running only package sanity]"
-  export PYTEST_ADDOPTS='-k "test_all_virtual_packages_have_default_providers" -m "not maybeslow"'
-elif [[ "$SPACK_TEST_SOLVER" == "original" ]]; then
+if [[ "$SPACK_TEST_SOLVER" == "original" ]]; then
   echo "ORIGINAL CONCRETIZER [skipping slow unit tests]"
   export PYTEST_ADDOPTS='-m "not maybeslow"'
 fi
 
-$coverage_run $(which spack) unit-test -x --verbose
+# Check if xdist is available
+if python -m pytest --trace-config 2>&1 | grep xdist; then
+  export PYTEST_ADDOPTS="$PYTEST_ADDOPTS --dist loadfile --tx '${SPACK_TEST_PARALLEL:=3}*popen//python=./bin/spack-tmpconfig python -u ./bin/spack python'"
+fi
+
+# We are running pytest-cov after the addition of pytest-xdist, since it integrates
+# other pugins for pytest automatically. We still need to use "coverage" explicitly
+# for the commands above.
+#
+# There is a need to pass the configuration file explicitly due to a bug:
+# https://github.com/pytest-dev/pytest-cov/issues/243
+# https://github.com/pytest-dev/pytest-cov/issues/237
+# where it seems that otherwise the configuration file might not be located by subprocesses
+# in some, not better specified, cases.
+if [[ "$UNIT_TEST_COVERAGE" == "true" ]]; then
+  $(which spack) unit-test -x --verbose --cov --cov-config=pyproject.toml
+else
+  $(which spack) unit-test -x --verbose
+fi
+
+
 
 bash "$QA_DIR/test-env-cfg.sh"
 
 # Delete the symlink going from ./lib/spack/docs/_spack_root back to
 # the initial directory, since it causes ELOOP errors with codecov/actions@2
-if [[ "$COVERAGE" == "true" ]]; then
-  rm lib/spack/docs/_spack_root
-fi
-
+rm lib/spack/docs/_spack_root

share/spack/spack-completion.bash

@@ -1568,7 +1568,7 @@ _spack_pydoc() {
 _spack_python() {
     if $list_options
     then
-        SPACK_COMPREPLY="-h --help -V --version -c -i -m --path"
+        SPACK_COMPREPLY="-h --help -V --version -c -u -i -m --path"
     else
         SPACK_COMPREPLY=""
     fi