Skip to content

Remove 3.8 support #8552

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 30 commits into from
Aug 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
3cc83f1
Remove 3.8 support
NicolasHug Jul 30, 2024
1f72fc3
Merge branch 'main' into remove_38
NicolasHug Jul 30, 2024
6856307
Merge branch 'main' into remove_38
NicolasHug Jul 31, 2024
c9e5e9a
Merge branch 'main' into remove_38
NicolasHug Aug 6, 2024
e79032c
Skip test_nms for onnx job
NicolasHug Aug 10, 2024
ff6a56a
Merge branch 'main' of github.com:pytorch/vision into remove_38
NicolasHug Aug 10, 2024
0bcdafb
Merge branch 'remove_38' of github.com:NicolasHug/vision into remove_38
NicolasHug Aug 10, 2024
e948fca
Skip flaky test_autocast_cpu test
NicolasHug Aug 10, 2024
fd36bc4
Merge branch 'main' of github.com:pytorch/vision into remove_38
NicolasHug Aug 10, 2024
3c312d1
Merge branch 'test_autocast_cpu' into remove_38
NicolasHug Aug 10, 2024
28ec502
Remove vs2019 folder
NicolasHug Aug 10, 2024
c10870c
build docs on 3.10
NicolasHug Aug 10, 2024
5b4cc58
Merge branch 'remove_vs2019' into remove_38
NicolasHug Aug 10, 2024
3dd217a
Merge branch 'main' of github.com:pytorch/vision into remove_38
NicolasHug Aug 10, 2024
2728cb8
ONNX on 3.10?
NicolasHug Aug 10, 2024
4d23c11
onnx on 3.12?
NicolasHug Aug 10, 2024
7e8d8ed
and skip
NicolasHug Aug 10, 2024
6046ba1
empty
NicolasHug Aug 10, 2024
e0b11b2
3.10 again
NicolasHug Aug 10, 2024
d1e6abf
numpy < 2 for onnx
NicolasHug Aug 10, 2024
b1014c8
uh?
NicolasHug Aug 10, 2024
1d88f13
.
NicolasHug Aug 10, 2024
af14644
.
NicolasHug Aug 10, 2024
e4de9b1
.
NicolasHug Aug 10, 2024
39fb619
.
NicolasHug Aug 10, 2024
8dc06a6
Merge branch 'main' of github.com:pytorch/vision into remove_38
NicolasHug Aug 11, 2024
89647a1
Windows GPU unittest: try 3.10 and cuda 12.1
NicolasHug Aug 11, 2024
cb36943
Back to 11.8
NicolasHug Aug 11, 2024
ce0b99e
back to 3.9
NicolasHug Aug 12, 2024
6a78343
Merge branch 'main' into remove_38
NicolasHug Aug 12, 2024
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
6 changes: 3 additions & 3 deletions .github/workflows/build-cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
script: |
set -euo pipefail

export PYTHON_VERSION=3.8
export PYTHON_VERSION=3.9
export GPU_ARCH_TYPE=${{ matrix.gpu-arch-type }}
export GPU_ARCH_VERSION=${{ matrix.gpu-arch-version }}

Expand All @@ -50,7 +50,7 @@ jobs:
script: |
set -euo pipefail

export PYTHON_VERSION=3.8
export PYTHON_VERSION=3.9
export GPU_ARCH_TYPE=cpu
export GPU_ARCH_VERSION=''

Expand All @@ -76,7 +76,7 @@ jobs:
script: |
set -euo pipefail

