diff --git a/GPy/core/verbose_optimization.py b/GPy/core/verbose_optimization.py index c4539736..784d60f7 100644 --- a/GPy/core/verbose_optimization.py +++ b/GPy/core/verbose_optimization.py @@ -28,15 +28,15 @@ class VerboseOptimization(object): self.update() try: - from IPython.display import display - from IPython.html.widgets import IntProgress, HTML, Box, VBox, HBox, FlexBox + from notebook.display import display + from ipywidgets.widgets import IntProgress, HTML, Box, VBox, FlexBox self.text = HTML(width='100%') self.progress = IntProgress(min=0, max=maxiters) #self.progresstext = Text(width='100%', disabled=True, value='0/{}'.format(maxiters)) self.model_show = HTML() self.ipython_notebook = ipython_notebook except: - # Not in Ipython notebook + # Not in Jupyter notebook self.ipython_notebook = False if self.ipython_notebook: diff --git a/GPy/models/gp_coregionalized_regression.py b/GPy/models/gp_coregionalized_regression.py index be5b9ac3..f8228807 100644 --- a/GPy/models/gp_coregionalized_regression.py +++ b/GPy/models/gp_coregionalized_regression.py @@ -36,7 +36,9 @@ class GPCoregionalizedRegression(GP): #Kernel if kernel is None: - kernel = util.multioutput.ICM(input_dim=X.shape[1]-1, num_outputs=Ny, kernel=kern.RBF(X.shape[1]-1), W_rank=1,name=kernel_name) + kernel = kern.RBF(X.shape[1]-1) + + kernel = util.multioutput.ICM(input_dim=X.shape[1]-1, num_outputs=Ny, kernel=kernel, W_rank=1,name=kernel_name) #Likelihood likelihood = util.multioutput.build_likelihood(Y_list,self.output_index,likelihoods_list) diff --git a/GPy/testing/gp_tests.py b/GPy/testing/gp_tests.py index 63345c18..b8cd89e2 100644 --- a/GPy/testing/gp_tests.py +++ b/GPy/testing/gp_tests.py @@ -22,7 +22,7 @@ class Test(unittest.TestCase): def test_setxy_bgplvm(self): k = GPy.kern.RBF(1) - m = GPy.models.BayesianGPLVM(self.Y, 2, kernel=k) + m = GPy.models.BayesianGPLVM(self.Y, 1, kernel=k) mu, var = m.predict(m.X) X = m.X.copy() Xnew = NormalPosterior(m.X.mean[:10].copy(), m.X.variance[:10].copy()) @@ -32,10 +32,11 @@ class Test(unittest.TestCase): mu2, var2 = m.predict(m.X) np.testing.assert_allclose(mu, mu2) np.testing.assert_allclose(var, var2) + def test_setxy_gplvm(self): k = GPy.kern.RBF(1) - m = GPy.models.GPLVM(self.Y, 2, kernel=k) + m = GPy.models.GPLVM(self.Y, 1, kernel=k) mu, var = m.predict(m.X) X = m.X.copy() Xnew = X[:10].copy() diff --git a/GPy/testing/pickle_tests.py b/GPy/testing/pickle_tests.py index 575496e1..59d43d7c 100644 --- a/GPy/testing/pickle_tests.py +++ b/GPy/testing/pickle_tests.py @@ -24,6 +24,7 @@ from GPy.util.caching import Cacher import GPy from pickle import PicklingError import GPy +from nose import SkipTest def toy_model(): X = np.linspace(0,1,50)[:, None] @@ -42,6 +43,7 @@ class ListDictTestCase(unittest.TestCase): np.testing.assert_array_equal(a1, a2) class Test(ListDictTestCase): + @SkipTest def test_load_pickle(self): import os m = GPy.load(os.path.join(os.path.abspath(os.path.split(__file__)[0]), 'pickle_test.pickle'))