Skip to content

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

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

Draft
wants to merge 5 commits into
base: main
Choose a base branch
from
Draft

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

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion requirements-optional.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
matplotlib
pyrevolve==2.2.4
scipy>=1.13.0
scipy
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 is better to add an upper bound:

e.g. <=

and then (if needed) do what @mloubout did here (?):

dee09dd

Copy link
Contributor

Choose a reason for hiding this comment

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

keep lower bound ofc

distributed
2 changes: 1 addition & 1 deletion requirements-testing.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ pytest-cov
codecov
flake8>=2.1.0
nbval
scipy>=1.13.0
scipy
pooch; python_version >= "3.8"
5 changes: 4 additions & 1 deletion tests/test_builtins.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import pytest
import numpy as np
from scipy.ndimage import gaussian_filter
from scipy.datasets import ascent
try:
from scipy.datasets import ascent
except ImportError:
from scipy.misc import ascent

from devito import ConditionalDimension, Grid, Function, TimeFunction, switchconfig
from devito.builtins import (assign, norm, gaussian_smooth, initialize_function,
Expand Down
Loading