export PYTHON_VERSION=3.8
export PYTHON_VERSION=3.9
export VC_YEAR=2022
export VSDEVCMD_ARGS=""
export GPU_ARCH_TYPE=${{ matrix.gpu-arch-type }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
script: |
set -euo pipefail

export PYTHON_VERSION=3.8
export PYTHON_VERSION=3.10
export GPU_ARCH_TYPE=cpu
export GPU_ARCH_VERSION=''
./.github/scripts/setup-env.sh
Expand Down
16 changes: 4 additions & 12 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
echo '::group::Setup environment'
CONDA_PATH=$(which conda)
eval "$(${CONDA_PATH} shell.bash hook)"
conda create --name ci --quiet --yes python=3.8 pip
conda create --name ci --quiet --yes python=3.9 pip
conda activate ci
echo '::endgroup::'

Expand All @@ -48,22 +48,14 @@ jobs:
echo '::group::Setup environment'
CONDA_PATH=$(which conda)
eval "$(${CONDA_PATH} shell.bash hook)"
# clang-format needs some shared libraries that conflict with the system ones. Thus, we install them from conda
# and prepend the libraries to linker path to prioritize them. `ncurses=5` is only available on the conda-forge
# channel. Since we are not building or testing here, this is fine.
conda create --name ci --quiet --yes -c conda-forge python=3.8 ncurses=5 libgcc
conda create --name ci --quiet --yes -c conda-forge python=3.9 clang-format
conda activate ci
export LD_LIBRARY_PATH="${CONDA_PREFIX}/lib:${LD_LIBRARY_PATH}"
echo '::endgroup::'

echo '::group::Install lint tools'
curl https://oss-clang-format.s3.us-east-2.amazonaws.com/linux64/clang-format-linux64 -o ./clang-format
chmod +x ./clang-format
echo '::endgroup::'

echo '::group::Lint C source'
set +e
./.github/scripts/run-clang-format.py -r torchvision/csrc --clang-format-executable ./clang-format --exclude "torchvision/csrc/io/image/cpu/giflib/*"
./.github/scripts/run-clang-format.py -r torchvision/csrc --exclude "torchvision/csrc/io/image/cpu/giflib/*"

if [ $? -ne 0 ]; then
git --no-pager diff
Expand All @@ -80,7 +72,7 @@ jobs:
script: |
set -euo pipefail

export PYTHON_VERSION=3.8
export PYTHON_VERSION=3.9
export GPU_ARCH_TYPE=cpu
export GPU_ARCH_VERSION=''

Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/prototype-tests-linux-gpu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,14 @@ jobs:
strategy:
matrix:
python-version:
- "3.8"
- "3.9"
- "3.10"
- "3.11"
- "3.12"
runner: ["linux.12xlarge"]
gpu-arch-type: ["cpu"]
include:
- python-version: "3.8"
- python-version: "3.9"
runner: linux.g5.4xlarge.nvidia.gpu
gpu-arch-type: cuda
gpu-arch-version: "11.8"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests-schedule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Set up python
uses: actions/setup-python@v2
with:
python-version: 3.8
python-version: 3.9

- name: Upgrade system packages
run: python -m pip install --upgrade pip setuptools wheel
Expand Down
13 changes: 5 additions & 8 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,14 @@ jobs:
strategy:
matrix:
python-version:
- "3.8"
- "3.9"
- "3.10"
- "3.11"
- "3.12"
runner: ["linux.12xlarge"]
gpu-arch-type: ["cpu"]
include:
- python-version: 3.8
- python-version: 3.9
runner: linux.g5.4xlarge.nvidia.gpu
gpu-arch-type: cuda
gpu-arch-version: "11.8"
Expand All @@ -48,7 +47,6 @@ jobs:
strategy:
matrix:
python-version:
- "3.8"
- "3.9"
- "3.10"
- "3.11"
Expand All @@ -74,15 +72,14 @@ jobs:
strategy:
matrix:
python-version:
- "3.8"
- "3.9"
- "3.10"
- "3.11"
- "3.12"
runner: ["windows.4xlarge"]
gpu-arch-type: ["cpu"]
include:
- python-version: "3.8"
- python-version: "3.9"
runner: windows.g5.4xlarge.nvidia.gpu
gpu-arch-type: cuda
gpu-arch-version: "11.8"
Expand Down Expand Up @@ -114,7 +111,7 @@ jobs:
script: |
set -euo pipefail

export PYTHON_VERSION=3.8
export PYTHON_VERSION=3.10
export GPU_ARCH_TYPE=cpu
export GPU_ARCH_VERSION=''

Expand All @@ -130,7 +127,7 @@ jobs:
echo '::endgroup::'

echo '::group::Install testing utilities'
pip install --progress-bar=off pytest
pip install --progress-bar=off pytest "numpy<2"
echo '::endgroup::'

echo '::group::Run ONNX tests'
Expand All @@ -146,7 +143,7 @@ jobs:
script: |
set -euo pipefail

export PYTHON_VERSION=3.8
export PYTHON_VERSION=3.9
export GPU_ARCH_TYPE=cpu
export GPU_ARCH_VERSION=''

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ versions.

| `torch` | `torchvision` | Python |
| ------------------ | ------------------ | ------------------- |
| `main` / `nightly` | `main` / `nightly` | `>=3.8`, `<=3.12` |
| `main` / `nightly` | `main` / `nightly` | `>=3.9`, `<=3.12` |
| `2.4` | `0.19` | `>=3.8`, `<=3.12` |
| `2.3` | `0.18` | `>=3.8`, `<=3.12` |
| `2.2` | `0.17` | `>=3.8`, `<=3.11` |
Expand Down
1 change: 0 additions & 1 deletion test/test_ops.py
Original file line number Diff line number Diff line change
Expand Up @@ -513,7 +513,6 @@ def test_autocast(self, aligned, deterministic, x_dtype, rois_dtype):
@pytest.mark.parametrize("x_dtype", (torch.float, torch.bfloat16))
@pytest.mark.parametrize("rois_dtype", (torch.float, torch.bfloat16))
def test_autocast_cpu(self, aligned, deterministic, x_dtype, rois_dtype):

with torch.cpu.amp.autocast():
self.test_forward(
torch.device("cpu"),
Expand Down
3 changes: 2 additions & 1 deletion torchvision/csrc/io/decoder/gpu/decoder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,8 @@ int Decoder::handle_picture_display(CUVIDPARSERDISPINFO* disp_info) {
uint8_t* frame_ptr = decoded_frame.data_ptr<uint8_t>();
const uint8_t* const source_arr[] = {
(const uint8_t* const)source_frame,
(const uint8_t* const)(source_frame + source_pitch * ((surface_height + 1) & ~1))};
(const uint8_t* const)(source_frame +
source_pitch * ((surface_height + 1) & ~1))};

auto err = nppiNV12ToRGB_709CSC_8u_P2C3R(
source_arr,
Expand Down
Loading