Skip to content

Commit 569a82e

Browse files
authored
Merge pull request #2416 from ferrine/approximations_refactoring
Refactoring to support Structured VI
2 parents 33c8bff + 023876b commit 569a82e

32 files changed

+3341
-2718
lines changed

docs/source/notebooks/GLM-hierarchical-advi-minibatch.ipynb

Lines changed: 35 additions & 29 deletions
Large diffs are not rendered by default.

docs/source/notebooks/api_quickstart.ipynb

Lines changed: 130 additions & 204 deletions
Large diffs are not rendered by default.

docs/source/notebooks/bayesian_neural_network_advi.ipynb

Lines changed: 49 additions & 147 deletions
Large diffs are not rendered by default.

docs/source/notebooks/convolutional_vae_keras_advi.ipynb

Lines changed: 29 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@
3131
{
3232
"cell_type": "code",
3333
"execution_count": null,
34-
"metadata": {},
34+
"metadata": {
35+
"collapsed": true
36+
},
3537
"outputs": [],
3638
"source": [
3739
"%autosave 0\n",
@@ -121,7 +123,9 @@
121123
{
122124
"cell_type": "code",
123125
"execution_count": 4,
124-
"metadata": {},
126+
"metadata": {
127+
"collapsed": true
128+
},
125129
"outputs": [],
126130
"source": [
127131
"from keras.models import Sequential\n",
@@ -172,7 +176,9 @@
172176
{
173177
"cell_type": "code",
174178
"execution_count": 8,
175-
"metadata": {},
179+
"metadata": {
180+
"collapsed": true
181+
},
176182
"outputs": [],
177183
"source": [
178184
"def cnn_enc(xs, latent_dim, nb_filters=64, nb_conv=3, intermediate_dim=128):\n",
@@ -216,7 +222,9 @@
216222
{
217223
"cell_type": "code",
218224
"execution_count": 9,
219-
"metadata": {},
225+
"metadata": {
226+
"collapsed": true
227+
},
220228
"outputs": [],
221229
"source": [
222230
"class Encoder:\n",
@@ -292,7 +300,9 @@
292300
{
293301
"cell_type": "code",
294302
"execution_count": 10,
295-
"metadata": {},
303+
"metadata": {
304+
"collapsed": true
305+
},
296306
"outputs": [],
297307
"source": [
298308
"def cnn_dec(zs, nb_filters=64, nb_conv=3, output_shape=(1, 28, 28)):\n",
@@ -331,7 +341,9 @@
331341
{
332342
"cell_type": "code",
333343
"execution_count": 11,
334-
"metadata": {},
344+
"metadata": {
345+
"collapsed": true
346+
},
335347
"outputs": [],
336348
"source": [
337349
"class Decoder:\n",
@@ -385,7 +397,9 @@
385397
{
386398
"cell_type": "code",
387399
"execution_count": 12,
388-
"metadata": {},
400+
"metadata": {
401+
"collapsed": true
402+
},
389403
"outputs": [],
390404
"source": [
391405
"# Constants\n",
@@ -454,7 +468,9 @@
454468
{
455469
"cell_type": "code",
456470
"execution_count": 14,
457-
"metadata": {},
471+
"metadata": {
472+
"collapsed": true
473+
},
458474
"outputs": [],
459475
"source": [
460476
"with pm.Model() as model:\n",
@@ -478,10 +494,12 @@
478494
{
479495
"cell_type": "code",
480496
"execution_count": 15,
481-
"metadata": {},
497+
"metadata": {
498+
"collapsed": true
499+
},
482500
"outputs": [],
483501
"source": [
484-
"local_RVs = OrderedDict({zs: (enc.means, enc.rhos)})"
502+
"local_RVs = OrderedDict({zs: dict(mu=enc.means, rho=enc.rhos)})"
485503
]
486504
},
487505
{
@@ -671,7 +689,7 @@
671689
"name": "python",
672690
"nbconvert_exporter": "python",
673691
"pygments_lexer": "ipython3",
674-
"version": "3.6.1"
692+
"version": "3.6.0b4"
675693
},
676694
"latex_envs": {
677695
"bibliofile": "biblio.bib",

docs/source/notebooks/empirical-approx-overview.ipynb

Lines changed: 39 additions & 70 deletions
Large diffs are not rendered by default.

docs/source/notebooks/gaussian-mixture-model-advi.ipynb

Lines changed: 49 additions & 52 deletions
Large diffs are not rendered by default.

docs/source/notebooks/gaussian_process.ipynb

Lines changed: 45 additions & 24 deletions
Large diffs are not rendered by default.

docs/source/notebooks/lda-advi-aevb.ipynb

Lines changed: 116 additions & 82 deletions
Large diffs are not rendered by default.

docs/source/notebooks/normalizing_flows_overview.ipynb

Lines changed: 131 additions & 179 deletions
Large diffs are not rendered by default.

docs/source/notebooks/variational_api_quickstart.ipynb

Lines changed: 168 additions & 189 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)