PyPI - ngiab-data-preprocess - Versions diffs - 4.6.2__tar.gz → 4.6.4__tar.gz - Mend

ngiab-data-preprocess 4.6.2tar.gz → 4.6.4tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (54) hide show

{ngiab_data_preprocess-4.6.2 → ngiab_data_preprocess-4.6.4}/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ngiab_data_preprocess
-Version: 4.6.2
+Version: 4.6.4
 Summary: Graphical Tools for creating Next Gen Water model input data.
 Author-email: Josh Cunningham <jcunningham8@ua.edu>
 Project-URL: Homepage, https://github.com/CIROH-UA/NGIAB_data_preprocess
@@ -33,6 +33,7 @@ Requires-Dist: bokeh==3.5.1
 Requires-Dist: boto3
 Requires-Dist: numcodecs<0.16.0
 Requires-Dist: scipy>=1.15.3
+Requires-Dist: h5py<=3.11
 Provides-Extra: eval
 Requires-Dist: ngiab_eval; extra == "eval"
 Provides-Extra: plot
@@ -239,6 +240,8 @@ Installed with uv: `uv run cli`
 - `-s`, `--subset`: Subset the hydrofabric to the given feature.
 - `-f`, `--forcings`: Generate forcings for the given feature.
 - `-r`, `--realization`: Create a realization for the given feature.
