https://github.com/GPflow/GPflow
Revision deb4508578f7223fa1ad5e3b6458626c4b41ef09 authored by Eric Hammy on 17 October 2019, 14:46:42 UTC, committed by GitHub on 17 October 2019, 14:46:42 UTC
1. Fix hidden bug in SGPR
2. Add the  sgpr.compute_qu method from gpflow1

1. [Bug]. SGPR likelihoods were previously using full rank matrices instead of
diagonal ones in both upper bound and likelihood calculation. Ie `Kdiag`
was not "diag". 

This error was being masked by the intentional deactivation of tests
comparing to the SGPR to the GPR, and what appears to be a hack to make
tests working on the upper bound case.

2. [Migration]. Fixing the above broke another test, originally used for
 sgpr.compute_qu.  The method sgpr.compute_qu had not been migrated 
from gpflow1, and a test that was meant to check it had been patched up to pass,
erroneously.

After speaking to @markvdw, concluded this method is useful, in
particular to compare to SVGP model. The test has been patched up and
the method ported to gpflow2.
1 parent 3b2a2ee
Raw File
Tip revision: deb4508578f7223fa1ad5e3b6458626c4b41ef09 authored by Eric Hammy on 17 October 2019, 14:46:42 UTC
Fix hidden bug in SGPR (#1106)
Tip revision: deb4508
probability_distributions.py
# Copyright 2017 the GPflow authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

# Eventually, it would be nice to not have to have our own classes for
# proability distributions. The TensorFlow "distributions" framework would
# be a good replacement.


class ProbabilityDistribution:
    """
    This is the base class for a probability distributions,
    over which we take the expectations in the expectations framework.
    """
    pass


class Gaussian(ProbabilityDistribution):
    def __init__(self, mu, cov):
        self.mu = mu  # [N, D]
        self.cov = cov  # [N, D, D]


class DiagonalGaussian(ProbabilityDistribution):
    def __init__(self, mu, cov):
        self.mu = mu  # [N, D]
        self.cov = cov  # [N, D]


class MarkovGaussian(ProbabilityDistribution):
    """
    Gaussian distribution with Markov structure.
    Only covariances and covariances between t and t+1 need to be
    parameterised. We use the solution proposed by Carl Rasmussen, i.e. to
    represent
    Var[x_t] = cov[x_t, :, :] * cov[x_t, :, :].T
    Cov[x_t, x_{t+1}] = cov[t, :, :] * cov[t+1, :, :]
    """

    def __init__(self, mu, cov):
        self.mu = mu  # N+[1, D]
        self.cov = cov  # 2 x (N+1)[, D, D]
back to top