Relative import fixes for Python 3 compatibility

GPy/__init__.py

@@ -3,23 +3,23 @@
 import warnings
 warnings.filterwarnings("ignore", category=DeprecationWarning)
 
-import core
+from . import core
-from core.parameterization import transformations, priors
+from .core.parameterization import transformations, priors
 constraints = transformations
-import models
+from . import models
-import mappings
+from . import mappings
-import inference
+from . import inference
-import util
+from . import util
-import examples
+from . import examples
-import likelihoods
+from . import likelihoods
-import testing
+from . import testing
 from numpy.testing import Tester
-import kern
+from . import kern
-import plotting
+from . import plotting
 
 # Direct imports for convenience:
-from core import Model
+from .core import Model
-from core.parameterization import Param, Parameterized, ObsAr
+from .core.parameterization import Param, Parameterized, ObsAr
 
 #@nottest
 try:

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 .model import *
-from parameterization.parameterized import adjust_name_for_printing, Parameterizable
+from .parameterization.parameterized import adjust_name_for_printing, Parameterizable
-from parameterization.param import Param, ParamConcatenation
+from .parameterization.param import Param, ParamConcatenation
-from parameterization.observable_array import ObsAr
+from .parameterization.observable_array import ObsAr
 
-from gp import GP
+from .gp import GP
-from svgp import SVGP
+from .svgp import SVGP
-from sparse_gp import SparseGP
+from .sparse_gp import SparseGP
-from mapping import *
+from .mapping import *

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 .param import Param, ObsAr
-from parameterized import Parameterized
+from .parameterized import Parameterized

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
+from . import classification
-import regression
+from . import regression
-import dimensionality_reduction
+from . import dimensionality_reduction
-import non_gaussian
+from . import non_gaussian

GPy/inference/__init__.py

@@ -1,3 +1,3 @@
-import latent_function_inference
+from . import latent_function_inference
-import optimization
+from . import optimization
-import mcmc
+from . import mcmc

GPy/kern/__init__.py

@@ -1,20 +1,20 @@
-from _src.kern import Kern
+from ._src.kern import Kern
-from _src.rbf import RBF
+from ._src.rbf import RBF
-from _src.linear import Linear, LinearFull
+from ._src.linear import Linear, LinearFull
-from _src.static import Bias, White, Fixed
+from ._src.static import Bias, White, Fixed
-from _src.brownian import Brownian
+from ._src.brownian import Brownian
-from _src.stationary import Exponential, OU, Matern32, Matern52, ExpQuad, RatQuad, Cosine
+from ._src.stationary import Exponential, OU, Matern32, Matern52, ExpQuad, RatQuad, Cosine
-from _src.mlp import MLP
+from ._src.mlp import MLP
-from _src.periodic import PeriodicExponential, PeriodicMatern32, PeriodicMatern52
+from ._src.periodic import PeriodicExponential, PeriodicMatern32, PeriodicMatern52
-from _src.independent_outputs import IndependentOutputs, Hierarchical
+from ._src.independent_outputs import IndependentOutputs, Hierarchical
-from _src.coregionalize import Coregionalize
+from ._src.coregionalize import Coregionalize
-from _src.ODE_UY import ODE_UY
+from ._src.ODE_UY import ODE_UY
-from _src.ODE_UYC import ODE_UYC
+from ._src.ODE_UYC import ODE_UYC
-from _src.ODE_st import ODE_st
+from ._src.ODE_st import ODE_st
-from _src.ODE_t import ODE_t
+from ._src.ODE_t import ODE_t
-from _src.poly import Poly
+from ._src.poly import Poly
-from _src.eq_ode2 import EQ_ODE2
+from ._src.eq_ode2 import EQ_ODE2
 
-from _src.trunclinear import TruncLinear,TruncLinear_inf
+from ._src.trunclinear import TruncLinear,TruncLinear_inf
-from _src.splitKern import SplitKern,DiffGenomeKern
+from ._src.splitKern import SplitKern,DiffGenomeKern
 

GPy/likelihoods/__init__.py

@@ -1,8 +1,8 @@
-from bernoulli import Bernoulli
+from .bernoulli import Bernoulli
-from exponential import Exponential
+from .exponential import Exponential
-from gaussian import Gaussian
+from .gaussian import Gaussian
-from gamma import Gamma
+from .gamma import Gamma
-from poisson import Poisson
+from .poisson import Poisson
-from student_t import StudentT
+from .student_t import StudentT
-from likelihood import Likelihood
+from .likelihood import Likelihood
-from mixed_noise import MixedNoise
+from .mixed_noise import MixedNoise

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 .kernel import Kernel
-from linear import Linear
+from .linear import Linear
-from mlp import MLP
+from .mlp import MLP
 #from rbf import RBF

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_regression import GPRegression
-from gp_classification import GPClassification
+from .gp_classification import GPClassification
-from sparse_gp_regression import SparseGPRegression, SparseGPRegressionUncertainInput
+from .sparse_gp_regression import SparseGPRegression, SparseGPRegressionUncertainInput
-from sparse_gp_classification import SparseGPClassification
+from .sparse_gp_classification import SparseGPClassification
-from gplvm import GPLVM
+from .gplvm import GPLVM
-from bcgplvm import BCGPLVM
+from .bcgplvm import BCGPLVM
-from sparse_gplvm import SparseGPLVM
+from .sparse_gplvm import SparseGPLVM
-from warped_gp import WarpedGP
+from .warped_gp import WarpedGP
-from bayesian_gplvm import BayesianGPLVM
+from .bayesian_gplvm import BayesianGPLVM
-from mrd import MRD
+from .mrd import MRD
-from gradient_checker import GradientChecker
+from .gradient_checker import GradientChecker
-from ss_gplvm import SSGPLVM
+from .ss_gplvm import SSGPLVM
-from gp_coregionalized_regression import GPCoregionalizedRegression
+from .gp_coregionalized_regression import GPCoregionalizedRegression
-from sparse_gp_coregionalized_regression import SparseGPCoregionalizedRegression
+from .sparse_gp_coregionalized_regression import SparseGPCoregionalizedRegression
-from gp_heteroscedastic_regression import GPHeteroscedasticRegression
+from .gp_heteroscedastic_regression import GPHeteroscedasticRegression
-from ss_mrd import SSMRD
+from .ss_mrd import SSMRD
-from gp_kronecker_gaussian_regression import GPKroneckerGaussianRegression
+from .gp_kronecker_gaussian_regression import GPKroneckerGaussianRegression
-from gp_var_gauss import GPVariationalGaussianApproximation
+from .gp_var_gauss import GPVariationalGaussianApproximation
-from one_vs_all_classification import OneVsAllClassification
+from .one_vs_all_classification import OneVsAllClassification
-from one_vs_all_sparse_classification import OneVsAllSparseClassification
+from .one_vs_all_sparse_classification import OneVsAllSparseClassification

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.'

GPy/util/__init__.py

@@ -2,18 +2,18 @@
 # Licensed under the BSD 3-clause license (see LICENSE.txt)
 
 
-import linalg
+from . import linalg
-import misc
+from . import misc
-import squashers
+from . import squashers
-import warping_functions
+from . import warping_functions
-import datasets
+from . import datasets
-import mocap
+from . import mocap
-import decorators
+from . import decorators
-import classification
+from . import classification
-import subarray_and_sorting
+from . import subarray_and_sorting
-import caching
+from . import caching
-import diag
+from . import diag
-import initialization
+from . import initialization
-import multioutput
+from . import multioutput
-import linalg_gpu
+from . import linalg_gpu