PyPI - SURE-tools - Versions diffs - 2.1.44__tar.gz → 2.1.45__tar.gz - Mend

SURE-tools 2.1.44tar.gz → 2.1.45tar.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.

Potentially problematic release.

This version of SURE-tools might be problematic. Click here for more details.

Files changed (30) hide show

{sure_tools-2.1.44 → sure_tools-2.1.45}/PKG-INFO RENAMED Viewed

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

{sure_tools-2.1.44 → sure_tools-2.1.45}/SURE/PerturbFlow.py RENAMED Viewed

@@ -189,29 +189,10 @@ class PerturbFlow(nn.Module):
                 use_cuda=self.use_cuda,
             )
-        #self.encoder_zn = MLP(
-        #    [self.input_size] + hidden_sizes + [[latent_dim, latent_dim]],
-        #    activation=activate_fct,
-        #    output_activation=[None, Exp],
-        #    post_layer_fct=post_layer_fct,
-        #    post_act_fct=post_act_fct,
-        #    allow_broadcast=self.allow_broadcast,
-        #    use_cuda=self.use_cuda,
-        #)
-        self.encoder_zn_loc = MLP(
-            [self.input_size] + hidden_sizes + [self.input_size * latent_dim],
-            activation=activate_fct,
-            output_activation=None,
-            post_layer_fct=post_layer_fct,
-            post_act_fct=post_act_fct,
-            allow_broadcast=self.allow_broadcast,
-            use_cuda=self.use_cuda,
-        )
-        self.encoder_zn_scale = MLP(
-            [self.input_size] + hidden_sizes + [latent_dim],
+        self.encoder_zn = MLP(
+            [self.input_size] + hidden_sizes + [[latent_dim, latent_dim]],
             activation=activate_fct,
-            output_activation=Exp,
+            output_activation=[None, Exp],
             post_layer_fct=post_layer_fct,
             post_act_fct=post_act_fct,
             allow_broadcast=self.allow_broadcast,
@@ -397,11 +378,7 @@ class PerturbFlow(nn.Module):
     def guide1(self, xs):
         with pyro.plate('data'):
-            batch_size = xs.shape[0]
-            #zn_loc, zn_scale = self.encoder_zn(xs)
-            zn_loc, zn_scale = self.encoder_zn_loc(xs), self.encoder_zn_scale(xs)
-            zn_loc_3d = zn_loc.view(batch_size, self.input_size, self.latent_dim)
-            zn_loc = zn_loc_3d.sum(dim=1)
+            zn_loc, zn_scale = self.encoder_zn(xs)
             zns = pyro.sample('zn', dist.Normal(zn_loc, zn_scale).to_event(1))
             alpha = self.encoder_n(zns)
@@ -489,11 +466,7 @@ class PerturbFlow(nn.Module):
     def guide2(self, xs, us=None):
         with pyro.plate('data'):
-            batch_size = xs.shape[0]
-            #zn_loc, zn_scale = self.encoder_zn(xs)
-            zn_loc, zn_scale = self.encoder_zn_loc(xs), self.encoder_zn_scale(xs)
-            zn_loc_3d = zn_loc.view(batch_size, self.input_size, self.latent_dim)
-            zn_loc = zn_loc_3d.sum(dim=1)
+            zn_loc, zn_scale = self.encoder_zn(xs)
             zns = pyro.sample('zn', dist.Normal(zn_loc, zn_scale).to_event(1))
             alpha = self.encoder_n(zns)
@@ -588,11 +561,7 @@ class PerturbFlow(nn.Module):
     def guide3(self, xs, ys, embeds=None):
         with pyro.plate('data'):
             if embeds is None:
-                batch_size = xs.shape[0]
-                #zn_loc, zn_scale = self.encoder_zn(xs)
-                zn_loc, zn_scale = self.encoder_zn_loc(xs), self.encoder_zn_scale(xs)
-                zn_loc_3d = zn_loc.view(batch_size, self.input_size, self.latent_dim)
-                zn_loc = zn_loc_3d.sum(dim=1)
+                zn_loc, zn_scale = self.encoder_zn(xs)
                 zns = pyro.sample('zn', dist.Normal(zn_loc, zn_scale).to_event(1))
     def model4(self, xs, us, ys, embeds=None):
@@ -694,11 +663,7 @@ class PerturbFlow(nn.Module):
     def guide4(self, xs, us, ys, embeds=None):
         with pyro.plate('data'):
             if embeds is None:
-                batch_size = xs.shape[0]
-                #zn_loc, zn_scale = self.encoder_zn(xs)
-                zn_loc, zn_scale = self.encoder_zn_loc(xs), self.encoder_zn_scale(xs)
-                zn_loc_3d = zn_loc.view(batch_size, self.input_size, self.latent_dim)
-                zn_loc = zn_loc_3d.sum(dim=1)
+                zn_loc, zn_scale = self.encoder_zn(xs)
                 zns = pyro.sample('zn', dist.Normal(zn_loc, zn_scale).to_event(1))
     def _total_effects(self, zns, us):
@@ -727,11 +692,7 @@ class PerturbFlow(nn.Module):
         return cb
     def _get_basal_embedding(self, xs):
-        #zns, _ = self.encoder_zn(xs)
-        batch_size = xs.shape[0]
-        zns = self.encoder_zn_loc(xs)
-        zns_3d = zns.view(batch_size, self.input_size, self.latent_dim)
-        zns = zns_3d.sum(dim=1)
+        zns, _ = self.encoder_zn(xs)
         return zns
     def get_basal_embedding(self,

{sure_tools-2.1.44 → sure_tools-2.1.45}/SURE_tools.egg-info/PKG-INFO RENAMED Viewed

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

{sure_tools-2.1.44 → sure_tools-2.1.45}/setup.py RENAMED Viewed

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