From f634350398f6b87a4dd99443744b0d658187323f Mon Sep 17 00:00:00 2001 From: James Hensman Date: Thu, 6 Dec 2012 10:16:19 -0800 Subject: [PATCH] fixed small bugs in linalg, setup.py --- GPy/util/linalg.py | 19 +++++++------------ setup.py | 2 +- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/GPy/util/linalg.py b/GPy/util/linalg.py index f8f03d5f..092589a9 100644 --- a/GPy/util/linalg.py +++ b/GPy/util/linalg.py @@ -46,19 +46,14 @@ def _mdot_r(a,b): def jitchol(A,maxtries=5): """ - Arguments - --------- - A : An almost pd square matrix + :param A : An almost pd square matrix - Returns - ------- - cholesky(K) + :rval L: the Cholesky decomposition of A - Notes - ----- - Adds jitter to K, to enforce positive-definiteness - if stuff breaks, please check: - np.allclose(sp.linalg.cholesky(XXT, lower = True), np.triu(sp.linalg.cho_factor(XXT)[0]).T) + .. Note: + Adds jitter to K, to enforce positive-definiteness + if stuff breaks, please check: + np.allclose(sp.linalg.cholesky(XXT, lower = True), np.triu(sp.linalg.cho_factor(XXT)[0]).T) """ try: return linalg.cholesky(A, lower = True) @@ -139,7 +134,7 @@ def PCA(Y, Q): Returns ------- - X - NxQ np.array of dimensionality reduced data + :rval X: - NxQ np.array of dimensionality reduced data W - QxD mapping from X to Y """ if not np.allclose(Y.mean(axis=0), 0.0): diff --git a/setup.py b/setup.py index ed841b56..076af82c 100644 --- a/setup.py +++ b/setup.py @@ -23,7 +23,7 @@ setup(name = 'GPy', package_dir={'GPy': 'GPy'}, package_data = {'GPy': ['GPy/examples']}, py_modules = ['GPy.__init__'], - long_description=read('README'), + long_description=read('README.md'), ext_modules = [Extension(name = 'GPy.kern.lfmUpsilonf2py', sources = ['GPy/kern/src/lfmUpsilonf2py.f90'])], install_requires=['numpy>=1.6', 'scipy>=0.9','matplotlib>=1.1'],