Add parameter type to `to_tensor` #8251

adamtheturtle · 2024-02-02T21:26:55Z

cc @vfdev-5

pytorch-bot · 2024-02-02T21:26:58Z

🔗 Helpful Links

🧪 See artifacts and rendered test results at hud.pytorch.org/pr/pytorch/vision/8251

📄 Preview Python docs built from this PR

Note: Links to docs will display an error until the docs builds have been completed.

✅ You can merge normally! (33 Unrelated Failures)

As of commit fbac810 with merge base 6a936e4 ():

FLAKY - The following jobs failed but were likely due to flakiness present on trunk:

CMake / linux (linux.12xlarge, cpu) / linux-job (gh)
The process '/usr/bin/git' failed with exit code 128
CMake / linux (linux.g5.4xlarge.nvidia.gpu, cuda, 11.8) / linux-job (gh)
The process '/usr/bin/git' failed with exit code 128
CMake / macos (macos-12) / macos-job (gh)
The process '/usr/local/bin/git' failed with exit code 128
CMake / macos (macos-m1-stable) / macos-job (gh)
The process '/usr/bin/git' failed with exit code 128
CMake / windows (windows.4xlarge, cpu) / windows-job (gh)
The process 'C:\Program Files\Git\cmd\git.exe' failed with exit code 128
CMake / windows (windows.g5.4xlarge.nvidia.gpu, cuda, 11.8) / windows-job (gh)
The process 'C:\Program Files\Git\cmd\git.exe' failed with exit code 128
Docs / build / linux-job (gh)
The process '/usr/bin/git' failed with exit code 128
Lint / c-source / linux-job (gh)
The process '/usr/bin/git' failed with exit code 128
Lint / python-source-and-configs / linux-job (gh)
The process '/usr/bin/git' failed with exit code 128
Lint / python-types / linux-job (gh)
The process '/usr/bin/git' failed with exit code 128
Prototype tests on Linux / unittests-prototype (3.10, linux.12xlarge, cpu) / linux-job (gh)
The process '/usr/bin/git' failed with exit code 128
Prototype tests on Linux / unittests-prototype (3.11, linux.12xlarge, cpu) / linux-job (gh)
The process '/usr/bin/git' failed with exit code 128
Prototype tests on Linux / unittests-prototype (3.8, linux.12xlarge, cpu) / linux-job (gh)
The process '/usr/bin/git' failed with exit code 128
Prototype tests on Linux / unittests-prototype (3.8, linux.g5.4xlarge.nvidia.gpu, cuda, 11.8) / linux-job (gh)
The process '/usr/bin/git' failed with exit code 128
Prototype tests on Linux / unittests-prototype (3.9, linux.12xlarge, cpu) / linux-job (gh)
The process '/usr/bin/git' failed with exit code 128
Tests / onnx / linux-job (gh)
The process '/usr/bin/git' failed with exit code 128
Tests / unittests-extended / linux-job (gh)
The process '/usr/bin/git' failed with exit code 128
Tests / unittests-linux (3.10, linux.12xlarge, cpu) / linux-job (gh)
The process '/usr/bin/git' failed with exit code 128
Tests / unittests-linux (3.11, linux.12xlarge, cpu) / linux-job (gh)
The process '/usr/bin/git' failed with exit code 128
Tests / unittests-linux (3.8, linux.12xlarge, cpu) / linux-job (gh)
The process '/usr/bin/git' failed with exit code 128
Tests / unittests-linux (3.8, linux.g5.4xlarge.nvidia.gpu, cuda, 11.8) / linux-job (gh)
The process '/usr/bin/git' failed with exit code 128
Tests / unittests-linux (3.9, linux.12xlarge, cpu) / linux-job (gh)
The process '/usr/bin/git' failed with exit code 128
Tests / unittests-macos (3.10, macos-12) / macos-job (gh)
The process '/usr/local/bin/git' failed with exit code 128
Tests / unittests-macos (3.11, macos-12) / macos-job (gh)
The process '/usr/local/bin/git' failed with exit code 128
Tests / unittests-macos (3.8, macos-12) / macos-job (gh)
The process '/usr/local/bin/git' failed with exit code 128
Tests / unittests-macos (3.8, macos-m1-stable) / macos-job (gh)
The process '/usr/bin/git' failed with exit code 128
Tests / unittests-macos (3.9, macos-12) / macos-job (gh)
The process '/usr/local/bin/git' failed with exit code 128
Tests / unittests-windows (3.10, windows.4xlarge, cpu) / windows-job (gh)
The process 'C:\Program Files\Git\cmd\git.exe' failed with exit code 128
Tests / unittests-windows (3.11, windows.4xlarge, cpu) / windows-job (gh)
The process 'C:\Program Files\Git\cmd\git.exe' failed with exit code 128
Tests / unittests-windows (3.8, windows.4xlarge, cpu) / windows-job (gh)
The process 'C:\Program Files\Git\cmd\git.exe' failed with exit code 128
Tests / unittests-windows (3.8, windows.g5.4xlarge.nvidia.gpu, cuda, 11.8) / windows-job (gh)
The process 'C:\Program Files\Git\cmd\git.exe' failed with exit code 128
Tests / unittests-windows (3.9, windows.4xlarge, cpu) / windows-job (gh)
The process 'C:\Program Files\Git\cmd\git.exe' failed with exit code 128

