From a1589267df0f5f54f3d473a7f13067348a75ddc5 Mon Sep 17 00:00:00 2001
From: rdevon <devon@cs.unm.edu>
Date: Wed, 22 Oct 2014 22:26:37 -0600
Subject: [PATCH] Made the docs numpydoc compliant. Modified inference
 procedure to have a method "is_rbm_compatible" that will raise a
 NotImplementedError if not appropriate for RBM. Removed assert for RBM and
 UpDown inference.

---
 pylearn2/models/dbm/dbm.py                 | 2 +-
 pylearn2/models/dbm/inference_procedure.py | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/pylearn2/models/dbm/dbm.py b/pylearn2/models/dbm/dbm.py
index 765eea8516..74a0ee6cb1 100755
--- a/pylearn2/models/dbm/dbm.py
+++ b/pylearn2/models/dbm/dbm.py
@@ -21,7 +21,7 @@
 from pylearn2.models.dbm.inference_procedure import WeightDoubling
 from pylearn2.models.dbm.inference_procedure import UpDown
 from pylearn2.models.dbm.sampling_procedure import GibbsEvenOdd
-from pylearn2.models.dbm import Softmax
+from pylearn2.models.dbm.layer import Softmax
 from pylearn2.utils import safe_zip, safe_izip
 from pylearn2.utils.rng import make_np_rng
 
diff --git a/pylearn2/models/dbm/inference_procedure.py b/pylearn2/models/dbm/inference_procedure.py
index 4f591282bd..128a83c37a 100644
--- a/pylearn2/models/dbm/inference_procedure.py
+++ b/pylearn2/models/dbm/inference_procedure.py
@@ -1539,8 +1539,4 @@ def is_rbm_compatible(self):
         """
         Is implemented as UpDown is RBM compatible.
         """
-<<<<<<< HEAD
         return True
-=======
-        return
->>>>>>> 20fa672... Made the docs numpydoc compliant.