Skip to content

Clean up deprecation warnings #2348

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.

Sign up for GitHub

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 3 commits into from
May 20, 2023
Merged

Clean up deprecation warnings #2348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3eda69f
Update multitask_gaussian_likelihood.py
saitcakmak May 19, 2023
6550ddc
Update gaussian_likelihood.py
saitcakmak May 19, 2023
61e7238
Update bernoulli_likelihood.py
saitcakmak May 19, 2023
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/likelihoods/bernoulli_likelihood.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def log_marginal(
return marginal.log_prob(observations)

def marginal(self, function_dist: MultivariateNormal, *args: Any, **kwargs: Any) -> Bernoulli:
"""
r"""
:return: Analytic marginal :math:`p(\mathbf y)`.
"""
mean = function_dist.mean
Expand Down
10 changes: 5 additions & 5 deletions gpytorch/likelihoods/gaussian_likelihood.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ def raw_noise(self, value: Tensor) -> None:
self.noise_covar.initialize(raw_noise=value)

def marginal(self, function_dist: MultivariateNormal, *args: Any, **kwargs: Any) -> MultivariateNormal:
"""
r"""
:return: Analytic marginal :math:`p(\mathbf y)`.
"""
return super().marginal(function_dist, *args, **kwargs)
Expand Down Expand Up @@ -186,7 +186,7 @@ def log_marginal(
return res * ~missing_idx

def marginal(self, function_dist: MultivariateNormal, *args: Any, **kwargs: Any) -> MultivariateNormal:
"""
r"""
:return: Analytic marginal :math:`p(\mathbf y)`.
"""
return super().marginal(function_dist, *args, **kwargs)
Expand Down Expand Up @@ -306,14 +306,14 @@ def _shaped_noise_covar(self, base_shape: torch.Size, *params: Any, **kwargs: An
return res

def marginal(self, function_dist: MultivariateNormal, *args: Any, **kwargs: Any) -> MultivariateNormal:
"""
r"""
:return: Analytic marginal :math:`p(\mathbf y)`.
"""
return super().marginal(function_dist, *args, **kwargs)


class DirichletClassificationLikelihood(FixedNoiseGaussianLikelihood):
"""
r"""
A classification likelihood that treats the labels as regression targets with fixed heteroscedastic noise.
From Milios et al, NeurIPS, 2018 [https://arxiv.org/abs/1805.10915].

Expand Down Expand Up @@ -408,7 +408,7 @@ def get_fantasy_likelihood(self, **kwargs: Any) -> "DirichletClassificationLikel
return fantasy_liklihood

def marginal(self, function_dist: MultivariateNormal, *args: Any, **kwargs: Any) -> MultivariateNormal:
"""
r"""
:return: Analytic marginal :math:`p(\mathbf y)`.
"""
return super().marginal(function_dist, *args, **kwargs)
Expand Down
2 changes: 1 addition & 1 deletion gpytorch/likelihoods/multitask_gaussian_likelihood.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ def _eval_covar_matrix(self) -> Tensor:
def marginal(
self, function_dist: MultitaskMultivariateNormal, *args: Any, **kwargs: Any
) -> MultitaskMultivariateNormal:
"""
r"""
:return: Analytic marginal :math:`p(\mathbf y)`.
"""
return super().marginal(function_dist, *args, **kwargs)