init

CamaraLab · Jan 2, 2025 · a1094db · a1094db
1 parent e287499
commit a1094db
Show file tree

Hide file tree

Showing 8 changed files with 281,773 additions and 281,765 deletions.
diff --git a/src/cajal/ugw/__init__.py b/src/cajal/ugw/__init__.py
@@ -381,14 +381,14 @@ def ugw_armijo_pairwise(
         pt_cloud=False,
     ):
 
-        if not pt_cloud:
+        if pt_cloud:
             pt_clouds = dmats
             dmats = np.stack(
                 [squareform(pdist(a), force="tomatrix") for a in pt_clouds], axis=0
             )
         if isinstance(dmats, str):
             _, icdms = zip(*cell_iterator_csv(dmats))
-            dmats = np.stack(icdms, axis=0)
+            dmats = np.stack(list(icdms), axis=0)
 
         if rho is None:
             gw_cost = estimate_distr(dmats, sample_size, quantile)
@@ -406,6 +406,7 @@ def ugw_armijo_pairwise(
                     tol_sinkhorn,
                     tol_outerloop,
                 )
+                print("Done first pass, cleaning up errors.")
             else:  # dmats is pt_clouds
                 ugw_dmat = self._ugw_armijo_euclidean(
                     rho,

diff --git a/src/cajal/ugw/c/unbalanced_gw_c.c b/src/cajal/ugw/c/unbalanced_gw_c.c
diff --git a/src/cajal/ugw/cuda/unbalanced_gw_cuda.c b/src/cajal/ugw/cuda/unbalanced_gw_cuda.c
diff --git a/src/cajal/ugw/cuda/unbalanced_gw_cuda.json b/src/cajal/ugw/cuda/unbalanced_gw_cuda.json