fix import error for edward.inferences.conjugacy

blei-lab · Apr 27, 2017 · 39b6cea · 39b6cea
1 parent 9d837ff
commit 39b6cea
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 9 deletions.
diff --git a/docs/tex/api/criticism.tex b/docs/tex/api/criticism.tex
@@ -41,7 +41,9 @@ \subsubsection{Criticism}
 
 .. automodule:: edward.criticisms
    :members: evaluate,
-             ppc
+             ppc,
+             ppc_density_plot,
+             ppc_stat_hist_plot
 
 %}
 

diff --git a/docs/tex/api/reference.tex b/docs/tex/api/reference.tex
@@ -39,6 +39,7 @@ \subsubsection{Inference}
 
   * :class:`edward.inferences.GANInference`
 
+    * :class:`edward.inferences.BiGANInference`
     * :class:`edward.inferences.ImplicitKLqp`
     * :class:`edward.inferences.WGANInference`
 
@@ -48,18 +49,23 @@ \subsubsection{Inference}
 
 * :class:`edward.inferences.MonteCarlo`
 
+  * :class:`edward.inferences.Gibbs`
   * :class:`edward.inferences.MetropolisHastings`
   * :class:`edward.inferences.HMC`
   * :class:`edward.inferences.SGLD`
   * :class:`edward.inferences.SGHMC`
 
+* :func:`edward.complete_conditional`
+
 %}
 
 \subsubsection{Criticism}
 
 {%sphinx
 
-* :func:`edward.criticisms.evaluate`
-* :func:`edward.criticisms.ppc`
+* :func:`edward.evaluate`
+* :func:`edward.ppc`
+* :func:`edward.ppc_density_plot`
+* :func:`edward.ppc_stat_hist_plot`
 
 %}
diff --git a/docs/tex/iclr2017.tex b/docs/tex/iclr2017.tex
@@ -12,7 +12,7 @@ \subsection{Deep Probabilistic Programming}
 The code snippets assume the following versions.
 
 \begin{lstlisting}[language=bash]
-pip install edward==1.3.0
+pip install edward==1.3.1
 pip install tensorflow==1.1.0  # alternatively, tensorflow-gpu==1.1.0
 pip install keras==2.0.0
 \end{lstlisting}

diff --git a/docs/tex/tutorials/unsupervised.tex b/docs/tex/tutorials/unsupervised.tex
@@ -191,9 +191,9 @@ \subsubsection{Criticism}
 # Calculate likelihood for each data point and cluster assignment,
 # averaged over many posterior samples. ``x_post`` has shape (N, 100, K, D).
 mu_sample = qmu.sample(100)
-sigma_sample = qsigma.sample(100)
+sigmasq_sample = qsigmasq.sample(100)
 x_post = Normal(loc=tf.ones([N, 1, 1, 1]) * mu_sample,
-                scale=tf.ones([N, 1, 1, 1]) * sigma_sample)
+                scale=tf.ones([N, 1, 1, 1]) * tf.sqrt(sigmasq_sample))
 x_broadcasted = tf.tile(tf.reshape(x_train, [N, 1, 1, D]), [1, 100, K, 1])
 
 # Sum over latent dimension, then average over posterior samples.

diff --git a/edward/version.py b/edward/version.py
@@ -1 +1 @@
-__version__ = '1.3.0'
+__version__ = '1.3.1'
diff --git a/notebooks/iclr2017.ipynb b/notebooks/iclr2017.ipynb
@@ -8,7 +8,7 @@
     "\n",
     "The code snippets assume the following versions.\n",
     "```bash\n",
-    "pip install edward==1.3.0\n",
+    "pip install edward==1.3.1\n",
     "pip install tensorflow==1.1.0  # alternatively, tensorflow-gpu==1.1.0\n",
     "pip install keras==2.0.0\n",
     "```"

diff --git a/setup.py b/setup.py
@@ -11,7 +11,7 @@
     author='Dustin Tran',
     author_email="dustin@cs.columbia.edu",
     packages=['edward', 'edward.criticisms', 'edward.inferences',
-              'edward.models', 'edward.util'],
+              'edward.models', 'edward.util', 'edward.inferences.conjugacy'],
     install_requires=['numpy>=1.7',
                       'six>=1.10.0'],
     extras_require={'tensorflow': ['tensorflow>=1.1.0rc0'],