Skip to content

Commit 82f2537

Browse files
romancromanc
authored
refactor: use new constructor of QuantityFactory (#79)
Prefer the new constructor of `QuantityFactory` over the deprecated call to `QuantityFactory.from_backend(...)`. This removes a bunch of deprecation warnings in tests. See NOAA-GFDL/NDSL#228 for context. Co-authored-by: Roman Cattaneo <[email protected]>
1 parent 9f495eb commit 82f2537

23 files changed

+80
-134
lines changed

‎examples/notebook/test_physics.ipynb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125
")\n",
126126
"\n",
127127
"# useful for easily allocating distributed data storages (fields)\n",
128-
"quantity_factory = QuantityFactory.from_backend(sizer=sizer, backend=backend)\n",
128+
"quantity_factory = QuantityFactory(sizer=sizer, backend=backend)\n",
129129
"\n",
130130
"compilation_config = CompilationConfig(backend=backend, communicator=cs_communicator)\n",
131131
"\n",

‎examples/notebook/test_rad.ipynb‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
},
8383
{
8484
"cell_type": "code",
85-
"execution_count": 5,
85+
"execution_count": null,
8686
"id": "aed95766-57de-4d98-bc32-13473065140f",
8787
"metadata": {},
8888
"outputs": [],
@@ -102,9 +102,7 @@
102102
" tile_partitioner=communicator.partitioner.tile,\n",
103103
" tile_rank=communicator.tile.rank,\n",
104104
")\n",
105-
"quantity_factory = QuantityFactory.from_backend(\n",
106-
" sizer, backend=\"numpy\"\n",
107-
")"
105+
"quantity_factory = QuantityFactory(sizer, backend=\"numpy\")"
108106
]
109107
},
110108
{

‎examples/notebook/test_raddriver.ipynb‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
},
6969
{
7070
"cell_type": "code",
71-
"execution_count": 4,
71+
"execution_count": null,
7272
"id": "b2625312-8234-4ed3-be7d-bd4118b75489",
7373
"metadata": {},
7474
"outputs": [],
@@ -88,9 +88,7 @@
8888
" tile_partitioner=communicator.partitioner.tile,\n",
8989
" tile_rank=communicator.tile.rank,\n",
9090
")\n",
91-
"quantity_factory = QuantityFactory.from_backend(\n",
92-
" sizer, backend=\"numpy\"\n",
93-
")"
91+
"quantity_factory = QuantityFactory(sizer, backend=\"numpy\")"
9492
]
9593
},
9694
{

‎tests/integration/test_sfc.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ def setup_infrastructure(nx: Int, ny: Int, nz: Int, nzsoil: Int, etafile: Path):
128128
tile_partitioner=communicator.partitioner.tile,
129129
tile_rank=communicator.tile.rank,
130130
)
131-
quantity_factory = QuantityFactory.from_backend(sizer, backend="numpy")
131+
quantity_factory = QuantityFactory(sizer, backend="numpy")
132132

133133
soil_sizer = SubtileGridSizer.from_tile_params(
134134
nx_tile=nx,
@@ -140,7 +140,7 @@ def setup_infrastructure(nx: Int, ny: Int, nz: Int, nzsoil: Int, etafile: Path):
140140
tile_partitioner=communicator.partitioner.tile,
141141
tile_rank=communicator.tile.rank,
142142
)
143-
qf_soil = QuantityFactory.from_backend(soil_sizer, backend="numpy")
143+
qf_soil = QuantityFactory(soil_sizer, backend="numpy")
144144

145145
comconf = CompilationConfig()
146146
comconf.validate_args = False

‎tests/savepoint/translate/translate_atmos_phy_statein.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ def __init__(self, grid, config, stencil_factory):
6060
layout=self.config.layout,
6161
)
6262