BROKEN TRUNK - The following job failed but were present on the merge base:

👉 Rebase onto the `viable/strict` branch to avoid these failures

Build Windows Conda / pytorch/vision / conda-py3_8-cpu (gh)
Process completed with exit code 1.

This comment was automatically generated by Dr. CI and updates every 15 minutes.

facebook-github-bot · 2024-02-02T21:27:00Z

Hi @adamtheturtle!

Thank you for your pull request and welcome to our community.

Action Required

In order to merge any pull request (code, docs, etc.), we require contributors to sign our Contributor License Agreement, and we don't seem to have one on file for you.

Process

In order for us to review and merge your suggested changes, please sign at https://code.facebook.com/cla. If you are contributing on behalf of someone else (eg your employer), the individual CLA may not be sufficient and your employer may need to sign the corporate CLA.

Once the CLA is signed, our tooling will perform checks and validations. Afterwards, the pull request will be tagged with CLA signed. The tagging process may take up to 1 hour after signing. Please give it that time before contacting us about it.

If you have received this in error or have any questions, please contact us at [email protected]. Thanks!

facebook-github-bot · 2024-02-02T23:06:40Z

Thank you for signing our Contributor License Agreement. We can now accept your code for this (and any) Meta Open Source project. Thanks!

NicolasHug · 2024-02-05T09:35:14Z

torchvision/transforms/functional.py

@@ -123,7 +123,7 @@ def _is_numpy_image(img: Any) -> bool:
    return img.ndim in {2, 3}


-def to_tensor(pic) -> Tensor:
+def to_tensor(pic: Image | np.ndarray) -> Tensor:


Thanks for the PR @adamtheturtle , I think you'll have to use Union instead of | as | isn't supported in some older Python versions

Thank you @NicolasHug . I have updated this PR.

NicolasHug · 2024-02-06T10:32:31Z

Thanks @adamtheturtle

Looks like the tests are failing:

  Traceback (most recent call last):
    File "test/smoke_test.py", line 7, in <module>
      import torchvision
    File "/pytorch/vision/torchvision/__init__.py", line 6, in <module>
      from torchvision import _meta_registrations, datasets, io, models, ops, transforms, utils
    File "/pytorch/vision/torchvision/datasets/__init__.py", line 23, in <module>
      from .fakedata import FakeData
    File "/pytorch/vision/torchvision/datasets/fakedata.py", line 5, in <module>
      from .. import transforms
    File "/pytorch/vision/torchvision/transforms/__init__.py", line 1, in <module>
      from .transforms import *
    File "/pytorch/vision/torchvision/transforms/transforms.py", line 17, in <module>
      from . import functional as F
    File "/pytorch/vision/torchvision/transforms/functional.py", line 126, in <module>
      def to_tensor(pic: Union[Image, np.ndarray]) -> Tensor:
    File "/opt/conda/envs/ci/lib/python3.8/typing.py", line 261, in inner
      return func(*args, **kwds)
    File "/opt/conda/envs/ci/lib/python3.8/typing.py", line 358, in __getitem__
      parameters = tuple(_type_check(p, msg) for p in parameters)
    File "/opt/conda/envs/ci/lib/python3.8/typing.py", line 358, in <genexpr>
  Traceback (most recent call last):
    File "/home/ec2-user/actions-runner/_work/vision/vision/test-infra/.github/scripts/run_with_env_secrets.py", line 100, in <module>
      main()
    File "/home/ec2-user/actions-runner/_work/vision/vision/test-infra/.github/scripts/run_with_env_secrets.py", line 96, in main
      run_cmd_or_die(f"docker exec -t {container_name} /exec")
    File "/home/ec2-user/actions-runner/_work/vision/vision/test-infra/.github/scripts/run_with_env_secrets.py", line 38, in run_cmd_or_die
      raise RuntimeError(f"Command {cmd} failed with exit code {exit_code}")
  RuntimeError: Command docker exec -t b2f38ee0ffd06ad97f2daef9b2cb4c4e11e74664b2c492e44f4f8edb23f275af /exec failed with exit code 1
      parameters = tuple(_type_check(p, msg) for p in parameters)
    File "/opt/conda/envs/ci/lib/python3.8/typing.py", line 149, in _type_check
      raise TypeError(f"{msg} Got {arg!r:.100}.")
  TypeError: Union[arg, ...]: each arg must be a type. Got <module 'PIL.Image' from '/opt/conda/envs/ci/lib/python3.8/site-packages/PIL/Image.py'>.

