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

compiler: Concretize SubDimensions to same object across repeated calls to concretize_subdims #2509

Draft
wants to merge 5 commits into
base: main
Choose a base branch
from
+34 −7
Draft

compiler: Concretize SubDimensions to same object across repeated calls to concretize_subdims #2509

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6fcfa0d
compiler: Concretize SubDimensions to same object across repeated cal…
ZoeLeibowitz Jan 6, 2025
5e12392
misc: Fix ascent import
ZoeLeibowitz Jan 6, 2025
81a28e7
misc: Update scipy requirements and edit test_repeat_concretization
ZoeLeibowitz Jan 6, 2025
1017e63
misc: Try/except for ascent import
ZoeLeibowitz Jan 7, 2025
6835b2b
compiler: SubDimension concretisation now uses Thickness concretisation
EdCaunt Jan 7, 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
Prev Previous commit
Next Next commit
Loading
Loading status checks…
misc: Update scipy requirements and edit test_repeat_concretization
@ZoeLeibowitz
ZoeLeibowitz committed Jan 6, 2025
commit 81a28e7f6225b9c8f36e4f4654ea385d2f73d2a0
2 changes: 1 addition & 1 deletion requirements-optional.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
matplotlib
pyrevolve==2.2.4
scipy
scipy>=1.13.0
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's too restrictive, it's a very new version, would wrap the import in try/except to handle different version import path

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah sorry jsut saw that

distributed
2 changes: 1 addition & 1 deletion requirements-testing.txt
View file
Original file line number Diff line number Diff line change
@@ -4,5 +4,5 @@ pytest-cov
codecov
flake8>=2.1.0
nbval
scipy
scipy>=1.13.0
pooch; python_version >= "3.8"
2 changes: 1 addition & 1 deletion tests/test_dimension.py
View file
Original file line number Diff line number Diff line change
@@ -2070,7 +2070,7 @@ def test_repeat_concretization(self):
ix = SubDimension.middle('ix', x, 2, 2)

u = Function(name='u', grid=grid)
eq = Eq(u, ix.ltkn)
eq = Eq(u, ix + ix.ltkn + ix.rtkn)

kwargs = {'sregistry': SymbolRegistry(), 'concretize_mapper': {}}