Skip to content

Update interface to match changes #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
indiamai merged 5 commits into from
Oct 31, 2025
Merged

Update interface to match changes #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a5fcf92
change topological dimension
indiamai Oct 24, 2025
36765d0
remove ufl dependence from ci
indiamai Oct 24, 2025
952ef8d
change base container
indiamai Oct 24, 2025
e375e30
cellname hidden
indiamai Oct 31, 2025
fc77fb2
Add env var to makefile
indiamai Oct 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions .github/workflows/setup_repos.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ git checkout indiamai/integrate_fuse
git status
python3 -m pip install --break-system-packages -e .

/usr/bin/git config --global --add safe.directory ~
cd ~
git clone https://github.com/firedrakeproject/ufl.git
/usr/bin/git config --global --add safe.directory ~/ufl
cd ufl
git fetch
git checkout indiamai/integrate-fuse
git status
python3 -m pip install --break-system-packages -e .
#/usr/bin/git config --global --add safe.directory ~
#cd ~
#git clone https://github.com/firedrakeproject/ufl.git
#/usr/bin/git config --global --add safe.directory ~/ufl
#cd ufl
#git fetch
#git checkout indiamai/integrate-fuse
#git status
#python3 -m pip install --break-system-packages -e .
16 changes: 3 additions & 13 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ jobs:
# Run on the Github hosted runner
runs-on: ubuntu-latest
container:
image: firedrakeproject/firedrake-vanilla-default:latest
#image: firedrakeproject/firedrake-vanilla-default:latest
image: firedrakeproject/firedrake-vanilla-default:dev-main
# Steps represent a sequence of tasks that will be executed as
# part of the jobs
steps:
Expand Down Expand Up @@ -44,17 +45,6 @@ jobs:
git checkout indiamai/integrate_fuse
git status
python3 -m pip install --break-system-packages -e .
- name: Checkout correct UFL branch
run: |
/usr/bin/git config --global --add safe.directory ~
cd ~
git clone https://github.com/firedrakeproject/ufl.git
/usr/bin/git config --global --add safe.directory ~/ufl
cd ufl
git fetch
git checkout indiamai/integrate-fuse
git status
python3 -m pip install --break-system-packages -e .
- name: Run tests
run: |
pip list
Expand Down Expand Up @@ -104,4 +94,4 @@ jobs:
message: ${{ env.total }}%
minColorRange: 50
maxColorRange: 90
valColorRange: ${{ env.total }}
valColorRange: ${{ env.total }}
12 changes: 6 additions & 6 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ lint:

test_examples:
@echo " Running examples"
@python3 -m pytest test/test_2d_examples_docs.py
@python3 -m pytest test/test_3d_examples_docs.py
@FIREDRAKE_USE_FUSE=1 python3 -m pytest test/test_2d_examples_docs.py
@FIREDRAKE_USE_FUSE=1 python3 -m pytest test/test_3d_examples_docs.py

tests:
@echo " Running all tests"
@python3 -m coverage run -p -m pytest -rx test
@FIREDRAKE_USE_FUSE=1 python3 -m coverage run -p -m pytest -rx test

coverage:
@python3 -m coverage combine
Expand All @@ -34,13 +34,13 @@ coverage:
test_cells:
@echo " Running all cell comparison tests"
@firedrake-clean
@python3 -m pytest -rPx --run-cleared test/test_cells.py::test_ref_els[expect0]
@FIREDRAKE_USE_FUSE=1 python3 -m pytest -rPx --run-cleared test/test_cells.py::test_ref_els[expect0]
@firedrake-clean
@python3 -m pytest -rPx --run-cleared test/test_cells.py::test_ref_els[expect1]
@FIREDRAKE_USE_FUSE=1 python3 -m pytest -rPx --run-cleared test/test_cells.py::test_ref_els[expect1]

clean:
@(cd docs/ && make clean)

prepush: lint tests
@rm .coverage.*
make clean docs
make clean docs
2 changes: 1 addition & 1 deletion fuse/cells.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1074,7 +1074,7 @@ def __init__(self, cell, name=None):
super(CellComplexToUFL, self).__init__(name)

def to_fiat(self):
return self.cell_complex.to_fiat(name=self.cellname())
return self.cell_complex.to_fiat(name=self.cellname)

def __repr__(self):
return super(CellComplexToUFL, self).__repr__()
Expand Down
2 changes: 1 addition & 1 deletion test/test_convert_to_fiat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,7 +470,7 @@ def test_helmholtz_3d(elem_gen, elem_code, deg, conv_rate):

def helmholtz_solve(V, mesh):
# Define variational problem
dim = mesh.ufl_cell().topological_dimension()
dim = mesh.ufl_cell().topological_dimension
u = TrialFunction(V)
v = TestFunction(V)
f = Function(V)
Expand Down