+- `--lstm`: Configures the data for the [python lstm](https://github.com/ciroh-ua/lstm/).
+- `--lstm_rust`: Configures the data for the [rust lstm](https://github.com/ciroh-ua/rust-lstm-1025/).
 - `--start_date START_DATE`, `--start START_DATE`: Start date for forcings/realization (format YYYY-MM-DD).
 - `--end_date END_DATE`, `--end END_DATE`: End date for forcings/realization (format YYYY-MM-DD).
 - `-o OUTPUT_NAME`, `--output_name OUTPUT_NAME`: Name of the output folder.
@@ -298,11 +301,17 @@ Installed with uv: `uv run cli`
 # Realization information
-This tool currently offers one default realization.
+This tool currently offers three realizations.
-## NOAH + CFE
+## NOAH + CFE (Default)
 [This realization](https://github.com/CIROH-UA/NGIAB_data_preprocess/blob/main/modules/data_sources/cfe-nowpm-realization-template.json) is intended to be roughly comparable to earlier versions of the National Water Model.
 - [NOAH-OWP-Modular](https://github.com/NOAA-OWP/NOAH-OWP-Modular): A refactoring of Noah-MP, a land-surface model. Used to model groundwater properties.
 - [Conceptual Functional Equivalent (CFE)](https://github.com/NOAA-OWP/CFE): A simplified conceptual approximation of versions 1.2, 2.0, and 2.1 of the National Water Model. Used to model precipitation and evaporation.
 - [SLoTH](https://github.com/NOAA-OWP/SLoTH): A module used to feed through unchanged values. In this default configuration, it simply forces certain soil moisture and ice fraction properties to zero.
+## LSTM (Python)
+[This realization](https://github.com/CIROH-UA/NGIAB_data_preprocess/blob/main/modules/data_sources/lstm-realization-template.json) will run the [python lstm](https://github.com/ciroh-ua/lstm/). It's designed to work with ngiab using [these example weights](https://github.com/CIROH-UA/lstm/tree/example_weights/trained_neuralhydrology_models) generously contributed by [jmframe/lstm](https://github.com/jmframe/lstm)
+## LSTM (Rust)
+[This realization](https://github.com/CIROH-UA/NGIAB_data_preprocess/blob/main/modules/data_sources/lstm-rust-realization-template.json) will run the [rust port](https://github.com/CIROH-UA/rust-lstm-1025/tree/main) of the python lstm above. It's an experimental drop in replacement that should produce identical results with a ~2-5x speedup depending on your setup.

{ngiab_data_preprocess-4.6.2 → ngiab_data_preprocess-4.6.4}/README.md RENAMED Viewed

@@ -198,6 +198,8 @@ Installed with uv: `uv run cli`
 - `-s`, `--subset`: Subset the hydrofabric to the given feature.
 - `-f`, `--forcings`: Generate forcings for the given feature.
 - `-r`, `--realization`: Create a realization for the given feature.
+- `--lstm`: Configures the data for the [python lstm](https://github.com/ciroh-ua/lstm/).
+- `--lstm_rust`: Configures the data for the [rust lstm](https://github.com/ciroh-ua/rust-lstm-1025/).
 - `--start_date START_DATE`, `--start START_DATE`: Start date for forcings/realization (format YYYY-MM-DD).
 - `--end_date END_DATE`, `--end END_DATE`: End date for forcings/realization (format YYYY-MM-DD).
 - `-o OUTPUT_NAME`, `--output_name OUTPUT_NAME`: Name of the output folder.
@@ -257,11 +259,17 @@ Installed with uv: `uv run cli`
 # Realization information
-This tool currently offers one default realization.
+This tool currently offers three realizations.
-## NOAH + CFE
+## NOAH + CFE (Default)
 [This realization](https://github.com/CIROH-UA/NGIAB_data_preprocess/blob/main/modules/data_sources/cfe-nowpm-realization-template.json) is intended to be roughly comparable to earlier versions of the National Water Model.
 - [NOAH-OWP-Modular](https://github.com/NOAA-OWP/NOAH-OWP-Modular): A refactoring of Noah-MP, a land-surface model. Used to model groundwater properties.
 - [Conceptual Functional Equivalent (CFE)](https://github.com/NOAA-OWP/CFE): A simplified conceptual approximation of versions 1.2, 2.0, and 2.1 of the National Water Model. Used to model precipitation and evaporation.
 - [SLoTH](https://github.com/NOAA-OWP/SLoTH): A module used to feed through unchanged values. In this default configuration, it simply forces certain soil moisture and ice fraction properties to zero.
+## LSTM (Python)
+[This realization](https://github.com/CIROH-UA/NGIAB_data_preprocess/blob/main/modules/data_sources/lstm-realization-template.json) will run the [python lstm](https://github.com/ciroh-ua/lstm/). It's designed to work with ngiab using [these example weights](https://github.com/CIROH-UA/lstm/tree/example_weights/trained_neuralhydrology_models) generously contributed by [jmframe/lstm](https://github.com/jmframe/lstm)
+## LSTM (Rust)
+[This realization](https://github.com/CIROH-UA/NGIAB_data_preprocess/blob/main/modules/data_sources/lstm-rust-realization-template.json) will run the [rust port](https://github.com/CIROH-UA/rust-lstm-1025/tree/main) of the python lstm above. It's an experimental drop in replacement that should produce identical results with a ~2-5x speedup depending on your setup.

{ngiab_data_preprocess-4.6.2 → ngiab_data_preprocess-4.6.4}/modules/data_processing/forcings.py RENAMED Viewed

@@ -312,7 +312,6 @@ def get_units(dataset: xr.Dataset) -> dict:
             units[var] = dataset[var].attrs["units"]
     return units
 def interpolate_nan_values(
     dataset: xr.Dataset,
     dim: str = "time",
@@ -345,7 +344,7 @@ def interpolate_nan_values(
         if not var.isnull().any().compute():
             continue
         logger.info("Interpolating NaN values in %s", name)
+        var = var.compute()
         dataset[name] = var.interpolate_na(
             dim=dim,
             method=method,

{ngiab_data_preprocess-4.6.2 → ngiab_data_preprocess-4.6.4}/modules/data_sources/lstm-rust-realization-template.json RENAMED Viewed

@@ -21,7 +21,7 @@
                 "main_output_variable": "land_surface_water__runoff_depth",
                 "uses_forcing_file": false,
                 "registration_function": "register_bmi_lstm",
-                "library_file": "/dmod/shared_libs/libbmi_burn_lstm.so"
+                "library_file": "/dmod/shared_libs/librust_lstm_1025.so"
               }
             }
           ]

{ngiab_data_preprocess-4.6.2 → ngiab_data_preprocess-4.6.4}/modules/ngiab_data_preprocess.egg-info/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ngiab_data_preprocess
-Version: 4.6.2
+Version: 4.6.4
 Summary: Graphical Tools for creating Next Gen Water model input data.
 Author-email: Josh Cunningham <jcunningham8@ua.edu>
 Project-URL: Homepage, https://github.com/CIROH-UA/NGIAB_data_preprocess
@@ -33,6 +33,7 @@ Requires-Dist: bokeh==3.5.1
 Requires-Dist: boto3
 Requires-Dist: numcodecs<0.16.0
 Requires-Dist: scipy>=1.15.3
+Requires-Dist: h5py<=3.11
 Provides-Extra: eval
 Requires-Dist: ngiab_eval; extra == "eval"
 Provides-Extra: plot
@@ -239,6 +240,8 @@ Installed with uv: `uv run cli`
 - `-s`, `--subset`: Subset the hydrofabric to the given feature.
 - `-f`, `--forcings`: Generate forcings for the given feature.
 - `-r`, `--realization`: Create a realization for the given feature.
+- `--lstm`: Configures the data for the [python lstm](https://github.com/ciroh-ua/lstm/).
+- `--lstm_rust`: Configures the data for the [rust lstm](https://github.com/ciroh-ua/rust-lstm-1025/).
 - `--start_date START_DATE`, `--start START_DATE`: Start date for forcings/realization (format YYYY-MM-DD).
 - `--end_date END_DATE`, `--end END_DATE`: End date for forcings/realization (format YYYY-MM-DD).
 - `-o OUTPUT_NAME`, `--output_name OUTPUT_NAME`: Name of the output folder.
@@ -298,11 +301,17 @@ Installed with uv: `uv run cli`
 # Realization information
-This tool currently offers one default realization.
+This tool currently offers three realizations.
-## NOAH + CFE
+## NOAH + CFE (Default)
 [This realization](https://github.com/CIROH-UA/NGIAB_data_preprocess/blob/main/modules/data_sources/cfe-nowpm-realization-template.json) is intended to be roughly comparable to earlier versions of the National Water Model.
 - [NOAH-OWP-Modular](https://github.com/NOAA-OWP/NOAH-OWP-Modular): A refactoring of Noah-MP, a land-surface model. Used to model groundwater properties.
 - [Conceptual Functional Equivalent (CFE)](https://github.com/NOAA-OWP/CFE): A simplified conceptual approximation of versions 1.2, 2.0, and 2.1 of the National Water Model. Used to model precipitation and evaporation.
 - [SLoTH](https://github.com/NOAA-OWP/SLoTH): A module used to feed through unchanged values. In this default configuration, it simply forces certain soil moisture and ice fraction properties to zero.
+## LSTM (Python)
+[This realization](https://github.com/CIROH-UA/NGIAB_data_preprocess/blob/main/modules/data_sources/lstm-realization-template.json) will run the [python lstm](https://github.com/ciroh-ua/lstm/). It's designed to work with ngiab using [these example weights](https://github.com/CIROH-UA/lstm/tree/example_weights/trained_neuralhydrology_models) generously contributed by [jmframe/lstm](https://github.com/jmframe/lstm)
+## LSTM (Rust)
+[This realization](https://github.com/CIROH-UA/NGIAB_data_preprocess/blob/main/modules/data_sources/lstm-rust-realization-template.json) will run the [rust port](https://github.com/CIROH-UA/rust-lstm-1025/tree/main) of the python lstm above. It's an experimental drop in replacement that should produce identical results with a ~2-5x speedup depending on your setup.

{ngiab_data_preprocess-4.6.2 → ngiab_data_preprocess-4.6.4}/modules/ngiab_data_preprocess.egg-info/requires.txt RENAMED Viewed

@@ -20,6 +20,7 @@ bokeh==3.5.1
 boto3
 numcodecs<0.16.0
 scipy>=1.15.3
+h5py<=3.11
 [eval]
 ngiab_eval

{ngiab_data_preprocess-4.6.2 → ngiab_data_preprocess-4.6.4}/pyproject.toml RENAMED Viewed

@@ -19,7 +19,7 @@ filterwarnings = [
 ]
 [project]
 name = "ngiab_data_preprocess"
-version = "v4.6.2"
+version = "v4.6.4"
 authors = [{ name = "Josh Cunningham", email = "jcunningham8@ua.edu" }]
 description = "Graphical Tools for creating Next Gen Water model input data."
 readme = "README.md"
@@ -52,6 +52,7 @@ dependencies = [
     "boto3",
     "numcodecs<0.16.0",
     "scipy>=1.15.3",
+    "h5py<=3.11"
 ]
 [project.optional-dependencies]