SURE-tools 2.1.53__tar.gz → 2.1.54__tar.gz

{sure_tools-2.1.53 → sure_tools-2.1.54}/PKG-INFO

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

{sure_tools-2.1.53 → sure_tools-2.1.54}/SURE/PerturbFlow.py

@@ -62,7 +62,7 @@ class PerturbFlow(nn.Module):
                  supervised_mode: bool = False,
                  z_dim: int = 10,
                  z_dist: Literal['normal','studentt','laplacian','cauchy','gumbel'] = 'normal',
-                 loss_func: Literal['negbinomial','poisson','multinomial','bernoulli'] = 'negbinomial',
+                 loss_func: Literal['negbinomial','poisson','multinomial','bernoulli','gamma-poisson'] = 'negbinomial',
                  inverse_dispersion: float = 10.0,
                  use_zeroinflate: bool = False,
                  hidden_layers: list = [300],
@@ -225,15 +225,36 @@ class PerturbFlow(nn.Module):
                         )
                     )
             
-        self.decoder_concentrate = MLP(
-                [self.latent_dim] + self.decoder_hidden_layers + [self.input_size],
-                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,
-            )
+        if self.loss_func == 'gamma-poisson':
+            self.decoder_concentrate = MLP(
+                    [self.latent_dim] + self.decoder_hidden_layers + [[self.input_size,self.input_size]],
+                    activation=activate_fct,
+                    output_activation=[Exp,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_concentrate = MLP(
+            #        [self.latent_dim] + self.decoder_hidden_layers + [[self.input_size,self.input_size]],
+            #        activation=activate_fct,
+            #        output_activation=[Exp,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_concentrate = self.decoder_concentrate
+        else:
+            self.decoder_concentrate = MLP(
+                    [self.latent_dim] + self.decoder_hidden_layers + [self.input_size],
+                    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,
+                )
 
         if self.latent_dist == 'studentt':
             self.codebook = MLP(
@@ -352,13 +373,17 @@ class PerturbFlow(nn.Module):
                 zns = pyro.sample('zn', dist.Gumbel(zn_loc, zn_scale).to_event(1))
 
             zs = zns
-            concentrate = self.decoder_concentrate(zs)
-            if self.loss_func == 'bernoulli':
-                log_theta = concentrate
+            if self.loss_func == 'gamma-poisson':
+                con_alpha,con_beta = self.decoder_concentrate(zs)
+                rate = pyro.sample('cs', dist.Gamma(con_alpha, con_beta).to_event(1))
             else:
-                rate = concentrate.exp()
-                if self.loss_func != 'poisson':
-                    theta = dist.DirichletMultinomial(total_count=1, concentration=rate).mean
+                concentrate = self.decoder_concentrate(zs)
+                if self.loss_func == 'bernoulli':
+                    log_theta = concentrate
+                else:
+                    rate = concentrate.exp()
+                    if self.loss_func != 'poisson':
+                        theta = dist.DirichletMultinomial(total_count=1, concentration=rate).mean
 
             if self.loss_func == 'negbinomial':
                 if self.use_zeroinflate:
@@ -370,6 +395,11 @@ class PerturbFlow(nn.Module):
                     pyro.sample('x', dist.ZeroInflatedDistribution(dist.Poisson(rate=rate),gate_logits=gate_logits).to_event(1), obs=xs.round())
                 else:
                     pyro.sample('x', dist.Poisson(rate=rate).to_event(1), obs=xs.round())
+            elif self.loss_func == 'gamma-poisson':
+                if self.use_zeroinflate:
+                    pyro.sample('x', dist.ZeroInflatedDistribution(dist.Poisson(rate=rate),gate_logits=gate_logits).to_event(1), obs=xs.round())
+                else:
+                    pyro.sample('x', dist.Poisson(rate=rate).to_event(1), obs=xs.round())
             elif self.loss_func == 'multinomial':
                 pyro.sample('x', dist.Multinomial(total_count=total_count, probs=theta), obs=xs)
             elif self.loss_func == 'bernoulli':
@@ -386,6 +416,10 @@ class PerturbFlow(nn.Module):
 
             alpha = self.encoder_n(zns)
             ns = pyro.sample('n', dist.OneHotCategorical(logits=alpha))
+            
+            if self.loss_func == 'gamma-poisson':
+                con_alpha,con_beta = self.encoder_concentrate(zns)
+                rate = pyro.sample('cs', dist.Gamma(con_alpha, con_beta).to_event(1))
 
     def model2(self, xs, us=None):
         pyro.module('PerturbFlow', self)
@@ -443,13 +477,17 @@ class PerturbFlow(nn.Module):
             else:
                 zs = zns
 
-            concentrate = self.decoder_concentrate(zs)
-            if self.loss_func == 'bernoulli':
-                log_theta = concentrate
+            if self.loss_func == 'gamma-poisson':
+                con_alpha,con_beta = self.decoder_concentrate(zs)
+                rate = pyro.sample('cs', dist.Gamma(con_alpha, con_beta).to_event(1))
             else:
-                rate = concentrate.exp()
-                if self.loss_func != 'poisson':
-                    theta = dist.DirichletMultinomial(total_count=1, concentration=rate).mean
+                concentrate = self.decoder_concentrate(zs)
+                if self.loss_func == 'bernoulli':
+                    log_theta = concentrate
+                else:
+                    rate = concentrate.exp()
+                    if self.loss_func != 'poisson':
+                        theta = dist.DirichletMultinomial(total_count=1, concentration=rate).mean
 
             if self.loss_func == 'negbinomial':
                 if self.use_zeroinflate:
@@ -461,6 +499,11 @@ class PerturbFlow(nn.Module):
                     pyro.sample('x', dist.ZeroInflatedDistribution(dist.Poisson(rate=rate),gate_logits=gate_logits).to_event(1), obs=xs.round())
                 else:
                     pyro.sample('x', dist.Poisson(rate=rate).to_event(1), obs=xs.round())
+            elif self.loss_func == 'gamma-poisson':
+                if self.use_zeroinflate:
+                    pyro.sample('x', dist.ZeroInflatedDistribution(dist.Poisson(rate=rate),gate_logits=gate_logits).to_event(1), obs=xs.round())
+                else:
+                    pyro.sample('x', dist.Poisson(rate=rate).to_event(1), obs=xs.round())
             elif self.loss_func == 'multinomial':
                 pyro.sample('x', dist.Multinomial(total_count=total_count, probs=theta), obs=xs)
             elif self.loss_func == 'bernoulli':
@@ -477,6 +520,10 @@ class PerturbFlow(nn.Module):
 
             alpha = self.encoder_n(zns)
             ns = pyro.sample('n', dist.OneHotCategorical(logits=alpha))
+            
+            if self.loss_func == 'gamma-poisson':
+                con_alpha,con_beta = self.encoder_concentrate(zns)
+                rate = pyro.sample('cs', dist.Gamma(con_alpha, con_beta).to_event(1))
 
     def model3(self, xs, ys, embeds=None):
         pyro.module('PerturbFlow', self)
@@ -540,13 +587,17 @@ class PerturbFlow(nn.Module):
 
             zs = zns
 
-            concentrate = self.decoder_concentrate(zs)
-            if self.loss_func == 'bernoulli':
-                log_theta = concentrate
+            if self.loss_func == 'gamma-poisson':
+                con_alpha,con_beta = self.decoder_concentrate(zs)
+                rate = pyro.sample('cs', dist.Gamma(con_alpha, con_beta).to_event(1))
             else:
-                rate = concentrate.exp()
-                if self.loss_func != 'poisson':
-                    theta = dist.DirichletMultinomial(total_count=1, concentration=rate).mean
+                concentrate = self.decoder_concentrate(zs)
+                if self.loss_func == 'bernoulli':
+                    log_theta = concentrate
+                else:
+                    rate = concentrate.exp()
+                    if self.loss_func != 'poisson':
+                        theta = dist.DirichletMultinomial(total_count=1, concentration=rate).mean
 
             if self.loss_func == 'negbinomial':
                 if self.use_zeroinflate:
@@ -558,6 +609,11 @@ class PerturbFlow(nn.Module):
                     pyro.sample('x', dist.ZeroInflatedDistribution(dist.Poisson(rate=rate),gate_logits=gate_logits).to_event(1), obs=xs.round())
                 else:
                     pyro.sample('x', dist.Poisson(rate=rate).to_event(1), obs=xs.round())
+            elif self.loss_func == 'gamma-poisson':
+                if self.use_zeroinflate:
+                    pyro.sample('x', dist.ZeroInflatedDistribution(dist.Poisson(rate=rate),gate_logits=gate_logits).to_event(1), obs=xs.round())
+                else:
+                    pyro.sample('x', dist.Poisson(rate=rate).to_event(1), obs=xs.round())
             elif self.loss_func == 'multinomial':
                 pyro.sample('x', dist.Multinomial(total_count=total_count, probs=theta), obs=xs)
             elif self.loss_func == 'bernoulli':
@@ -572,6 +628,12 @@ class PerturbFlow(nn.Module):
                 #zn_loc, zn_scale = self.encoder_zn(xs)
                 zn_loc, zn_scale = self._get_basal_embedding(xs)
                 zns = pyro.sample('zn', dist.Normal(zn_loc, zn_scale).to_event(1))
+            else:
+                zns = embeds
+                
+            if self.loss_func == 'gamma-poisson':
+                con_alpha,con_beta = self.encoder_concentrate(zns)
+                rate = pyro.sample('cs', dist.Gamma(con_alpha, con_beta).to_event(1))
 
     def model4(self, xs, us, ys, embeds=None):
         pyro.module('PerturbFlow', self)
@@ -645,13 +707,17 @@ class PerturbFlow(nn.Module):
             else:
                 zs = zns
 
-            concentrate = self.decoder_concentrate(zs)
-            if self.loss_func == 'bernoulli':
-                log_theta = concentrate
+            if self.loss_func == 'gamma-poisson':
+                con_alpha,con_beta = self.decoder_concentrate(zs)
+                rate = pyro.sample('cs', dist.Gamma(con_alpha, con_beta).to_event(1))
             else:
-                rate = concentrate.exp()
-                if self.loss_func != 'poisson':
-                    theta = dist.DirichletMultinomial(total_count=1, concentration=rate).mean
+                concentrate = self.decoder_concentrate(zs)
+                if self.loss_func == 'bernoulli':
+                    log_theta = concentrate
+                else:
+                    rate = concentrate.exp()
+                    if self.loss_func != 'poisson':
+                        theta = dist.DirichletMultinomial(total_count=1, concentration=rate).mean
 
             if self.loss_func == 'negbinomial':
                 if self.use_zeroinflate:
@@ -663,6 +729,11 @@ class PerturbFlow(nn.Module):
                     pyro.sample('x', dist.ZeroInflatedDistribution(dist.Poisson(rate=rate),gate_logits=gate_logits).to_event(1), obs=xs.round())
                 else:
                     pyro.sample('x', dist.Poisson(rate=rate).to_event(1), obs=xs.round())
+            elif self.loss_func == 'gamma-poisson':
+                if self.use_zeroinflate:
+                    pyro.sample('x', dist.ZeroInflatedDistribution(dist.Poisson(rate=rate),gate_logits=gate_logits).to_event(1), obs=xs.round())
+                else:
+                    pyro.sample('x', dist.Poisson(rate=rate).to_event(1), obs=xs.round())
             elif self.loss_func == 'multinomial':
                 pyro.sample('x', dist.Multinomial(total_count=total_count, probs=theta), obs=xs)
             elif self.loss_func == 'bernoulli':
@@ -677,6 +748,12 @@ class PerturbFlow(nn.Module):
                 #zn_loc, zn_scale = self.encoder_zn(xs)
                 zn_loc, zn_scale = self._get_basal_embedding(xs)
                 zns = pyro.sample('zn', dist.Normal(zn_loc, zn_scale).to_event(1))
+            else:
+                zns = embeds
+            
+            if self.loss_func == 'gamma-poisson':
+                con_alpha,con_beta = self.encoder_concentrate(zns)
+                rate = pyro.sample('cs', dist.Gamma(con_alpha, con_beta).to_event(1))
 
     def _total_effects(self, zns, us):
         zus = None
@@ -855,7 +932,12 @@ class PerturbFlow(nn.Module):
         return tensor_to_numpy(ms)
     
     def _get_expression_response(self, delta_zs):
-        return self.decoder_concentrate(delta_zs)
+        if self.loss_func == 'gamma-poisson':
+            alpha,beta = self.encoder_concentrate(delta_zs)
+            xs = dist.Gamma(alpha,beta).to_event(1).mean
+        else:
+            xs = self.decoder_concentrate(delta_zs)
+        return xs
     
     def get_expression_response(self, 
                              delta_zs, 
@@ -888,10 +970,12 @@ class PerturbFlow(nn.Module):
             theta = dist.DirichletMultinomial(total_count=1, concentration=rate).mean
             
             total_count = pyro.param("inverse_dispersion")
-            counts = dist.NegativeBinomial(total_count=total_count, probs=theta).to_event(1)
+            counts = dist.NegativeBinomial(total_count=total_count, probs=theta).to_event(1).mean
         elif self.loss_func == 'poisson':
             rate = concentrate.exp()
-            counts = dist.Poisson(rate=rate).to_event(1)
+            counts = dist.Poisson(rate=rate).to_event(1).mean
+        elif self.loss_func == 'gamma-poisson':
+            counts = dist.Poisson(rate=concentrate).to_event(1).mean
         return counts
     
     def _count_sample(self,concentrate):

{sure_tools-2.1.53 → sure_tools-2.1.54}/SURE_tools.egg-info/PKG-INFO

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

{sure_tools-2.1.53 → sure_tools-2.1.54}/setup.py

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