From 5e4afb765a2aca96026159ab967a427ab922c919 Mon Sep 17 00:00:00 2001 From: Mike Croucher Date: Thu, 26 Feb 2015 07:10:10 +0000 Subject: [PATCH] Relative import fixes for Python 3 compatibility --- GPy/__init__.py | 26 ++++++++--------- GPy/core/__init__.py | 16 +++++------ GPy/core/parameterization/__init__.py | 4 +-- GPy/examples/__init__.py | 8 +++--- GPy/inference/__init__.py | 6 ++-- GPy/kern/__init__.py | 36 ++++++++++++------------ GPy/likelihoods/__init__.py | 16 +++++------ GPy/mappings/__init__.py | 6 ++-- GPy/models/__init__.py | 40 +++++++++++++-------------- GPy/plotting/__init__.py | 2 +- GPy/util/__init__.py | 28 +++++++++---------- 11 files changed, 94 insertions(+), 94 deletions(-) diff --git a/GPy/__init__.py b/GPy/__init__.py index 5e091170..26713406 100644 --- a/GPy/__init__.py +++ b/GPy/__init__.py @@ -3,23 +3,23 @@ import warnings warnings.filterwarnings("ignore", category=DeprecationWarning) -import core -from core.parameterization import transformations, priors +from . import core +from .core.parameterization import transformations, priors constraints = transformations -import models -import mappings -import inference -import util -import examples -import likelihoods -import testing +from . import models +from . import mappings +from . import inference +from . import util +from . import examples +from . import likelihoods +from . import testing from numpy.testing import Tester -import kern -import plotting +from . import kern +from . import plotting # Direct imports for convenience: -from core import Model -from core.parameterization import Param, Parameterized, ObsAr +from .core import Model +from .core.parameterization import Param, Parameterized, ObsAr #@nottest try: diff --git a/GPy/core/__init__.py b/GPy/core/__init__.py index ebed29bb..142eccbf 100644 --- a/GPy/core/__init__.py +++ b/GPy/core/__init__.py @@ -1,12 +1,12 @@ # Copyright (c) 2012-2014, GPy authors (see AUTHORS.txt). # Licensed under the BSD 3-clause license (see LICENSE.txt) -from model import * -from parameterization.parameterized import adjust_name_for_printing, Parameterizable -from parameterization.param import Param, ParamConcatenation -from parameterization.observable_array import ObsAr +from .model import * +from .parameterization.parameterized import adjust_name_for_printing, Parameterizable +from .parameterization.param import Param, ParamConcatenation +from .parameterization.observable_array import ObsAr -from gp import GP -from svgp import SVGP -from sparse_gp import SparseGP -from mapping import * +from .gp import GP +from .svgp import SVGP +from .sparse_gp import SparseGP +from .mapping import * diff --git a/GPy/core/parameterization/__init__.py b/GPy/core/parameterization/__init__.py index 8e9aa094..de736671 100644 --- a/GPy/core/parameterization/__init__.py +++ b/GPy/core/parameterization/__init__.py @@ -1,5 +1,5 @@ # Copyright (c) 2012, GPy authors (see AUTHORS.txt). # Licensed under the BSD 3-clause license (see LICENSE.txt) -from param import Param, ObsAr -from parameterized import Parameterized +from .param import Param, ObsAr +from .parameterized import Parameterized diff --git a/GPy/examples/__init__.py b/GPy/examples/__init__.py index 968333e0..4e9e984e 100644 --- a/GPy/examples/__init__.py +++ b/GPy/examples/__init__.py @@ -1,7 +1,7 @@ # Copyright (c) 2012-2014, GPy authors (see AUTHORS.txt). # Licensed under the BSD 3-clause license (see LICENSE.txt) -import classification -import regression -import dimensionality_reduction -import non_gaussian +from . import classification +from . import regression +from . import dimensionality_reduction +from . import non_gaussian diff --git a/GPy/inference/__init__.py b/GPy/inference/__init__.py index 7b1307e3..c5044582 100644 --- a/GPy/inference/__init__.py +++ b/GPy/inference/__init__.py @@ -1,3 +1,3 @@ -import latent_function_inference -import optimization -import mcmc +from . import latent_function_inference +from . import optimization +from . import mcmc diff --git a/GPy/kern/__init__.py b/GPy/kern/__init__.py index 718be74f..aaeb99a2 100644 --- a/GPy/kern/__init__.py +++ b/GPy/kern/__init__.py @@ -1,20 +1,20 @@ -from _src.kern import Kern -from _src.rbf import RBF -from _src.linear import Linear, LinearFull -from _src.static import Bias, White, Fixed -from _src.brownian import Brownian -from _src.stationary import Exponential, OU, Matern32, Matern52, ExpQuad, RatQuad, Cosine -from _src.mlp import MLP -from _src.periodic import PeriodicExponential, PeriodicMatern32, PeriodicMatern52 -from _src.independent_outputs import IndependentOutputs, Hierarchical -from _src.coregionalize import Coregionalize -from _src.ODE_UY import ODE_UY -from _src.ODE_UYC import ODE_UYC -from _src.ODE_st import ODE_st -from _src.ODE_t import ODE_t -from _src.poly import Poly -from _src.eq_ode2 import EQ_ODE2 +from ._src.kern import Kern +from ._src.rbf import RBF +from ._src.linear import Linear, LinearFull +from ._src.static import Bias, White, Fixed +from ._src.brownian import Brownian +from ._src.stationary import Exponential, OU, Matern32, Matern52, ExpQuad, RatQuad, Cosine +from ._src.mlp import MLP +from ._src.periodic import PeriodicExponential, PeriodicMatern32, PeriodicMatern52 +from ._src.independent_outputs import IndependentOutputs, Hierarchical +from ._src.coregionalize import Coregionalize +from ._src.ODE_UY import ODE_UY +from ._src.ODE_UYC import ODE_UYC +from ._src.ODE_st import ODE_st +from ._src.ODE_t import ODE_t +from ._src.poly import Poly +from ._src.eq_ode2 import EQ_ODE2 -from _src.trunclinear import TruncLinear,TruncLinear_inf -from _src.splitKern import SplitKern,DiffGenomeKern +from ._src.trunclinear import TruncLinear,TruncLinear_inf +from ._src.splitKern import SplitKern,DiffGenomeKern diff --git a/GPy/likelihoods/__init__.py b/GPy/likelihoods/__init__.py index 28e44541..ef29da08 100644 --- a/GPy/likelihoods/__init__.py +++ b/GPy/likelihoods/__init__.py @@ -1,8 +1,8 @@ -from bernoulli import Bernoulli -from exponential import Exponential -from gaussian import Gaussian -from gamma import Gamma -from poisson import Poisson -from student_t import StudentT -from likelihood import Likelihood -from mixed_noise import MixedNoise +from .bernoulli import Bernoulli +from .exponential import Exponential +from .gaussian import Gaussian +from .gamma import Gamma +from .poisson import Poisson +from .student_t import StudentT +from .likelihood import Likelihood +from .mixed_noise import MixedNoise diff --git a/GPy/mappings/__init__.py b/GPy/mappings/__init__.py index d331c678..d9c13ad0 100644 --- a/GPy/mappings/__init__.py +++ b/GPy/mappings/__init__.py @@ -1,7 +1,7 @@ # Copyright (c) 2013, 2014 GPy authors (see AUTHORS.txt). # Licensed under the BSD 3-clause license (see LICENSE.txt) -from kernel import Kernel -from linear import Linear -from mlp import MLP +from .kernel import Kernel +from .linear import Linear +from .mlp import MLP #from rbf import RBF diff --git a/GPy/models/__init__.py b/GPy/models/__init__.py index c6abb5de..8f8fd838 100644 --- a/GPy/models/__init__.py +++ b/GPy/models/__init__.py @@ -1,23 +1,23 @@ # Copyright (c) 2012, GPy authors (see AUTHORS.txt). # Licensed under the BSD 3-clause license (see LICENSE.txt) -from gp_regression import GPRegression -from gp_classification import GPClassification -from sparse_gp_regression import SparseGPRegression, SparseGPRegressionUncertainInput -from sparse_gp_classification import SparseGPClassification -from gplvm import GPLVM -from bcgplvm import BCGPLVM -from sparse_gplvm import SparseGPLVM -from warped_gp import WarpedGP -from bayesian_gplvm import BayesianGPLVM -from mrd import MRD -from gradient_checker import GradientChecker -from ss_gplvm import SSGPLVM -from gp_coregionalized_regression import GPCoregionalizedRegression -from sparse_gp_coregionalized_regression import SparseGPCoregionalizedRegression -from gp_heteroscedastic_regression import GPHeteroscedasticRegression -from ss_mrd import SSMRD -from gp_kronecker_gaussian_regression import GPKroneckerGaussianRegression -from gp_var_gauss import GPVariationalGaussianApproximation -from one_vs_all_classification import OneVsAllClassification -from one_vs_all_sparse_classification import OneVsAllSparseClassification +from .gp_regression import GPRegression +from .gp_classification import GPClassification +from .sparse_gp_regression import SparseGPRegression, SparseGPRegressionUncertainInput +from .sparse_gp_classification import SparseGPClassification +from .gplvm import GPLVM +from .bcgplvm import BCGPLVM +from .sparse_gplvm import SparseGPLVM +from .warped_gp import WarpedGP +from .bayesian_gplvm import BayesianGPLVM +from .mrd import MRD +from .gradient_checker import GradientChecker +from .ss_gplvm import SSGPLVM +from .gp_coregionalized_regression import GPCoregionalizedRegression +from .sparse_gp_coregionalized_regression import SparseGPCoregionalizedRegression +from .gp_heteroscedastic_regression import GPHeteroscedasticRegression +from .ss_mrd import SSMRD +from .gp_kronecker_gaussian_regression import GPKroneckerGaussianRegression +from .gp_var_gauss import GPVariationalGaussianApproximation +from .one_vs_all_classification import OneVsAllClassification +from .one_vs_all_sparse_classification import OneVsAllSparseClassification diff --git a/GPy/plotting/__init__.py b/GPy/plotting/__init__.py index d3a96914..652bc628 100644 --- a/GPy/plotting/__init__.py +++ b/GPy/plotting/__init__.py @@ -2,6 +2,6 @@ # Licensed under the BSD 3-clause license (see LICENSE.txt) try: - import matplot_dep + from . import matplot_dep except (ImportError, NameError): print 'Fail to load GPy.plotting.matplot_dep.' \ No newline at end of file diff --git a/GPy/util/__init__.py b/GPy/util/__init__.py index c3edfc48..e8d2456e 100644 --- a/GPy/util/__init__.py +++ b/GPy/util/__init__.py @@ -2,18 +2,18 @@ # Licensed under the BSD 3-clause license (see LICENSE.txt) -import linalg -import misc -import squashers -import warping_functions -import datasets -import mocap -import decorators -import classification -import subarray_and_sorting -import caching -import diag -import initialization -import multioutput -import linalg_gpu +from . import linalg +from . import misc +from . import squashers +from . import warping_functions +from . import datasets +from . import mocap +from . import decorators +from . import classification +from . import subarray_and_sorting +from . import caching +from . import diag +from . import initialization +from . import multioutput +from . import linalg_gpu