Commit0867cde

committed

Do not include RVs in graph of symbolic_normalizing_constant

1 parentb3d575f commit0867cdeCopy full SHA for 0867cde

File tree

+26

-3

lines changed

+26

-3

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -979,7 +979,7 @@ def constant_fold(`
`979`	`979`	`"""`
`980`	`980`	`fg=FunctionGraph(outputs=xs,features=[ShapeFeature()],copy_inputs=False,clone=True)`
`981`	`981`
`982`		`-# The default rewrite_graph includes aconstand_folding that is not always applied.`
	`982`	`+# The default rewrite_graph includes aconstant_folding that is not always applied.`
`983`	`983`	`# We use an unconditional constant_folding as the last pass to ensure a thorough constant folding.`
`984`	`984`	`rewrite_graph(fg)`
`985`	`985`	`topo_unconditional_constant_folding.apply(fg)`

Lines changed: 9 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,7 @@`
`74`	`74`	`frompymc.pytensorfimport (`
`75`	`75`	`SeedSequenceSeed,`
`76`	`76`	`compile,`
	`77`	`+constant_fold,`
`77`	`78`	`find_rng_nodes,`
`78`	`79`	`reseed_rngs,`
`79`	`80`	`)`
`@@ -1105,7 +1106,10 @@ def symbolic_normalizing_constant(self):`
`1105`	`1106`	`t=self.to_flat_input(`
`1106`	`1107`	`pt.max(`
`1107`	`1108`	`[`
`1108`		`-get_scaling(v.owner.inputs[1:],v.shape)`
	`1109`	`+get_scaling(`
	`1110`	`+v.owner.inputs[1:],`
	`1111`	`+constant_fold([v.owner.inputs[0].shape],raise_not_constant=False),`
	`1112`	`+ )`
`1109`	`1113`	`forvinself.group`
`1110`	`1114`	`ifisinstance(v.owner.op,MinibatchRandomVariable)`
`1111`	`1115`	`]`
`@@ -1272,7 +1276,10 @@ def symbolic_normalizing_constant(self):`
`1272`	`1276`	`t=pt.max(`
`1273`	`1277`	`self.collect("symbolic_normalizing_constant")`
`1274`	`1278`	`+ [`
`1275`		`-get_scaling(obs.owner.inputs[1:],obs.shape)`
	`1279`	`+get_scaling(`
	`1280`	`+obs.owner.inputs[1:],`
	`1281`	`+constant_fold([obs.owner.inputs[0].shape],raise_not_constant=False),`
	`1282`	`+ )`
`1276`	`1283`	`forobsinself.model.observed_RVs`
`1277`	`1284`	`ifisinstance(obs.owner.op,MinibatchRandomVariable)`
`1278`	`1285`	`]`

Lines changed: 16 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@`
`20`	`20`
`21`	`21`	`importpymcaspm`
`22`	`22`
	`23`	`+frompymc.testingimportassert_no_rvs`
`23`	`24`	`frompymc.variationalimportopvi`
`24`	`25`	`frompymc.variational.approximationsimport (`
`25`	`26`	`Empirical,`
`@@ -278,3 +279,18 @@ def test_logq_globals(three_var_approx):`
`278`	`279`	`es=symbolic_logq.eval()`
`279`	`280`	`asserte.shape== ()`
`280`	`281`	`assertes.shape== (2,)`
	`282`	`+`
	`283`	`+`
	`284`	`+deftest_symbolic_normalizing_constant_no_rvs():`
	`285`	`+# Test that RVs aren't included in the graph of symbolic_normalizing_constant`
	`286`	`+rng=np.random.default_rng()`
	`287`	`+`
	`288`	`+withpm.Model()asm:`
	`289`	`+obs=pm.Data("obs",rng.normal(size=(1000,)))`
	`290`	`+obs_batch=pm.Minibatch(obs,batch_size=128)`
	`291`	`+x=pm.Normal("x")# Need at least one Free_RV in the graph`
	`292`	`+y_hat=pm.Flat("y_hat",observed=obs_batch,total_size=1000)`
	`293`	`+`
	`294`	`+step=pm.ADVI()`
	`295`	`+`
	`296`	`+assert_no_rvs(step.approx.symbolic_normalizing_constant)`

Comments

(0)