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

Jump to bottom

Fix conda script and work around #344 #345

Merged
merged 2 commits into from
Sep 21, 2022
Merged

Fix conda script and work around #344 #345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4bf71e3
Ensure pip versions of jaxlib/jax installed
Sep 21, 2022
a217ee6
Workaround for #344
Sep 21, 2022
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 misc/conda/make_conda_env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ EOF
)
# Requirements that cannot be installed via conda (i.e. have to use pip)
NOCONDA=$(cat <<-EOF
bm3d bm4d faculty-sphinx-theme py2jn colour_demosaicing ray[tune]
flax bm3d bm4d faculty-sphinx-theme py2jn colour_demosaicing ray[tune]
EOF
)

Expand Down
4 changes: 4 additions & 0 deletions scico/test/linop/test_radon_svmbir.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
BIG_INPUT_OFFSET_RANGE = (0, 3)
SMALL_INPUT_OFFSET_RANGE = (0, 0.1)

device = jax.devices()[0]


def make_im(Nx, Ny, is_3d=True):
x, y = snp.meshgrid(snp.linspace(-1, 1, Nx), snp.linspace(-1, 1, Ny))
Expand Down Expand Up @@ -147,6 +149,7 @@ def test_adjoint(
adjoint_test(A)


@pytest.mark.skipif(device.platform != "cpu", reason="test hangs on gpu")
@pytest.mark.parametrize(
"Nx, Ny, num_angles, num_channels, dist_source_detector, magnification", (SMALL_INPUT,)
)
Expand Down Expand Up @@ -191,6 +194,7 @@ def test_prox(
prox_test(v, f, f.prox, alpha=0.25, rtol=5e-4)


@pytest.mark.skipif(device.platform != "cpu", reason="test hangs on gpu")
@pytest.mark.parametrize(
"Nx, Ny, num_angles, num_channels, dist_source_detector, magnification", (SMALL_INPUT,)
)
Expand Down