wip

Author: Olender

.github/workflows/build_cuda.yml

@@ -84,7 +84,7 @@ jobs:
           git clone --depth 1 --branch $(python3 ./firedrake-repo/scripts/firedrake-configure --show-petsc-version) https://gitlab.com/petsc/petsc.git
           cd petsc
           # TODO update configure file
-          ./configure --with-make-np=8 --with-c2html=0 --with-debugging=0 --with-fortran-bindings=0 --with-shared-libraries=1 --with-strict-petscerrorcode PETSC_ARCH=arch-firedrake-default --COPTFLAGS=-O3 -march=native -mtune=native --CXXOPTFLAGS=-O3 -march=native -mtune=native --FOPTFLAGS=-O3 -march=native -mtune=native --download-bison --download-fftw --download-hdf5 --download-hwloc --download-metis --download-mumps --download-netcdf --download-pnetcdf --download-ptscotch --download-scalapack --download-suitesparse --download-superlu_dist --download-zlib --download-hypre --with-cuda --with-cuda-dir=/usr/local/cuda CUDAPPFLAGS=-Wno-deprecated-gpu-targets --download-openmpi --download-slepc
+          ./configure --with-make-np=8 --with-c2html=0 --with-debugging=0 --with-fortran-bindings=0 --with-shared-libraries=1 --with-strict-petscerrorcode PETSC_ARCH=arch-firedrake-default --COPTFLAGS=-O3 -march=native -mtune=native --CXXOPTFLAGS=-O3 -march=native -mtune=native --FOPTFLAGS=-O3 -march=native -mtune=native --download-bison --download-fftw --download-hdf5 --download-hwloc --download-metis --download-mumps --download-netcdf --download-pnetcdf --download-ptscotch --download-scalapack --download-suitesparse --download-superlu_dist --download-zlib --with-cuda --with-cuda-dir=/usr/local/cuda CUDAPPFLAGS=-Wno-deprecated-gpu-targets --download-openmpi --download-slepc
           make PETSC_DIR=/__w/firedrake/firedrake/petsc PETSC_ARCH=arch-firedrake-default all
           export PETSC_DIR=/__w/firedrake/firedrake/petsc
           export PETSC_ARCH=arch-firedrake-default
@@ -95,7 +95,6 @@ jobs:
           export PATH=$PETSC_DIR/$PETSC_ARCH/bin:$PATH
           export SLEPC_DIR=$PETSC_DIR/$PETSC_ARCH
           export HDF5_DIR=$PETSC_DIR/$PETSC_ARCH
-          export HYPRE_DIR=$PETSC_DIR/$PETSC_ARCH
           export HDF5_MPI=ON
           make PETSC_DIR=/__w/firedrake/firedrake/petsc PETSC_ARCH=arch-firedrake-default check MPIEXEC="mpiexec --allow-run-as-root"
 
@@ -113,7 +112,6 @@ jobs:
           export PATH=$PETSC_DIR/$PETSC_ARCH/bin:$PATH
           export SLEPC_DIR=$PETSC_DIR/$PETSC_ARCH
           export HDF5_DIR=$PETSC_DIR/$PETSC_ARCH
-          export HYPRE_DIR=$PETSC_DIR/$PETSC_ARCH
           export HDF5_MPI=ON
           python3 -m venv venv
           . venv/bin/activate

tests/firedrake/conftest.py

@@ -149,16 +149,24 @@ def pytest_configure(config):
         "markers",
         "skipcuda: mark as skipped if CUDA is not available"
     )
+    config.addinivalue_line(
+        "markers",
+        "skipgpu: mark as skipped if a GPU enabled PETSC was installed"
+    )
 
 
 def pytest_collection_modifyitems(session, config, items):
     from firedrake.utils import complex_mode, SLATE_SUPPORTS_COMPLEX
 
     try:
         get_petsc_variables()["CUDA_VERSION"]
+        # They look like the same thing (but opposite) for now, but they are not.
+        # This will skip some nongpurelated tests (hypre) if a gpu-aware petsc was installed.
         cuda_unavailable = False
+        gpu_based_petsc = True
     except:
         cuda_unavailable = True
+        gpu_based_petsc = False
 
     for item in items:
         if complex_mode:
@@ -173,6 +181,10 @@ def pytest_collection_modifyitems(session, config, items):
         if cuda_unavailable:
             if item.get_closest_marker("skipcuda") is not None:
                 item.add_marker(pytest.mark.skip(reason="CUDA not available"))
+        
+        if gpu_based_petsc:
+            if item.get_closest_marker("skipgpu") is not None:
+                item.add_marker(pytest.mark.skip(reason="Test skipped on gpu-based install"))
 
         for dep, marker, reason in dependency_skip_markers_and_reasons:
             if _skip_test_dependency(dep) and item.get_closest_marker(marker) is not None:

tests/firedrake/demos/test_demos_run.py

@@ -117,6 +117,7 @@ def _exec_file(py_file):
 
 
 @pytest.mark.skipcomplex
+@pytest.mark.skipgpu
 @pytest.mark.parametrize("demo", SERIAL_DEMOS, ids=["/".join(d.loc) for d in SERIAL_DEMOS])
 def test_serial_demo(demo, env, monkeypatch, tmpdir, skip_dependency):
     _maybe_skip_demo(demo, skip_dependency)
@@ -130,6 +131,7 @@ def test_serial_demo(demo, env, monkeypatch, tmpdir, skip_dependency):
 
 @pytest.mark.parallel(2)
 @pytest.mark.skipcomplex
+@pytest.mark.skipgpu
 @pytest.mark.parametrize("demo", PARALLEL_DEMOS, ids=["/".join(d.loc) for d in PARALLEL_DEMOS])
 def test_parallel_demo(demo, env, monkeypatch, tmpdir, skip_dependency):
     _maybe_skip_demo(demo, skip_dependency)