From 4b7036bdb2e614afe5f0b65dd5e38e064ef38b7a Mon Sep 17 00:00:00 2001 From: Mike Croucher Date: Fri, 27 Feb 2015 17:45:20 +0000 Subject: [PATCH] More input fixes --- GPy/inference/optimization/__init__.py | 4 ++-- GPy/inference/optimization/conjugate_gradient_descent.py | 2 +- GPy/inference/optimization/optimization.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/GPy/inference/optimization/__init__.py b/GPy/inference/optimization/__init__.py index 1a8f043b..909f897b 100644 --- a/GPy/inference/optimization/__init__.py +++ b/GPy/inference/optimization/__init__.py @@ -1,2 +1,2 @@ -from scg import SCG -from optimization import * +from .scg import SCG +from .optimization import * diff --git a/GPy/inference/optimization/conjugate_gradient_descent.py b/GPy/inference/optimization/conjugate_gradient_descent.py index 274de784..fc2d8b61 100644 --- a/GPy/inference/optimization/conjugate_gradient_descent.py +++ b/GPy/inference/optimization/conjugate_gradient_descent.py @@ -1,7 +1,7 @@ # Copyright (c) 2012-2014, Max Zwiessele # Licensed under the BSD 3-clause license (see LICENSE.txt) -from gradient_descent_update_rules import FletcherReeves, \ +from .gradient_descent_update_rules import FletcherReeves, \ PolakRibiere from Queue import Empty from multiprocessing import Value diff --git a/GPy/inference/optimization/optimization.py b/GPy/inference/optimization/optimization.py index 600de35d..2179bf5e 100644 --- a/GPy/inference/optimization/optimization.py +++ b/GPy/inference/optimization/optimization.py @@ -10,7 +10,7 @@ try: rasm_available = True except ImportError: rasm_available = False -from scg import SCG +from .scg import SCG class Optimizer(): """