Merge remote-tracking branch 'upstream/main' into JHopeCollins/upstre…

…am-update
firedrakeproject · Nov 30, 2023 · fa06f13 · fa06f13
2 parents 3f337c8 + 3fc1763
commit fa06f13
Show file tree

Hide file tree

Showing 12 changed files with 128 additions and 167 deletions.
diff --git a/.github/workflows/fenicsx-tests.yml b/.github/workflows/fenicsx-tests.yml
@@ -59,11 +59,6 @@ jobs:
       PETSC_ARCH: linux-gnu-complex128-32
       OMPI_ALLOW_RUN_AS_ROOT: 1
       OMPI_ALLOW_RUN_AS_ROOT_CONFIRM: 1
-      OMPI_MCA_rmaps_base_oversubscribe: 1
-      OMPI_MCA_plm: isolated
-      OMPI_MCA_btl_vader_single_copy_mechanism: none
-      OMPI_MCA_mpi_yield_when_idle: 1
-      OMPI_MCA_hwloc_base_binding_policy: none
 
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/tsfc-tests.yml b/.github/workflows/tsfc-tests.yml
@@ -32,14 +32,14 @@ jobs:
         with:
           path: ./tsfc
           repository: firedrakeproject/tsfc
-          ref: mscroggs/newfl-legacy2
+          ref: master
       - name: Install tsfc
         run: |
           cd tsfc
           pip install -r requirements-ext.txt
           pip install git+https://github.com/coneoproject/COFFEE.git#egg=coffee
           pip install git+https://github.com/firedrakeproject/fiat.git#egg=fenics-fiat
-          pip install git+https://github.com/FInAT/FInAT.git@mscroggs/ufl-elements
+          pip install git+https://github.com/FInAT/FInAT.git#egg=finat
           pip install git+https://github.com/firedrakeproject/loopy.git#egg=loopy
           pip install .[ci]
           pip install pytest