Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: pytorch/vision
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.11.2
Choose a base ref
...
head repository: pytorch/vision
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v0.11.3
Choose a head ref
  • 3 commits
  • 5 files changed
  • 2 contributors

Commits on Jan 20, 2022

  1. Skip jpeg comparison tests with PIL (#5169) (#5232)

    @datumbox
    datumbox authored Jan 20, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    34395c7 View commit details

  2. ci: Pin av to 8.0.3 (#5240)

    @seemethere
    seemethere authored Jan 20, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    076a0e3 View commit details

  3. ci: Bump pytorch 1.10.1 -> 1.10.2 (#5239)

    @seemethere
    seemethere authored Jan 20, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    05eae32 View commit details
Showing with 8 additions and 10 deletions.
  1. +1 −1 .circleci/config.yml
  2. +1 −1 .circleci/config.yml.in
  3. +1 −1 .circleci/unittest/linux/scripts/environment.yml
  4. +1 −1 .circleci/unittest/windows/scripts/environment.yml
  5. +4 −6 test/test_image.py
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .circleci/config.yml.in
View file
Original file line number Diff line number Diff line change
@@ -105,7 +105,7 @@ binary_common: &binary_common
pytorch_version:
description: "PyTorch version to build against; by default, use a nightly"
type: string
default: "1.10.1"
default: "1.10.2"
# Don't edit these
python_version:
description: "Python version to build against (e.g., 3.7)"
2 changes: 1 addition & 1 deletion .circleci/unittest/linux/scripts/environment.yml
View file
Original file line number Diff line number Diff line change
@@ -13,4 +13,4 @@ dependencies:
- future
- pillow >=5.3.0, !=8.3.0
- scipy
- av
- av <= 8.0.3
2 changes: 1 addition & 1 deletion .circleci/unittest/windows/scripts/environment.yml
View file
Original file line number Diff line number Diff line change
@@ -13,5 +13,5 @@ dependencies:
- future
- pillow >=5.3.0, !=8.3.0
- scipy
- av
- av <= 8.0.3
- dataclasses
10 changes: 4 additions & 6 deletions test/test_image.py
View file
Original file line number Diff line number Diff line change
@@ -443,9 +443,8 @@ def test_write_jpeg_reference(img_path, tmpdir):
assert_equal(torch_bytes, pil_bytes)


@pytest.mark.skipif(IS_WINDOWS, reason=(
'this test fails on windows because PIL uses libjpeg-turbo on windows'
))
# TODO: Remove the skip. See https://github.com/pytorch/vision/issues/5162.
@pytest.mark.skip("this test fails because PIL uses libjpeg-turbo")
@pytest.mark.parametrize('img_path', [
pytest.param(jpeg_path, id=_get_safe_image_name(jpeg_path))
for jpeg_path in get_images(ENCODE_JPEG, ".jpg")
@@ -466,9 +465,8 @@ def test_encode_jpeg(img_path):
assert_equal(encoded_jpeg_torch, encoded_jpeg_pil)


@pytest.mark.skipif(IS_WINDOWS, reason=(
'this test fails on windows because PIL uses libjpeg-turbo on windows'
))
# TODO: Remove the skip. See https://github.com/pytorch/vision/issues/5162.
@pytest.mark.skip("this test fails because PIL uses libjpeg-turbo")
@pytest.mark.parametrize('img_path', [
pytest.param(jpeg_path, id=_get_safe_image_name(jpeg_path))
for jpeg_path in get_images(ENCODE_JPEG, ".jpg")