Merge pull request #8 from ihmeuw/feature/rmbarber/updated-v7.1-full

include additional years found in 7.1 update; drop experiment 101 ref…

Author: rmbarber

poetry.lock

@@ -25,7 +25,8 @@ dependencies = [
     "scikit-image>=0.25.1",
     "pypdf>=3.9.0",
     "contextily>=1.6.2",
-
+    "xarray>=2025.7.0",
+    "netCDF4>=1.7.2",
 ]
 
 [project.urls]

pyproject.toml

@@ -27,7 +27,7 @@ def to_list(cls) -> list[str]:
 
 class BuiltVersion(BaseModel):
     provider: Literal["ghsl", "microsoft"]
-    version: Literal["v6", "v7", "v7_1", "v7_e101", "r2023a"]
+    version: Literal["v6", "v7", "v7_1", "r2023a"]
     time_points: list[str]
     measures: list[str]
 
@@ -83,16 +83,9 @@ def time_points_float(self) -> list[float]:
     "microsoft_v7_1": BuiltVersion(
         provider="microsoft",
         version="v7_1",
-        time_points=['2020q2', '2024q2'],
-        measures=[
-            "density",
-            "height",
-        ],
-    ),
-    "microsoft_v7_e101": BuiltVersion(
-        provider="microsoft",
-        version="v7_e101",
-        time_points=['2023q4'],
+        time_points=[
+            f"{y}q{q}" for y, q in itertools.product(range(2020, 2025), range(1, 5))
+        ][1:-2],
         measures=[
             "density",
             "height",

src/rra_population_model/constants.py

@@ -130,6 +130,7 @@ def inference(
     pm_data = PopulationModelData(output_dir)
     feature_time_points = pm_data.list_feature_time_points(resolution)
     time_points = clio.convert_choice(time_point, feature_time_points)
+    time_points = sorted([time_point for time_point in time_points if time_point.startswith('202')])
     print(f"Running inference for {len(time_points)} time points.")
 
     jobmon.run_parallel(

src/rra_population_model/model/inference/runner.py

@@ -17,11 +17,10 @@
 
 # GHSL first, as we need the residential mask for msft
 BUILT_VERSIONS = [
-    # pmc.BUILT_VERSIONS["ghsl_r2023a"],
-    # pmc.BUILT_VERSIONS["microsoft_v6"],
-    # pmc.BUILT_VERSIONS["microsoft_v7"],
+    pmc.BUILT_VERSIONS["ghsl_r2023a"],
+    pmc.BUILT_VERSIONS["microsoft_v6"],
+    pmc.BUILT_VERSIONS["microsoft_v7"],
     pmc.BUILT_VERSIONS["microsoft_v7_1"],
-    pmc.BUILT_VERSIONS["microsoft_v7_e101"],
 ]
 
 

src/rra_population_model/model_prep/features/runner.py

@@ -105,7 +105,6 @@ def rake(
     rf_time_points = pm_data.list_raking_factor_time_points(resolution, version)
 
     time_points = clio.convert_choice(time_point, rf_time_points)
-    # time_points = sorted([time_point for time_point in time_points if time_point.startswith('202')])
 
     model_frame = pm_data.load_modeling_frame(resolution)
     block_keys = model_frame.block_key.unique().tolist()