Merge pull request #54 from pbarbarant/fix/storing-mapping

alexisthual · Jul 19, 2024 · b1063cd · b1063cd
2 parents 679feaf + 1beb968
commit b1063cd
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 12 deletions.
diff --git a/src/fugw/mappings/barycenter.py b/src/fugw/mappings/barycenter.py
@@ -155,7 +155,6 @@ def compute_all_ot_plans(
                 solver=solver,
                 solver_params=solver_params,
                 device=device,
-                storing_device=device,
                 verbose=verbose,
             )
 

diff --git a/src/fugw/mappings/dense.py b/src/fugw/mappings/dense.py
@@ -27,7 +27,6 @@ def fit(
         solver_params={},
         callback_bcd=None,
         device="auto",
-        storing_device="cpu",
         verbose=False,
     ):
         """
@@ -101,8 +100,6 @@ def fit(
         device: "auto" or torch.device
             if "auto": use first available gpu if it's available,
             cpu otherwise.
-        storing_device: torch.device, default="cpu"
-            Device on which to store the computed transport plan.
         verbose: bool, optional, defaults to False
             Log solving process.
 
@@ -258,7 +255,7 @@ def fit(
         )
 
         # Store variables of interest in model
-        self.pi = res["pi"].detach().to(device=storing_device)
+        self.pi = res["pi"].detach()
         self.loss = res["loss"]
         self.loss_steps = res["loss_steps"]
         self.loss_times = res["loss_times"]

diff --git a/src/fugw/mappings/sparse.py b/src/fugw/mappings/sparse.py
@@ -33,7 +33,6 @@ def fit(
         solver_params={},
         callback_bcd=None,
         device="auto",
-        storing_device="cpu",
         verbose=False,
     ):
         """
@@ -107,8 +106,6 @@ def fit(
         device: "auto" or torch.device
             if "auto": use first available gpu if it's available,
             cpu otherwise.
-        storing_device: torch.device, default="cpu"
-            Device on which to store the computed transport plan.
         verbose: bool, optional, defaults to False
             Log solving process.
 
@@ -296,7 +293,7 @@ def fit(
             verbose=verbose,
         )
 
-        self.pi = res["pi"].to_sparse_coo().detach().to(device=storing_device)
+        self.pi = res["pi"].to_sparse_coo().detach()
         self.loss = res["loss"]
         self.loss_val = res["loss_val"]
         self.loss_steps = res["loss_steps"]

diff --git a/src/fugw/scripts/coarse_to_fine.py b/src/fugw/scripts/coarse_to_fine.py
@@ -429,6 +429,9 @@ def fit(
         verbose=verbose,
     )
 
+    # Send coarse mapping to cpu to handle numpy operations
+    coarse_mapping.pi = coarse_mapping.pi.cpu()
+
     # 2. Build sparsity mask
 
     # Select best pairs of source and target vertices from coarse alignment

diff --git a/src/fugw/utils.py b/src/fugw/utils.py
@@ -262,14 +262,16 @@ def save_mapping(mapping, fname):
     fname: str or pathlib.Path
         Path to pickle file to save
     """
+    # Move mapping weights to CPU before saving
+    mapping.pi = mapping.pi.to("cpu")
     with open(fname, "wb") as f:
         # Dump hyperparams first
         pickle.dump(mapping, f)
         # Dump mapping weights
         pickle.dump(mapping.pi, f)
 
 
-def load_mapping(fname, load_weights=True):
+def load_mapping(fname, load_weights=True, device="cpu"):
     """Load mapping from pickle file, optionally loading weights.
 
     Parameters
@@ -278,6 +280,8 @@ def load_mapping(fname, load_weights=True):
         Path to pickle file to load
     load_weights: bool, optional, defaults to True
         If True, load mapping weights from pickle file.
+    device: torch.device, default="cpu"
+        Device on which to store the computed transport plan.
 
     Returns
     -------
@@ -287,5 +291,6 @@ def load_mapping(fname, load_weights=True):
         mapping = pickle.load(f)
         if load_weights:
             mapping.pi = pickle.load(f)
+            mapping.pi = mapping.pi.to(device)
 
     return mapping
diff --git a/tests/test_utils.py b/tests/test_utils.py
@@ -119,10 +119,14 @@ def test_saving_and_loading(device, return_numpy, solver):
 
         save_mapping(fugw, fname)
 
-        mapping_without_weights = load_mapping(fname, load_weights=False)
+        mapping_without_weights = load_mapping(
+            fname, load_weights=False, device=device
+        )
         assert mapping_without_weights.pi is None
 
-        mapping_with_weights = load_mapping(fname, load_weights=True)
+        mapping_with_weights = load_mapping(
+            fname, load_weights=True, device=device
+        )
         assert mapping_with_weights.pi.shape == (
             n_voxels_source,
             n_voxels_target,