63-
self.quantity_factory = QuantityFactory.from_backend(
64-
sizer, self.stencil_factory.backend
63+
self.quantity_factory = QuantityFactory(
64+
sizer, backend=self.stencil_factory.backend
6565
)
6666
self.compute_func = self.stencil_factory.from_origin_domain(
6767
atmos_phys_driver_statein,

‎tests/savepoint/translate/translate_cloud_frac.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -346,8 +346,8 @@ def __init__(
346346
layout=self.config.layout,
347347
)
348348

349-
self.quantity_factory = QuantityFactory.from_backend(
350-
sizer, self.stencil_factory.backend
349+
self.quantity_factory = QuantityFactory(
350+
sizer, backend=self.stencil_factory.backend
351351
)
352352

353353
def compute(self, inputs):

‎tests/savepoint/translate/translate_cumulative_shalconv.py‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3405,8 +3405,8 @@ def __init__(self, grid, config, stencil_factory):
34053405
layout=self.config.layout,
34063406
)
34073407

3408-
self.quantity_factory = QuantityFactory.from_backend(
3409-
sizer, self.stencil_factory.backend
3408+
self.quantity_factory = QuantityFactory(
3409+
sizer, backend=self.stencil_factory.backend
34103410
)
34113411

34123412
self.grid_indexing = stencil_factory.grid_indexing
@@ -3518,8 +3518,8 @@ def __init__(self, grid, config, stencil_factory):
35183518
layout=self.config.layout,
35193519
)
35203520

3521-
self.quantity_factory = QuantityFactory.from_backend(
3522-
sizer, self.stencil_factory.backend
3521+
self.quantity_factory = QuantityFactory(
3522+
sizer, backend=self.stencil_factory.backend
35233523
)
35243524

35253525
self.grid_indexing = stencil_factory.grid_indexing
@@ -3623,8 +3623,8 @@ def __init__(self, grid, config, stencil_factory):
36233623
layout=self.config.layout,
36243624
)
36253625

3626-
self.quantity_factory = QuantityFactory.from_backend(
3627-
sizer, self.stencil_factory.backend
3626+
self.quantity_factory = QuantityFactory(
3627+
sizer, backend=self.stencil_factory.backend
36283628
)
36293629

36303630
self.grid_indexing = stencil_factory.grid_indexing
@@ -3740,8 +3740,8 @@ def __init__(self, grid, config, stencil_factory):
37403740
layout=self.config.layout,
37413741
)
37423742

3743-
self.quantity_factory = QuantityFactory.from_backend(
3744-
sizer, self.stencil_factory.backend
3743+
self.quantity_factory = QuantityFactory(
3744+
sizer, backend=self.stencil_factory.backend
37453745
)
37463746

37473747
self.grid_indexing = stencil_factory.grid_indexing
@@ -3853,8 +3853,8 @@ def __init__(self, grid, config, stencil_factory):
38533853
layout=self.config.layout,
38543854
)
38553855

3856-
self.quantity_factory = QuantityFactory.from_backend(
3857-
sizer, self.stencil_factory.backend
3856+
self.quantity_factory = QuantityFactory(
3857+
sizer, backend=self.stencil_factory.backend
38583858
)
38593859

38603860
self.grid_indexing = stencil_factory.grid_indexing
@@ -4020,8 +4020,8 @@ def __init__(self, grid, config, stencil_factory):
40204020
layout=self.config.layout,
40214021
)
40224022

4023-
self.quantity_factory = QuantityFactory.from_backend(
4024-
sizer, self.stencil_factory.backend
4023+
self.quantity_factory = QuantityFactory(
4024+
sizer, backend=self.stencil_factory.backend
40254025
)
40264026

40274027
self.grid_indexing = stencil_factory.grid_indexing
@@ -4185,8 +4185,8 @@ def __init__(self, grid, config, stencil_factory):
41854185
layout=self.config.layout,
41864186
)
41874187

4188-
self.quantity_factory = QuantityFactory.from_backend(
4189-
sizer, self.stencil_factory.backend
4188+
self.quantity_factory = QuantityFactory(
4189+
sizer, backend=self.stencil_factory.backend
41904190
)
41914191

41924192
self.grid_indexing = stencil_factory.grid_indexing
@@ -4320,8 +4320,8 @@ def __init__(self, grid, config, stencil_factory):
43204320
layout=self.config.layout,
43214321
)
43224322

4323-
self.quantity_factory = QuantityFactory.from_backend(
4324-
sizer, self.stencil_factory.backend
4323+
self.quantity_factory = QuantityFactory(
4324+
sizer, backend=self.stencil_factory.backend
43254325
)
43264326

43274327
self.grid_indexing = stencil_factory.grid_indexing
@@ -4381,8 +4381,8 @@ def __init__(self, grid, config, stencil_factory):
43814381
layout=self.config.layout,
43824382
)
43834383

4384-
self.quantity_factory = QuantityFactory.from_backend(
4385-
sizer, self.stencil_factory.backend
4384+
self.quantity_factory = QuantityFactory(
4385+
sizer, backend=self.stencil_factory.backend
43864386
)
43874387

43884388
self.grid_indexing = stencil_factory.grid_indexing
@@ -4535,8 +4535,8 @@ def __init__(self, grid, config, stencil_factory):
45354535
layout=self.config.layout,
45364536
)
45374537

4538-
self.quantity_factory = QuantityFactory.from_backend(
4539-
sizer, self.stencil_factory.backend
4538+
self.quantity_factory = QuantityFactory(
4539+
sizer, backend=self.stencil_factory.backend
45404540
)
45414541

45424542
self.grid_indexing = stencil_factory.grid_indexing

‎tests/savepoint/translate/translate_final_mp.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1036,8 +1036,8 @@ def __init__(
10361036
layout=self.config.layout,
10371037
)
10381038

1039-
self.quantity_factory = QuantityFactory.from_backend(
1040-
self.sizer, self.stencil_factory.backend
1039+
self.quantity_factory = QuantityFactory(
1040+
self.sizer, backend=self.stencil_factory.backend
10411041
)
10421042

10431043
def compute(self, inputs):
@@ -1493,8 +1493,8 @@ def __init__(
14931493
layout=self.config.layout,
14941494
)
14951495

1496-
self.quantity_factory = QuantityFactory.from_backend(
1497-
self.sizer, self.stencil_factory.backend
1496+
self.quantity_factory = QuantityFactory(
1497+
self.sizer, backend=self.stencil_factory.backend
14981498
)
14991499

15001500
def compute(self, inputs):

‎tests/savepoint/translate/translate_gfdl_cld_microphysics.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -330,8 +330,8 @@ def __init__(
330330
layout=self.config.layout,
331331
)
332332

333-
self.quantity_factory = QuantityFactory.from_backend(
334-
self.sizer, self.stencil_factory.backend
333+
self.quantity_factory = QuantityFactory(
334+
self.sizer, backend=self.stencil_factory.backend
335335
)
336336

337337
def compute(self, inputs):

‎tests/savepoint/translate/translate_gfs_physics_driver.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,7 @@ def compute(self, inputs):
129129
layout=self.config.layout,
130130
)
131131

132-
quantity_factory = QuantityFactory.from_backend(
133-
sizer, self.stencil_factory.backend
134-
)
132+
quantity_factory = QuantityFactory(sizer, backend=self.stencil_factory.backend)
135133
schemes = [PHYSICS_PACKAGES["GFS_microphysics"]]
136134
physics_state = PhysicsState(
137135
**inputs,

0 commit comments

Comments
 (0)