From 372e49cbddf88efbe7b92b32c1ddec7aeb9d885e Mon Sep 17 00:00:00 2001 From: Roman Cattaneo <1116746+romanc@users.noreply.github.com> Date: Tue, 6 Jan 2026 10:56:40 +0100 Subject: [PATCH] refactor: use new constructor of `QuantityFactory` Prefer the new constructor of `QuantityFactor` over the deprecated call to `QuantityFactor.from_backend(...)`. This removes a bunch of deprecation warnings in tests. --- docs/physics/state.rst | 2 +- examples/notebooks/functions.py | 2 +- examples/notebooks/grid_generation.ipynb | 2 +- pace/driver.py | 6 +++--- pace/state.py | 2 +- tests/main/driver/test_diagnostics_config.py | 4 ++-- tests/main/driver/test_restart_fortran.py | 2 +- tests/main/driver/test_restart_serial.py | 2 +- tests/main/fv3core/test_dycore_baroclinic.py | 2 +- tests/main/fv3core/test_dycore_call.py | 2 +- tests/main/physics/test_integration.py | 2 +- tests/main/test_grid_init.py | 2 +- tests/mpi/test_grid_init.py | 2 +- tests/savepoint/translate/translate_driver.py | 2 +- 14 files changed, 17 insertions(+), 17 deletions(-) diff --git a/docs/physics/state.rst b/docs/physics/state.rst index e56dfb07b..e9d5e37a1 100644 --- a/docs/physics/state.rst +++ b/docs/physics/state.rst @@ -35,7 +35,7 @@ You can initialize a zero-filled PhysicsState and MicrophysicsState from other P ... tile_rank=communicator.tile.rank, ... ) - >>> quantity_factory = QuantityFactory.from_backend(sizer=sizer, backend="numpy") + >>> quantity_factory = QuantityFactory(sizer=sizer, backend="numpy") >>> physics_state = PhysicsState.init_zeros( ... quantity_factory=quantity_factory, schemes=["GFS_microphysics"] ... ) diff --git a/examples/notebooks/functions.py b/examples/notebooks/functions.py index 0c81ff584..0c1356cca 100644 --- a/examples/notebooks/functions.py +++ b/examples/notebooks/functions.py @@ -268,7 +268,7 @@ def configure_domain( tile_rank=communicator.tile.rank, ) - quantity_factory = QuantityFactory.from_backend(sizer=sizer, backend=backend) + quantity_factory = QuantityFactory(sizer=sizer, backend=backend) metric_terms = MetricTerms( quantity_factory=quantity_factory, diff --git a/examples/notebooks/grid_generation.ipynb b/examples/notebooks/grid_generation.ipynb index eb331536e..e7ab6441e 100644 --- a/examples/notebooks/grid_generation.ipynb +++ b/examples/notebooks/grid_generation.ipynb @@ -188,7 +188,7 @@ ")\n", "\n", "# useful for easily allocating distributed data storages (fields)\n", - "quantity_factory = QuantityFactory.from_backend(sizer=sizer, backend=backend)" + "quantity_factory = QuantityFactory(sizer=sizer, backend=backend)" ] }, { diff --git a/pace/driver.py b/pace/driver.py index 4760ff588..8fa464426 100644 --- a/pace/driver.py +++ b/pace/driver.py @@ -177,7 +177,7 @@ def get_grid( tile_partitioner=communicator.partitioner.tile, tile_rank=communicator.tile.rank, ) - quantity_factory = QuantityFactory.from_backend( + quantity_factory = QuantityFactory( sizer, backend=self.stencil_config.compilation_config.backend ) @@ -207,7 +207,7 @@ def get_driver_state( tile_rank=communicator.tile.rank, ) if quantity_factory is None: - quantity_factory = QuantityFactory.from_backend( + quantity_factory = QuantityFactory( sizer, backend=self.stencil_config.compilation_config.backend ) if stencil_factory is None: @@ -760,7 +760,7 @@ def _setup_factories( grid_indexing = GridIndexing.from_sizer_and_communicator( sizer=sizer, comm=communicator ) - quantity_factory = QuantityFactory.from_backend( + quantity_factory = QuantityFactory( sizer, backend=config.stencil_config.compilation_config.backend ) stencil_factory = StencilFactory( diff --git a/pace/state.py b/pace/state.py index 9caa1dc6c..d3d3b0dc1 100644 --- a/pace/state.py +++ b/pace/state.py @@ -91,7 +91,7 @@ def load_state_from_restart( tile_partitioner=communicator.partitioner.tile, tile_rank=communicator.tile.rank, ) - quantity_factory = QuantityFactory.from_backend( + quantity_factory = QuantityFactory( sizer, backend=driver_config.stencil_config.compilation_config.backend ) diff --git a/tests/main/driver/test_diagnostics_config.py b/tests/main/driver/test_diagnostics_config.py index cd0b2ca06..a84a475b9 100644 --- a/tests/main/driver/test_diagnostics_config.py +++ b/tests/main/driver/test_diagnostics_config.py @@ -42,7 +42,7 @@ def test_zselect_raises_error_if_not_3d(tmpdir): z_select=[ZSelect(level=0, names=["phis"])], ) result = config.diagnostics_factory(unittest.mock.MagicMock()) - quantity_factory = QuantityFactory.from_backend( + quantity_factory = QuantityFactory( sizer=SubtileGridSizer.from_tile_params( nx_tile=12, ny_tile=12, @@ -63,7 +63,7 @@ def test_zselect_raises_error_if_3rd_dim_not_z(tmpdir): z_select=[ZSelect(level=0, names=["foo"])], ) result = config.diagnostics_factory(unittest.mock.MagicMock()) - quantity_factory = QuantityFactory.from_backend( + quantity_factory = QuantityFactory( sizer=SubtileGridSizer.from_tile_params( nx_tile=12, ny_tile=12, diff --git a/tests/main/driver/test_restart_fortran.py b/tests/main/driver/test_restart_fortran.py index c658fc027..b355e206a 100644 --- a/tests/main/driver/test_restart_fortran.py +++ b/tests/main/driver/test_restart_fortran.py @@ -35,7 +35,7 @@ def test_state_from_fortran_restart(): tile_rank=0, ) - quantity_factory = QuantityFactory.from_backend(sizer=sizer, backend="numpy") + quantity_factory = QuantityFactory(sizer=sizer, backend="numpy") restart_dir = REPO_ROOT / "tests" / "main" / "data" / "c12_restart" ( diff --git a/tests/main/driver/test_restart_serial.py b/tests/main/driver/test_restart_serial.py index aa9fe693e..ddbed2331 100644 --- a/tests/main/driver/test_restart_serial.py +++ b/tests/main/driver/test_restart_serial.py @@ -67,7 +67,7 @@ def test_restart_save_to_disk(): tile_partitioner=partitioner.tile, tile_rank=communicator.tile.rank, ) - quantity_factory = QuantityFactory.from_backend(sizer=sizer, backend=backend) + quantity_factory = QuantityFactory(sizer=sizer, backend=backend) eta_file = Path(driver_config.grid_config.config.eta_file) ( diff --git a/tests/main/fv3core/test_dycore_baroclinic.py b/tests/main/fv3core/test_dycore_baroclinic.py index afebd877e..c3f214e1b 100644 --- a/tests/main/fv3core/test_dycore_baroclinic.py +++ b/tests/main/fv3core/test_dycore_baroclinic.py @@ -112,7 +112,7 @@ def setup_dycore( grid_indexing = GridIndexing.from_sizer_and_communicator( sizer=sizer, comm=communicator ) - quantity_factory = QuantityFactory.from_backend(sizer=sizer, backend=backend) + quantity_factory = QuantityFactory(sizer=sizer, backend=backend) eta_file = "NDSL/tests/data/eta/eta79.nc" metric_terms = MetricTerms( quantity_factory=quantity_factory, diff --git a/tests/main/fv3core/test_dycore_call.py b/tests/main/fv3core/test_dycore_call.py index e41f69726..e797828f2 100644 --- a/tests/main/fv3core/test_dycore_call.py +++ b/tests/main/fv3core/test_dycore_call.py @@ -96,7 +96,7 @@ def setup_dycore() -> Tuple[DynamicalCore, DycoreState, Timer]: grid_indexing = GridIndexing.from_sizer_and_communicator( sizer=sizer, comm=communicator ) - quantity_factory = QuantityFactory.from_backend(sizer=sizer, backend=backend) + quantity_factory = QuantityFactory(sizer=sizer, backend=backend) eta_file = Path("NDSL/tests/data/eta/eta79.nc") metric_terms = MetricTerms( quantity_factory=quantity_factory, diff --git a/tests/main/physics/test_integration.py b/tests/main/physics/test_integration.py index 6e215ea5d..ff75d74fa 100644 --- a/tests/main/physics/test_integration.py +++ b/tests/main/physics/test_integration.py @@ -50,7 +50,7 @@ def setup_physics(): grid_indexing = GridIndexing.from_sizer_and_communicator( sizer=sizer, comm=communicator ) - quantity_factory = QuantityFactory.from_backend(sizer=sizer, backend=backend) + quantity_factory = QuantityFactory(sizer=sizer, backend=backend) dace_config = DaceConfig( communicator=communicator, backend=backend, diff --git a/tests/main/test_grid_init.py b/tests/main/test_grid_init.py index 32f05aed2..2c28a217a 100644 --- a/tests/main/test_grid_init.py +++ b/tests/main/test_grid_init.py @@ -25,7 +25,7 @@ def get_cube_comm(layout, rank: int): def get_quantity_factory(layout, nx_tile, ny_tile, nz): nx = nx_tile // layout[0] ny = ny_tile // layout[1] - return QuantityFactory.from_backend( + return QuantityFactory( sizer=SubtileGridSizer.from_tile_params( nx_tile=nx, ny_tile=ny, diff --git a/tests/mpi/test_grid_init.py b/tests/mpi/test_grid_init.py index 7e0ab41ac..e472ab88f 100644 --- a/tests/mpi/test_grid_init.py +++ b/tests/mpi/test_grid_init.py @@ -27,7 +27,7 @@ def get_cube_comm(layout, comm: MPIComm): def get_quantity_factory(layout, nx_tile, ny_tile, nz): nx = nx_tile // layout[0] ny = ny_tile // layout[1] - return QuantityFactory.from_backend( + return QuantityFactory( sizer=SubtileGridSizer.from_tile_params( nx=nx, ny=ny, nz=nz, n_halo=3, layout=(1, 1) ), diff --git a/tests/savepoint/translate/translate_driver.py b/tests/savepoint/translate/translate_driver.py index f3499c56d..231f2f921 100644 --- a/tests/savepoint/translate/translate_driver.py +++ b/tests/savepoint/translate/translate_driver.py @@ -36,7 +36,7 @@ def compute_parallel(self, inputs, communicator): tile_rank=communicator.tile.rank, ) - quantity_factory = QuantityFactory.from_backend( + quantity_factory = QuantityFactory( sizer, backend=self.stencil_config.compilation_config.backend ) physics_state = PhysicsState.init_zeros(