Merge pull request #759 from SheffieldML/devel

Deploy 1.9.7
This commit is contained in:
Zhenwen Dai 2019-05-18 21:00:25 +01:00 committed by GitHub
commit e4848ce3ad
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
20 changed files with 45687 additions and 23959 deletions

1
.gitignore vendored
View file

@ -1,6 +1,7 @@
*.py[cod]
# C extensions
*_cython.c
*.so
# Packages

View file

@ -19,7 +19,7 @@ env:
#- PYTHON_VERSION=3.4
- PYTHON_VERSION=3.5
- PYTHON_VERSION=3.6
#- PYTHON_VERSION=3.7
- PYTHON_VERSION=3.7
before_install:
- wget https://github.com/mzwiessele/travis_scripts/raw/master/download_miniconda.sh

View file

@ -1,24 +1,146 @@
# Changelog
## v1.9.6 (2018-10-30)
## New
## v1.9.8 (2019-05-17)
* Added a new class that enables using multiple likelihoods [@esiivola]
### Fix
* Alex grig kalman new [@AlexGrig, @mzwiessele]
* Also run on 3.5. [mzwiessele]
## Fix
### Other
* fix typo in docstring for GP.opimize() [@RobRomijnders]
* Bump version: 1.9.7 → 1.9.8. [mzwiessele]
* Updates to posterior sampling [@lawrennd]
* Pkg: changelog. [mzwiessele]
* Jayanthkoushik cython fix [@jayanthkoushik, @mzwiessele]
* Added missing columns (:), fixed indentation [@vlavorini]
## v1.9.7 (2019-05-17)
### Fix
* Version. [mzwiessele]
* Plotting. [mzwiessele]
* Matplotlib 2.0 mlba -> cbook: [mzwiessele]
### Other
* Bump version: 1.9.6 → 1.9.7. [mzwiessele]
* Merge branch 'deploy' into devel. [mzwiessele]
* Merge pull request #703 from SheffieldML/devel. [Zhenwen Dai]
Deploy the version 1.9.6
* Merge pull request #709 from KOLANICH/ignoring_cython-generated_C_sources. [Zhenwen Dai]
Cython-generated files should be regenerated
* Cython-generated files should be regenerated. [KOLANICH]
* Merge pull request #758 from marpulli/py37_travis. [Zhenwen Dai]
Add travis build for 3.7, remove for 3.5, bump version to 1.9.7
* Bump version to 1.9.7. [Mark Pullin]
* Move python 3.5 build to 3.7. [Mark Pullin]
* Update README.md. [Mike Smith]
* I've added these steps to install necessary libraries. [Mike Smith]
Lots of people seem to have this problem with an "error: command 'gcc' failed with exit status 1" on installing.
E.g. this can be reproduced on a clean AWS Ubuntu install.
Feel free to revert, but this issue comes up regularly.
* Merge pull request #722 from jopago/devel. [Zhenwen Dai]
Add to_dict methods to White and Brownian kernels
* Update static.py. [Joan Gonzalvez]
* Update brownian.py. [Joan Gonzalvez]
added to_dict method
* Merge pull request #718 from KOLANICH/patch-1. [Zhenwen Dai]
Don't import `datasets` by default since it is almost never needed
* Don't import datasets by default since it is almost never needed. [KOLANICH]
* Merge pull request #708 from KOLANICH/cython_code_fix. [Zhenwen Dai]
Integer division is needed here.
* Integer division is needed here. [KOLANICH]
* Fix the bug due to changes in Numpy (#744) [Zhenwen Dai]
* Merge pull request #719 from ajgpitch/install_fixes. [Max Zwiessele]
FIXES - for installing under Python 3.7
* Recythonised c files. [Alexander Pitchford]
* Merge branch 'fix-state_space_cython-misc' into install_fixes. [Alexander Pitchford]
* Type fixed - Q_square_root_dict. [Alexander Pitchford]
* Merge branch 'fix-state_space_cython-misc' into install_fixes. [Alexander Pitchford]
* Merge branch 'devel' into fix-state_space_cython-misc. [Alexander Pitchford]
* Merge branch 'build_ext-source_pyx' into install_fixes. [Alexander Pitchford]
* Merge branch 'devel' into build_ext-source_pyx. [Alexander Pitchford]
* Merge branch 'fix-cython-import_array' into install_fixes. [Alexander Pitchford]
* Merge branch 'devel' into fix-cython-import_array. [Alexander Pitchford]
* Fix the version number in appveyor.yml. [Zhenwen Dai]
* Fix the version number in setup.cfg. [Dai]
* Merge branch 'deploy' into devel. [Zhenwen Dai]
* Merge pull request #656 from SheffieldML/devel. [Max Zwiessele]
push PR to deploy
* Bump the version: 1.9.5 -> 1.9.6. [Zhenwen Dai]
* Merge pull request #691 from vlavorini/devel. [Zhenwen Dai]
Added missing columns (:), fixed indentation
* Added missing columns (:), fixed indentation. [Vincenzo Lavorini]
* Fix the bug in the prediction of full covariance matrix (#702) [Zhenwen Dai]
* fix the bug in the prediction of full covariance matrix
* Fix the test cases.
* update the version requirement for matplotlib
* Merge branch 'build_ext-source_pyx' into install_fixes. [Alexander Pitchford]
* Ext sources changed to pyx. [Alexander Pitchford]
* Merge branch 'fix-cython-import_array' into install_fixes. [Alexander Pitchford]
* Np.import_array() added to files where cimport numpy used. [Alexander Pitchford]
* Add missing colons and fix indentation. [Alexander Pitchford]
* Pkg: changelog. [mzwiessele]
* Fix the bug in the prediction of full covariance matrix [@zhenwendai]
## v1.9.5 (2018-09-02)
@ -2503,8 +2625,8 @@
* Merge branch 'devel' into paramz. [mzwiessele]
Conflicts:
GPy/core/parameterization/parameter_core.py
GPy/testing/pickle_tests.py
GPy/core/parameterization/parameter_core.py
GPy/testing/pickle_tests.py
* [paramz] wrapping - todo: deprecation warnings. [mzwiessele]
@ -4017,7 +4139,7 @@
* Merge remote-tracking branch 'upstream/devel' into devel. [tjhgit]
Conflicts:
GPy/kern/__init__.py
GPy/kern/__init__.py
* Added spline kernel (from P. Hennig) to GPy. [tjhgit]
@ -5552,10 +5674,10 @@
* Integrated Laplace and merged Merge remote-tracking branch 'gpy_real/devel' into merge_branch. [Alan Saul]
Conflicts:
GPy/core/gp.py
GPy/likelihoods/__init__.py
GPy/likelihoods/likelihood_functions.py
GPy/likelihoods/link_functions.py
GPy/core/gp.py
GPy/likelihoods/__init__.py
GPy/likelihoods/likelihood_functions.py
GPy/likelihoods/link_functions.py
* Fixed white variance. [Alan Saul]
@ -5694,7 +5816,7 @@
* Merge branch 'devel' of github.com:SheffieldML/GPy into devel. [Max Zwiessele]
Conflicts:
GPy/inference/latent_function_inference/inferenceX.py
GPy/inference/latent_function_inference/inferenceX.py
* Merge branch 'devel' of github.com:SheffieldML/GPy into devel. [Zhenwen Dai]
@ -6209,7 +6331,7 @@
* [dim red plots] plotting big models. [mzwiessele]
Conflicts:
GPy/plotting/matplot_dep/dim_reduction_plots.py
GPy/plotting/matplot_dep/dim_reduction_plots.py
* Add debug util module and try to debug sparsegp_mpi. [Zhenwen Dai]
@ -6226,8 +6348,8 @@
* [normalizer] first commit for normalizer in GPy. [mzwiessele]
Conflicts:
GPy/core/sparse_gp.py
GPy/models/bayesian_gplvm.py
GPy/core/sparse_gp.py
GPy/models/bayesian_gplvm.py
* Further bug fix for sparsegp_mpi. [Zhenwen Dai]
@ -6246,8 +6368,8 @@
* [ard] enhanced ard handling and plotting. [mzwiessele]
Conflicts:
GPy/kern/_src/linear.py
GPy/models/ss_gplvm.py
GPy/kern/_src/linear.py
GPy/models/ss_gplvm.py
* [linear] einsums. [mzwiessele]
@ -6350,14 +6472,14 @@
* [inference] less constant jitter, and jitter adjustements. [mzwiessele]
Conflicts:
GPy/util/linalg.py
GPy/util/linalg.py
* Fixed a bug in optimize restarts: it now used optimizer_array. [James Hensman]
* [vardtc missing] logging. [maxz]
Conflicts:
GPy/inference/latent_function_inference/var_dtc.py
GPy/inference/latent_function_inference/var_dtc.py
* [init] normalization bugfix. [mzwiessele]
@ -6858,7 +6980,7 @@
* Merge branch 'params' of github.com:SheffieldML/GPy into params. [Ricardo]
Conflicts:
GPy/kern/_src/kern.py
GPy/kern/_src/kern.py
* Missing file, import line commented. [Ricardo]
@ -6907,8 +7029,8 @@
* Merge branch 'params' of github.com:SheffieldML/GPy into params. [Ricardo]
Conflicts:
GPy/models/gp_classification.py
GPy/models/sparse_gp_classification.py
GPy/models/gp_classification.py
GPy/models/sparse_gp_classification.py
* New file. [Ricardo]
@ -7189,7 +7311,7 @@
* Merge branch 'params' of github.com:SheffieldML/GPy into params. [Ricardo]
Conflicts:
GPy/likelihoods/mixed_noise.py
GPy/likelihoods/mixed_noise.py
* Merge branch 'params' of github.com:SheffieldML/GPy into params. [Ricardo]
@ -7274,14 +7396,14 @@
* Merge branch 'params' of github.com:SheffieldML/GPy into params. [Max Zwiessele]
Conflicts:
GPy/likelihoods/gaussian.py
GPy/likelihoods/gaussian.py
* Bug fix w.r.t. var_dtc.py. [Zhenwen Dai]
* Merge branch 'params' of github.com:SheffieldML/GPy into params. [Ricardo]
Conflicts:
GPy/inference/latent_function_inference/var_dtc.py
GPy/inference/latent_function_inference/var_dtc.py
* New model SparseGPCoregionalizedRegression. [Ricardo]
@ -7481,8 +7603,8 @@
* Merge branch 'params' of github.com:SheffieldML/GPy into params. [Ricardo]
Conflicts:
GPy/core/gp.py
GPy/plotting/matplot_dep/models_plots.py
GPy/core/gp.py
GPy/plotting/matplot_dep/models_plots.py
* GPCoregionalizedRegresssion added. [Ricardo]
@ -7743,7 +7865,7 @@
* Merge branch 'params' of github.com:SheffieldML/GPy into params. [Ricardo]
Conflicts:
GPy/kern/_src/constructors.py
GPy/kern/_src/constructors.py
* Merge branch 'params' of github.com:SheffieldML/GPy into params. [Ricardo]
@ -7752,8 +7874,8 @@
* Merge branch 'params' of github.com:SheffieldML/GPy into params. [Ricardo]
Conflicts:
GPy/kern/kern.py
GPy/kern/parts/prod.py
GPy/kern/kern.py
GPy/kern/parts/prod.py
* Merge branch 'params' of github.com:SheffieldML/GPy into params. [Ricardo]
@ -7762,7 +7884,7 @@
* Merge branch 'params' of github.com:SheffieldML/GPy into params. [Ricardo]
Conflicts:
GPy/kern/parts/prod.py
GPy/kern/parts/prod.py
* Minor changes. [Ricardo]
@ -8125,7 +8247,7 @@
* Merge branch 'params' of github.com:SheffieldML/GPy into params. [Max Zwiessele]
Conflicts:
GPy/core/parameterization/param.py
GPy/core/parameterization/param.py
* Fixed a couple of small params bugs. [Alan Saul]
@ -8140,9 +8262,9 @@
* Merge branch 'params' of github.com:SheffieldML/GPy into params. [Max Zwiessele]
Conflicts:
GPy/core/parameterization/param.py
GPy/core/parameterization/parameter_core.py
GPy/core/parameterization/parameterized.py
GPy/core/parameterization/param.py
GPy/core/parameterization/parameter_core.py
GPy/core/parameterization/parameterized.py
* Stupid error, needed to actually USE the gradients in student t... Looks like s2 of rasm's may have an extra -? dW_df == -d2logpdf_df not just d2logpdf_df? [Alan Saul]
@ -8227,7 +8349,7 @@
* Merge branch 'params' of github.com:SheffieldML/GPy into params. [Ricardo]
Conflicts:
GPy/core/sparse_gp.py
GPy/core/sparse_gp.py
* Typo corrected. [Ricardo]
@ -8641,7 +8763,7 @@
* Merge branch 'devel' of github.com:SheffieldML/GPy into devel. [Ricardo]
Conflicts:
GPy/examples/classification.py
GPy/examples/classification.py
* Fixed a bug in Neil's otherwise tidy hetero kernel. [James Hensman]
@ -8710,8 +8832,8 @@
* Merge branch 'devel' into params. [Max Zwiessele]
Conflicts:
GPy/core/transformations.py
GPy/kern/parts/kernpart.py
GPy/core/transformations.py
GPy/kern/parts/kernpart.py
* Merge pull request #77 from jamesmcm/devel. [James McMurray]
@ -8770,10 +8892,10 @@
* Merge branch 'devel' of github.com:SheffieldML/GPy into devel. [Ricardo]
Conflicts:
GPy/examples/regression.py
GPy/kern/constructors.py
GPy/testing/kernel_tests.py
GPy/util/multioutput.py
GPy/examples/regression.py
GPy/kern/constructors.py
GPy/testing/kernel_tests.py
GPy/util/multioutput.py
* Other local changes. [Neil Lawrence]
@ -8798,15 +8920,15 @@
* Merge branch 'linK_functions2' into devel. [Ricardo]
Conflicts:
GPy/core/gp.py
GPy/core/gp_base.py
GPy/core/sparse_gp.py
GPy/examples/regression.py
GPy/kern/constructors.py
GPy/kern/parts/coregionalise.py
GPy/models/__init__.py
GPy/models/sparse_gp_classification.py
GPy/util/__init__.py
GPy/core/gp.py
GPy/core/gp_base.py
GPy/core/sparse_gp.py
GPy/examples/regression.py
GPy/kern/constructors.py
GPy/kern/parts/coregionalise.py
GPy/models/__init__.py
GPy/models/sparse_gp_classification.py
GPy/util/__init__.py
* Useless files deleted. [Ricardo]
@ -9479,7 +9601,7 @@
* Merge branch 'devel' of github.com:SheffieldML/GPy into devel. [Ricardo]
Conflicts:
GPy/core/fitc.py
GPy/core/fitc.py
* FITC example added. [Ricardo]
@ -9647,7 +9769,7 @@
* Merge branch 'devel' of https://github.com/SheffieldML/GPy into devel. [Neil Lawrence]
Conflicts:
GPy/models/GPLVM.py
GPy/models/GPLVM.py
* Remove copies (they are now in visualize code ...). [Neil Lawrence]
@ -9795,7 +9917,7 @@
* Merge branch 'devel' of github.com:SheffieldML/GPy into devel. [Ricardo]
Conflicts:
GPy/models/GP.py
GPy/models/GP.py
* Plot function got broken with last commit, this fixes it. [Ricardo]
@ -10137,7 +10259,7 @@
* Merge branch 'devel' of https://github.com/SheffieldML/GPy into devel. [Neil Lawrence]
Conflicts:
GPy/examples/dimensionality_reduction.py
GPy/examples/dimensionality_reduction.py
* Minor changes. [Neil Lawrence]
@ -10208,8 +10330,8 @@
* Merge branch 'devel' into new_constraints. [James Hensman]
Conflicts:
GPy/core/model.py
GPy/core/parameterised.py
GPy/core/model.py
GPy/core/parameterised.py
* Merge branch 'devel' of github.com:SheffieldML/GPy into devel. [Max Zwiessele]
@ -10771,7 +10893,7 @@
* Merge branch 'master' of github.com:SheffieldML/GPy. [Ricardo Andrade]
Conflicts:
GPy/examples/__init__.py
GPy/examples/__init__.py
* Working on psi cross terms. [Nicolo Fusi]
@ -11211,7 +11333,7 @@
* Merge branch 'newGP' [James Hensman]
Conflicts:
GPy/models/GP_regression.py
GPy/models/GP_regression.py
* Simplified the checkgrad logic somewhat. [James Hensman]
@ -11242,7 +11364,7 @@
* Merge branch 'newGP' of github.com:SheffieldML/GPy into newGP. [James Hensman]
Conflicts:
GPy/likelihoods/EP.py
GPy/likelihoods/EP.py
* James' debugging of the EP/GP interface. [Ricardo Andrade]
@ -11253,8 +11375,8 @@
* Merge branch 'newGP' of github.com:SheffieldML/GPy into newGP. [Ricardo Andrade]
Conflicts:
GPy/likelihoods/EP.py
GPy/likelihoods/likelihood_functions.py
GPy/likelihoods/EP.py
GPy/likelihoods/likelihood_functions.py
* So many changes. [Ricardo Andrade]
@ -12018,3 +12140,5 @@
* Core file. [Nicolo Fusi]
* Initial commit. [Nicolò Fusi]

View file

@ -1 +1 @@
__version__ = "1.9.6"
__version__ = "1.9.8"

View file

@ -23,6 +23,17 @@ class Brownian(Kern):
self.variance = Param('variance', variance, Logexp())
self.link_parameters(self.variance)
def to_dict(self):
"""
Convert the object into a json serializable dictionary.
Note: It uses the private method _save_to_input_dict of the parent.
:return dict: json serializable dictionary containing the needed information to instantiate the object
"""
input_dict = super(RBF, self)._save_to_input_dict()
input_dict["class"] = "GPy.kern.Brownian"
return input_dict
def K(self,X,X2=None):
if X2 is None:

File diff suppressed because it is too large Load diff

View file

@ -64,6 +64,11 @@ class White(Static):
def __init__(self, input_dim, variance=1., active_dims=None, name='white'):
super(White, self).__init__(input_dim, variance, active_dims, name)
def to_dict(self):
input_dict = super(White, self)._save_to_input_dict()
input_dict["class"] = "GPy.kern.White"
return input_dict
def K(self, X, X2=None):
if X2 is None:
return np.eye(X.shape[0])*self.variance
@ -102,6 +107,10 @@ class WhiteHeteroscedastic(Static):
super(Static, self).__init__(input_dim, active_dims, name)
self.variance = Param('variance', np.ones(num_data) * variance, Logexp())
self.link_parameters(self.variance)
def to_dict(self):
input_dict = super(WhiteHeteroscedastic, self)._save_to_input_dict()
input_dict["class"] = "GPy.kern.WhiteHeteroscedastic"
return input_dict
def Kdiag(self, X):
if X.shape[0] == self.variance.shape[0]:

File diff suppressed because it is too large Load diff

View file

@ -6,6 +6,8 @@ cimport numpy as np
from cython.parallel import prange
cimport cython
np.import_array()
ctypedef np.float64_t DTYPE_t
cdef extern from "stationary_utils.h":

File diff suppressed because it is too large Load diff

View file

@ -493,7 +493,7 @@ cdef class AQcompute_batch_Cython(Q_handling_Cython):
U,S,Vh = self.Q_svd_dict[matrix_index]
square_root = U * np.sqrt(S)
self.Q_suqare_root_dict[matrix_index] = square_root
self.Q_square_root_dict[matrix_index] = square_root
return square_root

View file

@ -356,7 +356,7 @@ def x_frame1D(X,plot_limits=None,resolution=None):
else:
raise ValueError("Bad limits for plotting")
Xnew = np.linspace(xmin,xmax,resolution or 200)[:,None]
Xnew = np.linspace(float(xmin),float(xmax),int(resolution) or 200)[:,None]
return Xnew, xmin, xmax
def x_frame2D(X,plot_limits=None,resolution=None):

View file

@ -6,7 +6,6 @@ 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

File diff suppressed because it is too large Load diff

View file

@ -9,10 +9,12 @@ from cython.parallel import prange, parallel
cimport numpy as np
cimport scipy.linalg.cython_blas as cblas
np.import_array()
def flat_to_triang(double[:, :] flat, int M):
"""take a matrix N x D and return a D X M x M array where
N = M(M+1)/2
N = M(M+1)//2
the lower triangluar portion of the d'th slice of the result is filled by the d'th column of flat.
"""
@ -33,7 +35,7 @@ def flat_to_triang(double[:, :] flat, int M):
def triang_to_flat(double[:, :, :] L):
cdef int D = L.shape[0]
cdef int M = L.shape[1]
cdef int N = M*(M+1)/2
cdef int N = M*(M+1)//2
cdef int count = 0
cdef double[:, ::1] flat = np.empty((N, D))
cdef int d, m, mm

File diff suppressed because it is too large Load diff

View file

@ -99,6 +99,16 @@ the [anaconda python distribution](http://continuum.io/downloads).
With anaconda you can install GPy by the following:
conda update scipy
Then potentially try,
sudo apt-get update
sudo apt-get install python3-dev
sudo apt-get install build-essential
conda update anaconda
And finally,
pip install gpy
We've also had luck with [enthought](http://www.enthought.com). Install scipy 0.16 (or later)

View file

@ -3,7 +3,7 @@ environment:
secure: 8/ZjXFwtd1S7ixd7PJOpptupKKEDhm2da/q3unabJ00=
COVERALLS_REPO_TOKEN:
secure: d3Luic/ESkGaWnZrvWZTKrzO+xaVwJWaRCEP0F+K/9DQGPSRZsJ/Du5g3s4XF+tS
gpy_version: 1.9.6
gpy_version: 1.9.8
matrix:
- PYTHON_VERSION: 2.7
MINICONDA: C:\Miniconda-x64
@ -11,8 +11,8 @@ environment:
MINICONDA: C:\Miniconda35-x64
- PYTHON_VERSION: 3.6
MINICONDA: C:\Miniconda36-x64
# - PYTHON_VERSION: 3.7
# MINICONDA: C:\Miniconda36-x64
- PYTHON_VERSION: 3.7
MINICONDA: C:\Miniconda36-x64
#configuration:
# - Debug

View file

@ -1,5 +1,5 @@
[bumpversion]
current_version = 1.9.6
current_version = 1.9.8
tag = True
commit = True
@ -12,3 +12,4 @@ upload-dir = doc/build/html
[medatdata]
description-file = README.rst

View file

@ -84,28 +84,28 @@ try:
import numpy as np
ext_mods = [Extension(name='GPy.kern.src.stationary_cython',
sources=['GPy/kern/src/stationary_cython.c',
sources=['GPy/kern/src/stationary_cython.pyx',
'GPy/kern/src/stationary_utils.c'],
include_dirs=[np.get_include(), '.'],
extra_compile_args=compile_flags,
extra_link_args=link_args),
Extension(name='GPy.util.choleskies_cython',
sources=['GPy/util/choleskies_cython.c'],
sources=['GPy/util/choleskies_cython.pyx'],
include_dirs=[np.get_include(), '.'],
extra_link_args=link_args,
extra_compile_args=compile_flags),
Extension(name='GPy.util.linalg_cython',
sources=['GPy/util/linalg_cython.c'],
sources=['GPy/util/linalg_cython.pyx'],
include_dirs=[np.get_include(), '.'],
extra_compile_args=compile_flags,
extra_link_args=link_args),
Extension(name='GPy.kern.src.coregionalize_cython',
sources=['GPy/kern/src/coregionalize_cython.c'],
sources=['GPy/kern/src/coregionalize_cython.pyx'],
include_dirs=[np.get_include(), '.'],
extra_compile_args=compile_flags,
extra_link_args=link_args),
Extension(name='GPy.models.state_space_cython',
sources=['GPy/models/state_space_cython.c'],
sources=['GPy/models/state_space_cython.pyx'],
include_dirs=[np.get_include(), '.'],
extra_compile_args=compile_flags,
extra_link_args=link_args)]