I'm going to make this a "draft" PR - when the failures are fixed please ping me again with @NicolasHug so I can take a look! thank you

adamtheturtle · 2024-02-06T19:45:47Z

@NicolasHug I think we should be good now

NicolasHug

Thank you @adamtheturtle

adamtheturtle · 2024-02-08T10:36:25Z

Thank you @NicolasHug for getting this in.

Summary: Co-authored-by: Nicolas Hug <[email protected]> Reviewed By: vmoens Differential Revision: D55062810 fbshipit-source-id: 142052d28b3d5948876ebf63cc64fd3e2f28e37b

facebook-github-bot added the cla signed label Feb 2, 2024

NicolasHug reviewed Feb 5, 2024

View reviewed changes

adamtheturtle force-pushed the patch-1 branch from cd92de4 to a1cd97c Compare February 5, 2024 13:19

NicolasHug marked this pull request as draft February 6, 2024 10:32

Add parameter type to to_tensor

033a72a

adamtheturtle force-pushed the patch-1 branch from a1cd97c to 033a72a Compare February 6, 2024 19:43

adamtheturtle marked this pull request as ready for review February 6, 2024 19:45

adamtheturtle and others added 2 commits February 6, 2024 19:47

Merge branch 'main' into patch-1

d275fe5

Merge branch 'main' into patch-1

fbac810

NicolasHug approved these changes Feb 8, 2024

View reviewed changes

NicolasHug merged commit 81e2831 into pytorch:main Feb 8, 2024
11 of 31 checks passed

NicolasHug added module: transforms code quality labels Feb 8, 2024

adamtheturtle deleted the patch-1 branch February 8, 2024 10:36

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add parameter type to `to_tensor` #8251

Add parameter type to `to_tensor` #8251

adamtheturtle commented Feb 2, 2024 •

edited by pytorch-bot bot

Loading

pytorch-bot bot commented Feb 2, 2024 •

edited

Loading

facebook-github-bot commented Feb 2, 2024

facebook-github-bot commented Feb 2, 2024

NicolasHug Feb 5, 2024

adamtheturtle Feb 5, 2024

NicolasHug commented Feb 6, 2024

adamtheturtle commented Feb 6, 2024

NicolasHug left a comment

adamtheturtle commented Feb 8, 2024

Add parameter type to to_tensor #8251

Add parameter type to to_tensor #8251

Conversation

adamtheturtle commented Feb 2, 2024 • edited by pytorch-bot bot Loading

pytorch-bot bot commented Feb 2, 2024 • edited Loading

🔗 Helpful Links

🧪 See artifacts and rendered test results at hud.pytorch.org/pr/pytorch/vision/8251

✅ You can merge normally! (33 Unrelated Failures)

facebook-github-bot commented Feb 2, 2024

Action Required

Process

facebook-github-bot commented Feb 2, 2024

NicolasHug Feb 5, 2024

Choose a reason for hiding this comment

adamtheturtle Feb 5, 2024

Choose a reason for hiding this comment

NicolasHug commented Feb 6, 2024

adamtheturtle commented Feb 6, 2024

NicolasHug left a comment

Choose a reason for hiding this comment

adamtheturtle commented Feb 8, 2024

Add parameter type to `to_tensor` #8251

Add parameter type to `to_tensor` #8251

adamtheturtle commented Feb 2, 2024 •

edited by pytorch-bot bot

Loading

pytorch-bot bot commented Feb 2, 2024 •

edited

Loading