From fff110ca1983989a2b4523d8928f9bc57d838469 Mon Sep 17 00:00:00 2001 From: Mike Croucher Date: Tue, 3 Mar 2015 17:51:54 +0000 Subject: [PATCH] im_self->__self__ fix for python 3 --- GPy/kern/_src/independent_outputs.py | 4 +++- GPy/testing/likelihood_tests.py | 6 +++--- GPy/testing/parameterized_tests.py | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/GPy/kern/_src/independent_outputs.py b/GPy/kern/_src/independent_outputs.py index 10681d57..2a0c2a33 100644 --- a/GPy/kern/_src/independent_outputs.py +++ b/GPy/kern/_src/independent_outputs.py @@ -94,7 +94,9 @@ class IndependentOutputs(CombinationKernel): else: slices2 = index_to_slices(X2[:,self.index_dim]) [[[collate_grads(kern, i, dL_dK[s,s2],X[s],X2[s2]) for s in slices_i] for s2 in slices_j] for i,(kern,slices_i,slices_j) in enumerate(zip(kerns,slices,slices2))] - if self.single_kern: kern.gradient = target + + if self.single_kern: + kern.gradient = target else:[kern.gradient.__setitem__(Ellipsis, target[i]) for i, [kern, _] in enumerate(zip(kerns, slices))] def gradients_X(self,dL_dK, X, X2=None): diff --git a/GPy/testing/likelihood_tests.py b/GPy/testing/likelihood_tests.py index 5feeffa4..3fe01c46 100644 --- a/GPy/testing/likelihood_tests.py +++ b/GPy/testing/likelihood_tests.py @@ -29,7 +29,7 @@ def dparam_partial(inst_func, *args): def param_func(param_val, param_name, inst_func, args): #inst_func.im_self._set_params(param) #inst_func.im_self.add_parameter(Param(param_name, param_val)) - inst_func.im_self[param_name] = param_val + inst_func.__self__[param_name] = param_val return inst_func(*args) return functools.partial(param_func, inst_func=inst_func, args=args) @@ -44,7 +44,7 @@ def dparam_checkgrad(func, dfunc, params, params_names, args, constraints=None, The number of parameters and N is the number of data Need to take a slice out from f and a slice out of df """ - print("\n{} likelihood: {} vs {}".format(func.im_self.__class__.__name__, + print("\n{} likelihood: {} vs {}".format(func.__self__.__class__.__name__, func.__name__, dfunc.__name__)) partial_f = dparam_partial(func, *args) partial_df = dparam_partial(dfunc, *args) @@ -278,7 +278,7 @@ class TestNoiseModels(object): #} } - for name, attributes in noise_models.iteritems(): + for name, attributes in noise_models.items(): model = attributes["model"] if "grad_params" in attributes: params = attributes["grad_params"] diff --git a/GPy/testing/parameterized_tests.py b/GPy/testing/parameterized_tests.py index f3e0863f..0fb129ff 100644 --- a/GPy/testing/parameterized_tests.py +++ b/GPy/testing/parameterized_tests.py @@ -108,7 +108,7 @@ class ParameterizedTest(unittest.TestCase): self.assertListEqual(self.white._fixes_.tolist(), [FIXED]) self.assertIs(self.test1.constraints, self.rbf.constraints._param_index_ops) self.assertIs(self.test1.constraints, self.param.constraints._param_index_ops) - self.assertListEqual(self.test1.constraints[Logexp()].tolist(), range(self.param.size, self.param.size+self.rbf.size)) + self.assertListEqual(self.test1.constraints[Logexp()].tolist(), list(range(self.param.size, self.param.size+self.rbf.size))) def test_remove_parameter_param_array_grad_array(self): val = self.test1.kern.param_array.copy()