Skip to content
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

Rename redefining fe to fuse #3960

Merged
merged 13 commits into from
Jan 11, 2025
Merged

Rename redefining fe to fuse #3960

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
3fdd04d
Rename
indiamai Jan 9, 2025
673081b
change repo for package
indiamai Jan 9, 2025
7009c31
DROP BEFORE MERGE
indiamai Jan 9, 2025
1b70acc
DROP BEFORE MERGEfix typo
indiamai Jan 9, 2025
22a2e07
DROP BEFORE MERGEfix typo part 2
indiamai Jan 9, 2025
fc7ce2c
Add fuse to pyproject
indiamai Jan 9, 2025
f7a89e7
remember fuse has a different pip install name
indiamai Jan 9, 2025
c8c2af6
dev version of fuse element
indiamai Jan 9, 2025
83afc91
try removing link
indiamai Jan 9, 2025
a4ee6af
update fuse dependency
indiamai Jan 9, 2025
746e6d1
lint
indiamai Jan 9, 2025
7312219
DROP BEFORE MERGE change fiat package branch
indiamai Jan 10, 2025
f418ea3
DROP BEFORE MERGE
indiamai Jan 10, 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
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ jobs:
--install defcon \
--install gadopt \
--install asQ \
--package-branch fiat indiamai/union_different_coeff_size \
--package-branch redefining_fe indiamai/dual_sets \
--package-branch fiat indiamai/integrate_fuse \
--package-branch fuse main \
|| (cat firedrake-install.log && /bin/false)
- name: Install test dependencies
run: |
Expand Down
2 changes: 1 addition & 1 deletion firedrake/mesh.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
from firedrake.adjoint_utils import MeshGeometryMixin
from pyadjoint import stop_annotating
import gem
from redefining_fe import constructCellComplex
from fuse import constructCellComplex

try:
import netgen
Expand Down
1 change: 1 addition & 0 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ dependencies = [
"pyadjoint-ad @ git+https://github.com/dolfin-adjoint/pyadjoint.git",
"loopy @ git+https://github.com/firedrakeproject/loopy.git@main",
"libsupermesh @ git+https://github.com/firedrakeproject/libsupermesh.git",
"fuse-element @ git+https://github.com/indiamai/fuse.git",
]
classifiers = [
"Development Status :: 5 - Production/Stable",
Expand Down
2 changes: 1 addition & 1 deletion requirements-git.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ git+https://github.com/firedrakeproject/loopy.git@main#egg=loopy
git+https://github.com/firedrakeproject/pytest-mpi.git@main#egg=pytest-mpi
git+https://github.com/firedrakeproject/petsc.git@firedrake#egg=petsc
git+https://github.com/firedrakeproject/libsupermesh.git#egg=libsupermesh
git+https://github.com/indiamai/redefining_fe.git#egg=redefining_fe
git+https://github.com/indiamai/fuse.git#egg=fuse
Loading