From 141ceb0045d1ac4944c2815a8fc17054de36d172 Mon Sep 17 00:00:00 2001 From: Naman Gera Date: Mon, 11 Nov 2024 14:06:03 +0000 Subject: [PATCH] Add mpi4py in the env --- conda/environment.yml | 1 + tests/test_httomolibgpu.py | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/conda/environment.yml b/conda/environment.yml index eace17d..700295a 100644 --- a/conda/environment.yml +++ b/conda/environment.yml @@ -5,6 +5,7 @@ channels: dependencies: - conda-forge::pyyaml - conda-forge::tomopy=1.15 + - conda-forge::mpi4py - httomo::httomolib=2.1.2 - httomo::httomolibgpu=2.1.2 - httomo::tomobar diff --git a/tests/test_httomolibgpu.py b/tests/test_httomolibgpu.py index 2153de2..911b47d 100644 --- a/tests/test_httomolibgpu.py +++ b/tests/test_httomolibgpu.py @@ -17,8 +17,8 @@ httomolibgpu = pytest.importorskip("httomolibgpu") import cupy as cp -from httomo.methods_database.query import get_method_info -from httomo.utils import OutputRef +from httomo_backends.methods_database.query import get_method_info +from httomo_backends.utils import OutputRef from httomolibgpu.misc.morph import data_resampler, sino_360_to_180 @@ -35,12 +35,12 @@ from httomolibgpu.recon.algorithm import FBP, SIRT, CGLS from httomolibgpu.misc.rescale import rescale_to_int -from httomo.methods_database.packages.external.httomolibgpu.supporting_funcs.misc.morph import * -from httomo.methods_database.packages.external.httomolibgpu.supporting_funcs.prep.phase import * -from httomo.methods_database.packages.external.httomolibgpu.supporting_funcs.prep.stripe import * -from httomo.methods_database.packages.external.httomolibgpu.supporting_funcs.recon.algorithm import * -from httomo.methods_database.packages.external.httomolibgpu.supporting_funcs.misc.rescale import * -from httomo.methods_database.packages.external.httomolibgpu.supporting_funcs.prep.normalize import * +from httomo_backends.methods_database.backends.httomolibgpu.supporting_funcs.misc.morph import * +from httomo_backends.methods_database.backends.httomolibgpu.supporting_funcs.prep.phase import * +from httomo_backends.methods_database.backends.httomolibgpu.supporting_funcs.prep.stripe import * +from httomo_backends.methods_database.backends.httomolibgpu.supporting_funcs.recon.algorithm import * +from httomo_backends.methods_database.backends.httomolibgpu.supporting_funcs.misc.rescale import * +from httomo_backends.methods_database.backends.httomolibgpu.supporting_funcs.prep.normalize import * from tests.testing_utils import make_test_method