From 89e216b6a67cf7c8dd0c2e274299239e94d90ebe Mon Sep 17 00:00:00 2001 From: James Hensman Date: Wed, 19 Feb 2014 13:38:36 +0000 Subject: [PATCH] moved stuff. much breakage. Ow. --- GPy/kern/{parts => }/Brownian.py | 0 GPy/kern/{parts => }/Matern32.py | 0 GPy/kern/{parts => }/Matern52.py | 0 GPy/kern/{parts => }/ODE_1.py | 0 GPy/kern/__init__.py | 38 +++++++++++++++----- GPy/kern/__init__old.py | 9 +++++ GPy/kern/{parts => }/bias.py | 0 GPy/kern/{parts => }/coregionalize.py | 0 GPy/kern/{parts => }/eq_ode1.py | 0 GPy/kern/{parts => }/exponential.py | 0 GPy/kern/{parts => }/finite_dimensional.py | 0 GPy/kern/{parts => }/fixed.py | 0 GPy/kern/{parts => }/gibbs.py | 0 GPy/kern/{parts => }/hetero.py | 0 GPy/kern/{parts => }/hierarchical.py | 0 GPy/kern/{parts => }/independent_outputs.py | 0 GPy/kern/{parts => }/kernpart.py | 0 GPy/kern/{parts => }/linear.py | 0 GPy/kern/{parts => }/mlp.py | 0 GPy/kern/{parts => }/odekern1.c | 0 GPy/kern/parts/__init__.py | 29 --------------- GPy/kern/{parts => }/periodic_Matern32.py | 0 GPy/kern/{parts => }/periodic_Matern52.py | 0 GPy/kern/{parts => }/periodic_exponential.py | 0 GPy/kern/{parts => }/poly.py | 0 GPy/kern/{parts => }/prod.py | 0 GPy/kern/{parts => }/prod_orthogonal.py | 0 GPy/kern/{parts => }/rational_quadratic.py | 0 GPy/kern/{parts => }/rbf.py | 0 GPy/kern/{parts => }/rbf_inv.py | 0 GPy/kern/{parts => }/rbfcos.py | 0 GPy/kern/{parts => }/spline.py | 0 GPy/kern/{parts => }/ss_rbf.py | 0 GPy/kern/{parts => }/symmetric.py | 0 GPy/kern/{parts => }/sympy_helpers.cpp | 0 GPy/kern/{parts => }/sympy_helpers.h | 0 GPy/kern/{parts => }/sympykern.py | 0 GPy/kern/{parts => }/white.py | 0 38 files changed, 38 insertions(+), 38 deletions(-) rename GPy/kern/{parts => }/Brownian.py (100%) rename GPy/kern/{parts => }/Matern32.py (100%) rename GPy/kern/{parts => }/Matern52.py (100%) rename GPy/kern/{parts => }/ODE_1.py (100%) create mode 100644 GPy/kern/__init__old.py rename GPy/kern/{parts => }/bias.py (100%) rename GPy/kern/{parts => }/coregionalize.py (100%) rename GPy/kern/{parts => }/eq_ode1.py (100%) rename GPy/kern/{parts => }/exponential.py (100%) rename GPy/kern/{parts => }/finite_dimensional.py (100%) rename GPy/kern/{parts => }/fixed.py (100%) rename GPy/kern/{parts => }/gibbs.py (100%) rename GPy/kern/{parts => }/hetero.py (100%) rename GPy/kern/{parts => }/hierarchical.py (100%) rename GPy/kern/{parts => }/independent_outputs.py (100%) rename GPy/kern/{parts => }/kernpart.py (100%) rename GPy/kern/{parts => }/linear.py (100%) rename GPy/kern/{parts => }/mlp.py (100%) rename GPy/kern/{parts => }/odekern1.c (100%) delete mode 100644 GPy/kern/parts/__init__.py rename GPy/kern/{parts => }/periodic_Matern32.py (100%) rename GPy/kern/{parts => }/periodic_Matern52.py (100%) rename GPy/kern/{parts => }/periodic_exponential.py (100%) rename GPy/kern/{parts => }/poly.py (100%) rename GPy/kern/{parts => }/prod.py (100%) rename GPy/kern/{parts => }/prod_orthogonal.py (100%) rename GPy/kern/{parts => }/rational_quadratic.py (100%) rename GPy/kern/{parts => }/rbf.py (100%) rename GPy/kern/{parts => }/rbf_inv.py (100%) rename GPy/kern/{parts => }/rbfcos.py (100%) rename GPy/kern/{parts => }/spline.py (100%) rename GPy/kern/{parts => }/ss_rbf.py (100%) rename GPy/kern/{parts => }/symmetric.py (100%) rename GPy/kern/{parts => }/sympy_helpers.cpp (100%) rename GPy/kern/{parts => }/sympy_helpers.h (100%) rename GPy/kern/{parts => }/sympykern.py (100%) rename GPy/kern/{parts => }/white.py (100%) diff --git a/GPy/kern/parts/Brownian.py b/GPy/kern/Brownian.py similarity index 100% rename from GPy/kern/parts/Brownian.py rename to GPy/kern/Brownian.py diff --git a/GPy/kern/parts/Matern32.py b/GPy/kern/Matern32.py similarity index 100% rename from GPy/kern/parts/Matern32.py rename to GPy/kern/Matern32.py diff --git a/GPy/kern/parts/Matern52.py b/GPy/kern/Matern52.py similarity index 100% rename from GPy/kern/parts/Matern52.py rename to GPy/kern/Matern52.py diff --git a/GPy/kern/parts/ODE_1.py b/GPy/kern/ODE_1.py similarity index 100% rename from GPy/kern/parts/ODE_1.py rename to GPy/kern/ODE_1.py diff --git a/GPy/kern/__init__.py b/GPy/kern/__init__.py index eb4076c3..0a758f1e 100644 --- a/GPy/kern/__init__.py +++ b/GPy/kern/__init__.py @@ -1,9 +1,29 @@ -# Copyright (c) 2012, 2013 GPy authors (see AUTHORS.txt). -# Licensed under the BSD 3-clause license (see LICENSE.txt) - -from constructors import * -try: - from constructors import rbf_sympy, sympykern # these depend on sympy -except: - pass -from kern import * +import bias +import Brownian +import coregionalize +import exponential +import eq_ode1 +import finite_dimensional +import fixed +import gibbs +import hetero +import hierarchical +import independent_outputs +import linear +import Matern32 +import Matern52 +import mlp +import ODE_1 +import periodic_exponential +import periodic_Matern32 +import periodic_Matern52 +import poly +import prod_orthogonal +import prod +import rational_quadratic +import rbfcos +import rbf +import rbf_inv +import spline +import symmetric +import white diff --git a/GPy/kern/__init__old.py b/GPy/kern/__init__old.py new file mode 100644 index 00000000..eb4076c3 --- /dev/null +++ b/GPy/kern/__init__old.py @@ -0,0 +1,9 @@ +# Copyright (c) 2012, 2013 GPy authors (see AUTHORS.txt). +# Licensed under the BSD 3-clause license (see LICENSE.txt) + +from constructors import * +try: + from constructors import rbf_sympy, sympykern # these depend on sympy +except: + pass +from kern import * diff --git a/GPy/kern/parts/bias.py b/GPy/kern/bias.py similarity index 100% rename from GPy/kern/parts/bias.py rename to GPy/kern/bias.py diff --git a/GPy/kern/parts/coregionalize.py b/GPy/kern/coregionalize.py similarity index 100% rename from GPy/kern/parts/coregionalize.py rename to GPy/kern/coregionalize.py diff --git a/GPy/kern/parts/eq_ode1.py b/GPy/kern/eq_ode1.py similarity index 100% rename from GPy/kern/parts/eq_ode1.py rename to GPy/kern/eq_ode1.py diff --git a/GPy/kern/parts/exponential.py b/GPy/kern/exponential.py similarity index 100% rename from GPy/kern/parts/exponential.py rename to GPy/kern/exponential.py diff --git a/GPy/kern/parts/finite_dimensional.py b/GPy/kern/finite_dimensional.py similarity index 100% rename from GPy/kern/parts/finite_dimensional.py rename to GPy/kern/finite_dimensional.py diff --git a/GPy/kern/parts/fixed.py b/GPy/kern/fixed.py similarity index 100% rename from GPy/kern/parts/fixed.py rename to GPy/kern/fixed.py diff --git a/GPy/kern/parts/gibbs.py b/GPy/kern/gibbs.py similarity index 100% rename from GPy/kern/parts/gibbs.py rename to GPy/kern/gibbs.py diff --git a/GPy/kern/parts/hetero.py b/GPy/kern/hetero.py similarity index 100% rename from GPy/kern/parts/hetero.py rename to GPy/kern/hetero.py diff --git a/GPy/kern/parts/hierarchical.py b/GPy/kern/hierarchical.py similarity index 100% rename from GPy/kern/parts/hierarchical.py rename to GPy/kern/hierarchical.py diff --git a/GPy/kern/parts/independent_outputs.py b/GPy/kern/independent_outputs.py similarity index 100% rename from GPy/kern/parts/independent_outputs.py rename to GPy/kern/independent_outputs.py diff --git a/GPy/kern/parts/kernpart.py b/GPy/kern/kernpart.py similarity index 100% rename from GPy/kern/parts/kernpart.py rename to GPy/kern/kernpart.py diff --git a/GPy/kern/parts/linear.py b/GPy/kern/linear.py similarity index 100% rename from GPy/kern/parts/linear.py rename to GPy/kern/linear.py diff --git a/GPy/kern/parts/mlp.py b/GPy/kern/mlp.py similarity index 100% rename from GPy/kern/parts/mlp.py rename to GPy/kern/mlp.py diff --git a/GPy/kern/parts/odekern1.c b/GPy/kern/odekern1.c similarity index 100% rename from GPy/kern/parts/odekern1.c rename to GPy/kern/odekern1.c diff --git a/GPy/kern/parts/__init__.py b/GPy/kern/parts/__init__.py deleted file mode 100644 index 0a758f1e..00000000 --- a/GPy/kern/parts/__init__.py +++ /dev/null @@ -1,29 +0,0 @@ -import bias -import Brownian -import coregionalize -import exponential -import eq_ode1 -import finite_dimensional -import fixed -import gibbs -import hetero -import hierarchical -import independent_outputs -import linear -import Matern32 -import Matern52 -import mlp -import ODE_1 -import periodic_exponential -import periodic_Matern32 -import periodic_Matern52 -import poly -import prod_orthogonal -import prod -import rational_quadratic -import rbfcos -import rbf -import rbf_inv -import spline -import symmetric -import white diff --git a/GPy/kern/parts/periodic_Matern32.py b/GPy/kern/periodic_Matern32.py similarity index 100% rename from GPy/kern/parts/periodic_Matern32.py rename to GPy/kern/periodic_Matern32.py diff --git a/GPy/kern/parts/periodic_Matern52.py b/GPy/kern/periodic_Matern52.py similarity index 100% rename from GPy/kern/parts/periodic_Matern52.py rename to GPy/kern/periodic_Matern52.py diff --git a/GPy/kern/parts/periodic_exponential.py b/GPy/kern/periodic_exponential.py similarity index 100% rename from GPy/kern/parts/periodic_exponential.py rename to GPy/kern/periodic_exponential.py diff --git a/GPy/kern/parts/poly.py b/GPy/kern/poly.py similarity index 100% rename from GPy/kern/parts/poly.py rename to GPy/kern/poly.py diff --git a/GPy/kern/parts/prod.py b/GPy/kern/prod.py similarity index 100% rename from GPy/kern/parts/prod.py rename to GPy/kern/prod.py diff --git a/GPy/kern/parts/prod_orthogonal.py b/GPy/kern/prod_orthogonal.py similarity index 100% rename from GPy/kern/parts/prod_orthogonal.py rename to GPy/kern/prod_orthogonal.py diff --git a/GPy/kern/parts/rational_quadratic.py b/GPy/kern/rational_quadratic.py similarity index 100% rename from GPy/kern/parts/rational_quadratic.py rename to GPy/kern/rational_quadratic.py diff --git a/GPy/kern/parts/rbf.py b/GPy/kern/rbf.py similarity index 100% rename from GPy/kern/parts/rbf.py rename to GPy/kern/rbf.py diff --git a/GPy/kern/parts/rbf_inv.py b/GPy/kern/rbf_inv.py similarity index 100% rename from GPy/kern/parts/rbf_inv.py rename to GPy/kern/rbf_inv.py diff --git a/GPy/kern/parts/rbfcos.py b/GPy/kern/rbfcos.py similarity index 100% rename from GPy/kern/parts/rbfcos.py rename to GPy/kern/rbfcos.py diff --git a/GPy/kern/parts/spline.py b/GPy/kern/spline.py similarity index 100% rename from GPy/kern/parts/spline.py rename to GPy/kern/spline.py diff --git a/GPy/kern/parts/ss_rbf.py b/GPy/kern/ss_rbf.py similarity index 100% rename from GPy/kern/parts/ss_rbf.py rename to GPy/kern/ss_rbf.py diff --git a/GPy/kern/parts/symmetric.py b/GPy/kern/symmetric.py similarity index 100% rename from GPy/kern/parts/symmetric.py rename to GPy/kern/symmetric.py diff --git a/GPy/kern/parts/sympy_helpers.cpp b/GPy/kern/sympy_helpers.cpp similarity index 100% rename from GPy/kern/parts/sympy_helpers.cpp rename to GPy/kern/sympy_helpers.cpp diff --git a/GPy/kern/parts/sympy_helpers.h b/GPy/kern/sympy_helpers.h similarity index 100% rename from GPy/kern/parts/sympy_helpers.h rename to GPy/kern/sympy_helpers.h diff --git a/GPy/kern/parts/sympykern.py b/GPy/kern/sympykern.py similarity index 100% rename from GPy/kern/parts/sympykern.py rename to GPy/kern/sympykern.py diff --git a/GPy/kern/parts/white.py b/GPy/kern/white.py similarity index 100% rename from GPy/kern/parts/white.py rename to GPy/kern/white.py