Skip to content

Retiring deprecated versions ofpsd_safe_cholesky, NotPSDError, and assert_allclose #2130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 8, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gpytorch/kernels/inducing_point_kernel.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
LowRankRootLinearOperator,
MatmulLinearOperator,
)
from linear_operator.utils.cholesky import psd_safe_cholesky
from torch import Tensor

from .. import settings
from ..distributions import MultivariateNormal
from ..likelihoods import Likelihood
from ..mlls import InducingPointKernelAddedLossTerm
from ..models import exact_prediction_strategies
from ..utils.cholesky import psd_safe_cholesky
from .kernel import Kernel


Expand Down
2 changes: 1 addition & 1 deletion gpytorch/models/exact_prediction_strategies.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
RootLinearOperator,
ZeroLinearOperator,
)
from linear_operator.utils.cholesky import psd_safe_cholesky
from linear_operator.utils.interpolation import left_interp, left_t_interp
from torch import Tensor

from .. import settings
from ..lazy import LazyEvaluatedKernelTensor
from ..utils.cholesky import psd_safe_cholesky
from ..utils.memoize import add_to_cache, cached, clear_cache_hook, pop_from_cache


Expand Down
2 changes: 1 addition & 1 deletion gpytorch/priors/lkj_prior.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#!/usr/bin/env python3

import torch
from linear_operator.utils.cholesky import psd_safe_cholesky
from torch.distributions import LKJCholesky, constraints
from torch.nn import Module as TModule

from .. import settings
from ..utils.cholesky import psd_safe_cholesky
from .prior import Prior


Expand Down
2 changes: 1 addition & 1 deletion gpytorch/variational/natural_variational_distribution.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

import torch
from linear_operator.operators import CholLinearOperator, TriangularLinearOperator
from linear_operator.utils.cholesky import psd_safe_cholesky

from ..distributions import MultivariateNormal
from ..utils.cholesky import psd_safe_cholesky
from ._variational_distribution import _VariationalDistribution


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
import torch
from linear_operator import to_dense
from linear_operator.operators import DiagLinearOperator, TriangularLinearOperator
from linear_operator.utils.cholesky import psd_safe_cholesky

from .. import settings
from ..distributions import MultivariateNormal
from ..utils.cholesky import psd_safe_cholesky
from ..utils.errors import CachingError
from ..utils.memoize import add_to_cache, cached, pop_from_cache
from ..utils.nearest_neighbors import NNUtil
Expand Down
4 changes: 2 additions & 2 deletions gpytorch/variational/unwhitened_variational_strategy.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
TriangularLinearOperator,
ZeroLinearOperator,
)
from linear_operator.utils.cholesky import psd_safe_cholesky
from linear_operator.utils.errors import NotPSDError

from .. import settings
from ..distributions import MultivariateNormal
from ..utils.cholesky import psd_safe_cholesky
from ..utils.errors import NotPSDError
from ..utils.memoize import add_to_cache, cached
from ._variational_strategy import _VariationalStrategy
from .cholesky_variational_distribution import CholeskyVariationalDistribution
Expand Down
7 changes: 3 additions & 4 deletions gpytorch/variational/variational_strategy.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,18 @@
SumLinearOperator,
TriangularLinearOperator,
)
from linear_operator.utils.cholesky import psd_safe_cholesky
from linear_operator.utils.errors import NotPSDError

from gpytorch.variational._variational_strategy import _VariationalStrategy
from gpytorch.variational.cholesky_variational_distribution import CholeskyVariationalDistribution

from ..distributions import MultivariateNormal
from ..settings import _linalg_dtype_cholesky, trace_mode
from ..utils.cholesky import psd_safe_cholesky
from ..utils.errors import CachingError, NotPSDError
from ..utils.errors import CachingError
from ..utils.memoize import cached, clear_cache_hook, pop_from_cache_ignore_args
from ..utils.warnings import OldVersionWarning

# from ._variational_strategy import _VariationalStrategy


def _ensure_updated_strategy_flag_set(
state_dict, prefix, local_metadata, strict, missing_keys, unexpected_keys, error_msgs
Expand Down
2 changes: 1 addition & 1 deletion test/likelihoods/test_gaussian_likelihood.py
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ def test_missing_value_inference(self):
likelihood.MISSING_VALUE_FILL = -999.0
like_init_minus = likelihood.log_marginal(samples, mvn).sum().data

torch.testing.assert_allclose(like_init_plus, like_init_minus)
torch.testing.assert_close(like_init_plus, like_init_minus)

# check that the correct noise sd is recovered

Expand Down