SURE-tools 2.0.5__tar.gz → 2.0.7__tar.gz

{sure_tools-2.0.5 → sure_tools-2.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: SURE-tools
-Version: 2.0.5
+Version: 2.0.7
 Summary: Succinct Representation of Single Cells
 Home-page: https://github.com/ZengFLab/SURE
 Author: Feng Zeng

{sure_tools-2.0.5 → sure_tools-2.0.7}/SURE/SURE.py

@@ -11,7 +11,7 @@ from torch.distributions import constraints
 from torch.distributions.transforms import SoftmaxTransform
 
 from .utils.custom_mlp import MLP, Exp
-from .utils.utils import CustomDataset, CustomDataset3, CustomDataset4, tensor_to_numpy, convert_to_tensor
+from .utils.utils import CustomDataset, CustomDataset2, CustomDataset4, tensor_to_numpy, convert_to_tensor
 
 
 import os
@@ -814,11 +814,13 @@ class SURE(nn.Module):
         return A
     
     def _cell_move(self, xs, factor_idx, perturb):
-        zns = self.encoder_zn(xs)
+        zns,_ = self.encoder_zn(xs)
         if type(factor_idx) == str:
             factor_idx = np.where(self.cell_factor_names==factor_idx)
         
         if perturb.ndim==2:
+            print(factor_idx)
+            print(type(perturb))
             ms = self.cell_factor_effect[factor_idx]([zns, perturb])
         else:
             ms = self.cell_factor_effect[factor_idx]([zns, perturb.reshape(-1,1)])
@@ -836,19 +838,30 @@ class SURE(nn.Module):
         """
         xs = self.preprocess(xs)
         xs = convert_to_tensor(xs, device=self.get_device())
-        dataset = CustomDataset(xs)
+        ps = convert_to_tensor(perturb, device=self.get_device())
+        dataset = CustomDataset2(xs,ps)
         dataloader = DataLoader(dataset, batch_size=batch_size, shuffle=False)
 
         Z = []
         with tqdm(total=len(dataloader), desc='', unit='batch') as pbar:
-            for X_batch, _ in dataloader:
-                zns = self._cell_move(X_batch, factor_idx, perturb)
+            for X_batch, P_batch, _ in dataloader:
+                zns = self._cell_move(X_batch, factor_idx, P_batch)
                 Z.append(tensor_to_numpy(zns))
                 pbar.update(1)
 
         Z = np.concatenate(Z)
         return Z
     
+    def get_metacell_move(self, factor_idx, perturb):
+        zs = self._get_codebook()
+        ps = convert_to_tensor(perturb, device=self.get_device())
+        
+        if type(factor_idx) == str:
+            factor_idx = np.where(self.cell_factor_names==factor_idx)
+            
+        ms = self.cell_factor_effect[factor_idx]([zs,ps])
+        return tensor_to_numpy(ms)
+    
     def preprocess(self, xs, threshold=0):
         if self.loss_func == 'bernoulli':
             ad = sc.AnnData(xs)

{sure_tools-2.0.5 → sure_tools-2.0.7}/SURE/flow/plot_quiver.py

@@ -32,7 +32,7 @@ def plot_quiver(z_points, delta_z, method='umap', figsize=(6,4), dpi=200):
         sc.pp.neighbors(ad)
         sc.tl.umap(ad)
         z_2d = ad[:z_points.shape[0]].obsm['X_umap']
-        delta_z_2d = ad[z_points.shape[0]:] - z_2d
+        delta_z_2d = ad[z_points.shape[0]:].obsm['X_umap'] - z_2d
         dim_names = ['UMAP1', 'UMAP2']
     
     # 绘制quiver图

{sure_tools-2.0.5 → sure_tools-2.0.7}/SURE_tools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: SURE-tools
-Version: 2.0.5
+Version: 2.0.7
 Summary: Succinct Representation of Single Cells
 Home-page: https://github.com/ZengFLab/SURE
 Author: Feng Zeng

{sure_tools-2.0.5 → sure_tools-2.0.7}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setup(
     name='SURE-tools',
-    version='2.0.5',
+    version='2.0.7',
     description='Succinct Representation of Single Cells',
     long_description=long_description,
     long_description_content_type="text/markdown",