deepsensor 0.2.0__tar.gz → 0.2.1__tar.gz

{deepsensor-0.2.0 → deepsensor-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: deepsensor
-Version: 0.2.0
+Version: 0.2.1
 Summary: A Python package for modelling xarray and pandas data with neural processes.
 Home-page: https://github.com/tom-andersson/deepsensor
 Author: Tom R. Andersson
@@ -41,7 +41,7 @@ data with neural processes</p>
 
 -----------
 
-[![release](https://img.shields.io/badge/release-v0.2.0-green?logo=github)](https://github.com/tom-andersson/deepsensor/releases)
+[![release](https://img.shields.io/badge/release-v0.2.1-green?logo=github)](https://github.com/tom-andersson/deepsensor/releases)
 ![Tests](https://github.com/tom-andersson/deepsensor/actions/workflows/tests.yml/badge.svg)
 [![Coverage Status](https://coveralls.io/repos/github/tom-andersson/deepsensor/badge.svg?branch=main)](https://coveralls.io/github/tom-andersson/deepsensor?branch=main)
 [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)

{deepsensor-0.2.0 → deepsensor-0.2.1}/README.md

@@ -11,7 +11,7 @@ data with neural processes</p>
 
 -----------
 
-[![release](https://img.shields.io/badge/release-v0.2.0-green?logo=github)](https://github.com/tom-andersson/deepsensor/releases)
+[![release](https://img.shields.io/badge/release-v0.2.1-green?logo=github)](https://github.com/tom-andersson/deepsensor/releases)
 ![Tests](https://github.com/tom-andersson/deepsensor/actions/workflows/tests.yml/badge.svg)
 [![Coverage Status](https://coveralls.io/repos/github/tom-andersson/deepsensor/badge.svg?branch=main)](https://coveralls.io/github/tom-andersson/deepsensor?branch=main)
 [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)

{deepsensor-0.2.0 → deepsensor-0.2.1}/deepsensor/data/loader.py

@@ -227,7 +227,13 @@ class TaskLoader:
             elif path.endswith(".nc"):
                 return xr.open_dataset(path)
             elif path.endswith(".csv"):
-                return pd.read_csv(path).set_index(["time", "x1", "x2"])
+                df = pd.read_csv(path)
+                if "time" in df.columns:
+                    df["time"] = pd.to_datetime(df["time"])
+                    df = df.set_index(["time", "x1", "x2"]).sort_index()
+                else:
+                    df = df.set_index(["x1", "x2"]).sort_index()
+                return df
             else:
                 raise ValueError(f"Unknown file extension for {path}")
 
@@ -253,7 +259,7 @@ class TaskLoader:
         os.makedirs(folder, exist_ok=True)
         fpath = os.path.join(folder, self.config_fname)
         with open(fpath, "w") as f:
-            json.dump(self.config, f)
+            json.dump(self.config, f, indent=4, sort_keys=False)
 
     def _cast_to_dtype(
         self,

{deepsensor-0.2.0 → deepsensor-0.2.1}/deepsensor/data/processor.py

@@ -53,6 +53,9 @@ class DataProcessor:
                 )
             with open(fpath, "r") as f:
                 self.config = json.load(f)
+
+            self.x1_none = self.config["coords"]["x1"]["map"] is None
+            self.x2_none = self.config["coords"]["x2"]["map"] is None
         else:
             self.config = {}
 
@@ -84,7 +87,7 @@ class DataProcessor:
         os.makedirs(folder, exist_ok=True)
         fpath = os.path.join(folder, self.config_fname)
         with open(fpath, "w") as f:
-            json.dump(self.config, f)
+            json.dump(self.config, f, indent=4, sort_keys=False)
 
     def _validate_coord_mappings(self, x1_map, x2_map):
         """Ensure the maps are valid and of appropriate types."""

{deepsensor-0.2.0 → deepsensor-0.2.1}/deepsensor/model/convnp.py

@@ -208,13 +208,13 @@ class ConvNP(DeepSensorModel):
 
             torch.save(self.model.state_dict(), os.path.join(model_ID, "model.pt"))
         elif backend.str == "tf":
-            self.model.save_weights(os.path.join(model_ID, "model.h5"))
+            self.model.save_weights(os.path.join(model_ID, "model"))
         else:
             raise NotImplementedError(f"Backend {backend.str} not supported.")
 
         config_fpath = os.path.join(model_ID, "model_config.json")
         with open(config_fpath, "w") as f:
-            json.dump(self.config, f)
+            json.dump(self.config, f, indent=4, sort_keys=False)
 
     def load(self, model_ID: str):
         """Load a model from a folder containing model weights and config."""
@@ -229,7 +229,7 @@ class ConvNP(DeepSensorModel):
 
             self.model.load_state_dict(torch.load(os.path.join(model_ID, "model.pt")))
         elif backend.str == "tf":
-            self.model.load_weights(os.path.join(model_ID, "model.h5"))
+            self.model.load_weights(os.path.join(model_ID, "model"))
         else:
             raise NotImplementedError(f"Backend {backend.str} not supported.")
 

{deepsensor-0.2.0 → deepsensor-0.2.1}/deepsensor.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: deepsensor
-Version: 0.2.0
+Version: 0.2.1
 Summary: A Python package for modelling xarray and pandas data with neural processes.
 Home-page: https://github.com/tom-andersson/deepsensor
 Author: Tom R. Andersson
@@ -41,7 +41,7 @@ data with neural processes</p>
 
 -----------
 
-[![release](https://img.shields.io/badge/release-v0.2.0-green?logo=github)](https://github.com/tom-andersson/deepsensor/releases)
+[![release](https://img.shields.io/badge/release-v0.2.1-green?logo=github)](https://github.com/tom-andersson/deepsensor/releases)
 ![Tests](https://github.com/tom-andersson/deepsensor/actions/workflows/tests.yml/badge.svg)
 [![Coverage Status](https://coveralls.io/repos/github/tom-andersson/deepsensor/badge.svg?branch=main)](https://coveralls.io/github/tom-andersson/deepsensor?branch=main)
 [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)

{deepsensor-0.2.0 → deepsensor-0.2.1}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = deepsensor
-version = 0.2.0
+version = 0.2.1
 author = Tom R. Andersson
 author_email = tomand@bas.ac.uk
 description = A Python package for modelling xarray and pandas data with neural processes.

{deepsensor-0.2.0 → deepsensor-0.2.1}/tests/test_model.py

@@ -3,7 +3,7 @@ import itertools
 
 from parameterized import parameterized
 
-
+import os
 import xarray as xr
 import numpy as np
 import pandas as pd
@@ -11,11 +11,12 @@ import unittest
 
 import lab as B
 
-import deepsensor.tensorflow as deepsensor
+import deepsensor.torch as deepsensor
 
 from deepsensor.data.processor import DataProcessor
 from deepsensor.data.loader import TaskLoader
 from deepsensor.model.convnp import ConvNP
+from deepsensor.train.train import Trainer
 
 from tests.utils import gen_random_data_xr, gen_random_data_pandas
 
@@ -390,6 +391,56 @@ class TestModel(unittest.TestCase):
             mean_df.reset_index()["longitude"], df_raw.reset_index()["longitude"]
         )
 
+    def test_saving_and_loading(self):
+        """Test saving and loading of model"""
+        folder = f"tmp_{pd.Timestamp.now().strftime('%Y%m%d_%H%M%S')}"
+        os.makedirs(folder, exist_ok=True)
+
+        ds_raw = xr.tutorial.open_dataset("air_temperature")
+
+        data_processor = DataProcessor(x1_name="lat", x2_name="lon")
+        ds = data_processor(ds_raw)
+
+        t2m_fpath = f"{folder}/air_temperature_normalised.nc"
+        ds.to_netcdf(t2m_fpath)
+
+        task_loader = TaskLoader(context=t2m_fpath, target=t2m_fpath)
+
+        model = ConvNP(
+            data_processor, task_loader, unet_channels=(32,) * 3, verbose=False
+        )
+
+        # Train the model for a few iterations to test the trained model is restored correctly later.
+        task = task_loader("2014-12-31", 40, datewise_deterministic=True)
+        trainer = Trainer(model)
+        for _ in range(10):
+            trainer([task])
+        mean_ds_before, std_ds_before = model.predict(task, X_t=ds_raw)
+        mean_ds_before["air"].plot()
+
+        data_processor.save(folder)
+        task_loader.save(folder)
+        model.save(folder)
+
+        data_processor_loaded = DataProcessor(folder)
+        task_loader_loaded = TaskLoader(folder)
+        model_loaded = ConvNP(data_processor_loaded, task_loader_loaded, folder)
+
+        task = task_loader_loaded("2014-12-31", 40, datewise_deterministic=True)
+        mean_ds_loaded, std_ds_loaded = model_loaded.predict(task, X_t=ds_raw)
+        mean_ds_loaded["air"].plot()
+
+        xr.testing.assert_allclose(mean_ds_before, mean_ds_loaded)
+        print("Means match")
+
+        xr.testing.assert_allclose(std_ds_before, std_ds_loaded)
+        print("Standard deviations match")
+
+        # Delete temporary folder
+        import shutil
+
+        shutil.rmtree(folder)
+
 
 def assert_shape(x, shape: tuple):
     """ex: assert_shape(conv_input_array, [8, 3, None, None])"""