From 2c23eca40c255e33429b09c3fec2e45105c498b0 Mon Sep 17 00:00:00 2001 From: Rajeev Veeraraghavan Date: Sun, 15 Sep 2024 22:01:17 -0400 Subject: [PATCH 1/2] Merge from merge-conflict branch after resolving merge conflict --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4a5cca1a7b..c29634041a 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ### Summary -This is copy of [https://github.com/pytorch/pytorch](https://github.com/pytorch/pytorch). +This is a copy of [https://github.com/pytorch/pytorch](https://github.com/pytorch/pytorch). The repository was used to demonstrate basic git and github concepts to students taking course [17645 - Machine Learning in Production](https://mlip-cmu.github.io/f2024/) in Fall 2024 at Carnegie Mellon University. I was the teaching assistant in charge of this lab assignment. From 0f5606f0242188bc45aeb2582e4098fe74329201 Mon Sep 17 00:00:00 2001 From: CarlosGuamantica Date: Sat, 22 Mar 2025 13:23:52 -0500 Subject: [PATCH 2/2] Merge from merge-conflict branch after resolving merge conflict --- torch/nn/functional.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/torch/nn/functional.py b/torch/nn/functional.py index 9640ca1e76..7bb04d1f33 100644 --- a/torch/nn/functional.py +++ b/torch/nn/functional.py @@ -4290,8 +4290,8 @@ def interpolate( # noqa: F811 input: Tensor, size: Optional[int] = None, scale_factor: Optional[List[float]] = None, - mode: str = "nearest", - align_corners: Optional[bool] = None, + mode: str = "bicubic ", + align_corners: Optional[bool] = True, recompute_scale_factor: Optional[bool] = None, antialias: bool = False, ) -> Tensor: # noqa: B950