From d84ae52d415abfa92f8f78b2b9954ef4e331edc6 Mon Sep 17 00:00:00 2001
From: James Hensman <james.hensman@gmail.com>
Date: Tue, 4 Jun 2013 16:21:00 +0100
Subject: [PATCH] fixed Alan's dependency nightmare.

---
 GPy/__init__.py            | 5 +++--
 GPy/core/gp_base.py        | 2 +-
 GPy/models/sparse_GPLVM.py | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/GPy/__init__.py b/GPy/__init__.py
index fa69dac3..3b656626 100644
--- a/GPy/__init__.py
+++ b/GPy/__init__.py
@@ -2,16 +2,17 @@
 # Licensed under the BSD 3-clause license (see LICENSE.txt)
 
 
-import kern
+import core
 import models
 import inference
 import util
 import examples
-from core import priors
 import likelihoods
 import testing
 from numpy.testing import Tester
 from nose.tools import nottest
+import kern
+from core import priors
 
 @nottest
 def tests():
diff --git a/GPy/core/gp_base.py b/GPy/core/gp_base.py
index 8df1a5c1..3eb977c6 100644
--- a/GPy/core/gp_base.py
+++ b/GPy/core/gp_base.py
@@ -4,7 +4,7 @@ from .. import kern
 from ..util.plot import gpplot, Tango, x_frame1D, x_frame2D
 import pylab as pb
 
-class GPBase(model):
+class GPBase(model.model):
     """
     Gaussian Process model for holding shared behaviour between
     sprase_GP and GP models
diff --git a/GPy/models/sparse_GPLVM.py b/GPy/models/sparse_GPLVM.py
index af388f1c..591c49b2 100644
--- a/GPy/models/sparse_GPLVM.py
+++ b/GPy/models/sparse_GPLVM.py
@@ -8,7 +8,7 @@ import sys, pdb
 # from .. import kern
 # from ..core import model
 # from ..util.linalg import pdinv, PCA
-from ..core import GPLVM
+from GPLVM import GPLVM
 from sparse_GP_regression import sparse_GP_regression
 
 class sparse_GPLVM(sparse_GP_regression, GPLVM):