OSSForks/pytorch
1
0
Fork 0
mirror of https://github.com/zebrajr/pytorch.git synced 2025-12-06 12:20:52 +01:00
Code Issues Actions 38 Packages Projects Releases Wiki Activity

Revert "[build] pin setuptools>=77 to enable PEP 639 (#158104)"

Browse Source 
This reverts commit a4ec381302.

Reverted https://github.com/pytorch/pytorch/pull/158104 on behalf of https://github.com/malfet due to This break inductor-perf-nighly-macos by failing to build torchvision, see https://github.com/pytorch/pytorch/issues/158728 ([comment](https://github.com/pytorch/pytorch/pull/158104#issuecomment-3095048940))
This commit is contained in:
PyTorch MergeBot 2025-07-21 02:24:11 +00:00
parent ff0da08f4b
commit 5e1232871b
15 changed files with 40 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.ci/docker/manywheel/Dockerfile_2_28
View File

@ -128,7 +128,7 @@ ENV PATH=/opt/rh/gcc-toolset-${DEVTOOLSET_VERSION}/root/usr/bin:$PATH
ENV LD_LIBRARY_PATH=/opt/rh/gcc-toolset-${DEVTOOLSET_VERSION}/root/usr/lib64:/opt/rh/gcc-toolset-${DEVTOOLSET_VERSION}/root/usr/lib:$LD_LIBRARY_PATH ENV LD_LIBRARY_PATH=/opt/rh/gcc-toolset-${DEVTOOLSET_VERSION}/root/usr/lib64:/opt/rh/gcc-toolset-${DEVTOOLSET_VERSION}/root/usr/lib:$LD_LIBRARY_PATH
# Install setuptools and wheel for python 3.12/3.13 # Install setuptools and wheel for python 3.12/3.13
RUN for cpython_version in "cp312-cp312" "cp313-cp313" "cp313-cp313t"; do \ RUN for cpython_version in "cp312-cp312" "cp313-cp313" "cp313-cp313t"; do \
/opt/python/${cpython_version}/bin/python -m pip install "setuptools>=77.0.0" "packaging>=24.2" wheel; \ /opt/python/${cpython_version}/bin/python -m pip install setuptools wheel; \
done; done;

5
.ci/docker/manywheel/Dockerfile_s390x
View File

@ -124,9 +124,10 @@ RUN python3 -mpip install cmake==3.28.0
# install newest flatbuffers version first: # install newest flatbuffers version first:
# for some reason old version is getting pulled in otherwise. # for some reason old version is getting pulled in otherwise.
# packaging package is required for onnxruntime wheel build. # packaging package is required for onnxruntime wheel build.
RUN pip3 install 'setuptools>=77.0' 'packaging>=24.2' && \ RUN pip3 install flatbuffers && \
pip3 install flatbuffers cython 'pkgconfig>=1.5.5' 'numpy<2.3.0' && \ pip3 install cython 'pkgconfig>=1.5.5' 'setuptools>=77' 'numpy<2.3.0' && \
pip3 install --no-build-isolation h5py==3.11.0 && \ pip3 install --no-build-isolation h5py==3.11.0 && \
pip3 install packaging && \
git clone https://github.com/microsoft/onnxruntime && \ git clone https://github.com/microsoft/onnxruntime && \
cd onnxruntime && git checkout v1.21.0 && \ cd onnxruntime && git checkout v1.21.0 && \
git submodule update --init --recursive && \ git submodule update --init --recursive && \

7
.ci/docker/requirements-ci.txt
View File

@ -50,7 +50,7 @@ flatbuffers==24.12.23
hypothesis==5.35.1 hypothesis==5.35.1
# Pin hypothesis to avoid flakiness: https://github.com/pytorch/pytorch/issues/31136 # Pin hypothesis to avoid flakiness: https://github.com/pytorch/pytorch/issues/31136
#Description: advanced library for generating parametrized tests #Description: advanced library for generating parametrized tests
#Pinned versions: 5.35.1 #Pinned versions: 3.44.6, 4.53.2
#test that import: test_xnnpack_integration.py, test_pruning_op.py, test_nn.py #test that import: test_xnnpack_integration.py, test_pruning_op.py, test_nn.py
junitparser==2.1.1 junitparser==2.1.1
@ -307,7 +307,7 @@ pytest-cpp==2.3.0
#Pinned versions: 2.3.0 #Pinned versions: 2.3.0
#test that import: #test that import:
z3-solver==4.15.1.0 z3-solver==4.12.6.0
#Description: The Z3 Theorem Prover Project #Description: The Z3 Theorem Prover Project
#Pinned versions: #Pinned versions:
#test that import: #test that import:
@ -363,10 +363,9 @@ pwlf==2.2.1
# To build PyTorch itself # To build PyTorch itself
packaging>=24.2
pyyaml pyyaml
pyzstd pyzstd
setuptools>=77.0.0 setuptools>=70.1.0
six six
scons==4.5.2 ; platform_machine == "aarch64" scons==4.5.2 ; platform_machine == "aarch64"

3
.ci/pytorch/build.sh
View File

@ -269,9 +269,6 @@ if [[ "$BUILD_ENVIRONMENT" == *-bazel-* ]]; then
tools/bazel build --config=no-tty "${BAZEL_MEM_LIMIT}" "${BAZEL_CPU_LIMIT}" //... tools/bazel build --config=no-tty "${BAZEL_MEM_LIMIT}" "${BAZEL_CPU_LIMIT}" //...
fi fi
else else
# install build-system requirements before running setup.py commands
python -m pip install -r requirements-build.txt
# check that setup.py would fail with bad arguments # check that setup.py would fail with bad arguments
echo "The next three invocations are expected to fail with invalid command error messages." echo "The next three invocations are expected to fail with invalid command error messages."
( ! get_exit_code python setup.py bad_argument ) ( ! get_exit_code python setup.py bad_argument )

5
.ci/pytorch/win-test-helpers/build_pytorch.bat
View File

@ -126,11 +126,6 @@ if "%USE_CUDA%"=="1" (
set CMAKE_CUDA_COMPILER_LAUNCHER=%TMP_DIR%/bin/randomtemp.exe;%TMP_DIR%\bin\sccache.exe set CMAKE_CUDA_COMPILER_LAUNCHER=%TMP_DIR%/bin/randomtemp.exe;%TMP_DIR%\bin\sccache.exe
) )
:: Install build-system requirements before running setup.py commands
python -m pip install -r requirements-build.txt
if errorlevel 1 goto fail
if not errorlevel 0 goto fail
:: Print all existing environment variable for debugging :: Print all existing environment variable for debugging
set set

2
.ci/pytorch/win-test.sh
View File

@ -41,7 +41,7 @@ fi
python -m pip install pytest-rerunfailures==10.3 pytest-cpp==2.3.0 tensorboard==2.13.0 protobuf==5.29.4 pytest-subtests==0.13.1 python -m pip install pytest-rerunfailures==10.3 pytest-cpp==2.3.0 tensorboard==2.13.0 protobuf==5.29.4 pytest-subtests==0.13.1
# Install Z3 optional dependency for Windows builds. # Install Z3 optional dependency for Windows builds.
python -m pip install z3-solver==4.15.1.0 python -m pip install z3-solver==4.12.2.0
# Install tlparse for test\dynamo\test_structured_trace.py UTs. # Install tlparse for test\dynamo\test_structured_trace.py UTs.
python -m pip install tlparse==0.3.30 python -m pip install tlparse==0.3.30

2
.ci/pytorch/windows/internal/install_python.bat
View File

@ -18,5 +18,5 @@ start /wait "" python-amd64.exe /quiet InstallAllUsers=1 PrependPath=0 Include_t
if errorlevel 1 exit /b 1 if errorlevel 1 exit /b 1
set "PATH=%CD%\Python\Scripts;%CD%\Python;%PATH%" set "PATH=%CD%\Python\Scripts;%CD%\Python;%PATH%"
%PYTHON_EXEC% -m pip install --upgrade pip "setuptools>=77.0.0" "packaging>=24.2" wheel %PYTHON_EXEC% -m pip install --upgrade pip setuptools packaging wheel
if errorlevel 1 exit /b 1 if errorlevel 1 exit /b 1

5
.ci/pytorch/windows/setup_build.bat
View File

@ -7,9 +7,6 @@ call "internal\install_python.bat"
%PYTHON_EXEC% --version %PYTHON_EXEC% --version
set "PATH=%CD%\Python\Lib\site-packages\cmake\data\bin;%CD%\Python\Scripts;%CD%\Python;%PATH%" set "PATH=%CD%\Python\Lib\site-packages\cmake\data\bin;%CD%\Python\Scripts;%CD%\Python;%PATH%"
%PYTHON_EXEC% -m pip install "setuptools>=77.0.0" "packaging>=24.2"
if "%DESIRED_PYTHON%" == "3.13t" %PYTHON_EXEC% -m pip install numpy==2.2.1 cmake if "%DESIRED_PYTHON%" == "3.13t" %PYTHON_EXEC% -m pip install numpy==2.2.1 cmake
if "%DESIRED_PYTHON%" == "3.13" %PYTHON_EXEC% -m pip install numpy==2.1.2 cmake if "%DESIRED_PYTHON%" == "3.13" %PYTHON_EXEC% -m pip install numpy==2.1.2 cmake
if "%DESIRED_PYTHON%" == "3.12" %PYTHON_EXEC% -m pip install numpy==2.0.2 cmake if "%DESIRED_PYTHON%" == "3.12" %PYTHON_EXEC% -m pip install numpy==2.0.2 cmake
@ -19,7 +16,7 @@ if "%DESIRED_PYTHON%" == "3.9" %PYTHON_EXEC% -m pip install numpy==2.0.2 cmake
%PYTHON_EXEC% -m pip install pyyaml %PYTHON_EXEC% -m pip install pyyaml
%PYTHON_EXEC% -m pip install mkl-include mkl-static %PYTHON_EXEC% -m pip install mkl-include mkl-static
%PYTHON_EXEC% -m pip install boto3 ninja typing-extensions %PYTHON_EXEC% -m pip install boto3 ninja typing_extensions setuptools==72.1.0
where cmake.exe where cmake.exe

14
.ci/wheel/build_wheel.sh
View File

@ -127,7 +127,7 @@ export INSTALL_TEST=0 # dont install test binaries into site-packages
export MACOSX_DEPLOYMENT_TARGET=10.15 export MACOSX_DEPLOYMENT_TARGET=10.15
export CMAKE_PREFIX_PATH=${CONDA_PREFIX:-"$(dirname $(which conda))/../"} export CMAKE_PREFIX_PATH=${CONDA_PREFIX:-"$(dirname $(which conda))/../"}
SETUPTOOLS_PINNED_VERSION="==77.0.0" SETUPTOOLS_PINNED_VERSION="==70.1.0"
PYYAML_PINNED_VERSION="=5.3" PYYAML_PINNED_VERSION="=5.3"
EXTRA_CONDA_INSTALL_FLAGS="" EXTRA_CONDA_INSTALL_FLAGS=""
CONDA_ENV_CREATE_FLAGS="" CONDA_ENV_CREATE_FLAGS=""
@ -135,7 +135,7 @@ RENAME_WHEEL=true
case $desired_python in case $desired_python in
3.13t) 3.13t)
echo "Using 3.13 deps" echo "Using 3.13 deps"
SETUPTOOLS_PINNED_VERSION=">=77.0.0" SETUPTOOLS_PINNED_VERSION=">=70.1.0"
PYYAML_PINNED_VERSION=">=6.0.1" PYYAML_PINNED_VERSION=">=6.0.1"
NUMPY_PINNED_VERSION="=2.1.0" NUMPY_PINNED_VERSION="=2.1.0"
CONDA_ENV_CREATE_FLAGS="python-freethreading" CONDA_ENV_CREATE_FLAGS="python-freethreading"
@ -145,31 +145,31 @@ case $desired_python in
;; ;;
3.13) 3.13)
echo "Using 3.13 deps" echo "Using 3.13 deps"
SETUPTOOLS_PINNED_VERSION=">=77.0.0" SETUPTOOLS_PINNED_VERSION=">=70.1.0"
PYYAML_PINNED_VERSION=">=6.0.1" PYYAML_PINNED_VERSION=">=6.0.1"
NUMPY_PINNED_VERSION="=2.1.0" NUMPY_PINNED_VERSION="=2.1.0"
;; ;;
3.12) 3.12)
echo "Using 3.12 deps" echo "Using 3.12 deps"
SETUPTOOLS_PINNED_VERSION=">=77.0.0" SETUPTOOLS_PINNED_VERSION=">=70.1.0"
PYYAML_PINNED_VERSION=">=6.0.1" PYYAML_PINNED_VERSION=">=6.0.1"
NUMPY_PINNED_VERSION="=2.0.2" NUMPY_PINNED_VERSION="=2.0.2"
;; ;;
3.11) 3.11)
echo "Using 3.11 deps" echo "Using 3.11 deps"
SETUPTOOLS_PINNED_VERSION=">=77.0.0" SETUPTOOLS_PINNED_VERSION=">=70.1.0"
PYYAML_PINNED_VERSION=">=5.3" PYYAML_PINNED_VERSION=">=5.3"
NUMPY_PINNED_VERSION="=2.0.2" NUMPY_PINNED_VERSION="=2.0.2"
;; ;;
3.10) 3.10)
echo "Using 3.10 deps" echo "Using 3.10 deps"
SETUPTOOLS_PINNED_VERSION=">=77.0.0" SETUPTOOLS_PINNED_VERSION=">=70.1.0"
PYYAML_PINNED_VERSION=">=5.3" PYYAML_PINNED_VERSION=">=5.3"
NUMPY_PINNED_VERSION="=2.0.2" NUMPY_PINNED_VERSION="=2.0.2"
;; ;;
3.9) 3.9)
echo "Using 3.9 deps" echo "Using 3.9 deps"
SETUPTOOLS_PINNED_VERSION=">=77.0.0" SETUPTOOLS_PINNED_VERSION=">=70.1.0"
PYYAML_PINNED_VERSION=">=5.3" PYYAML_PINNED_VERSION=">=5.3"
NUMPY_PINNED_VERSION="=2.0.2" NUMPY_PINNED_VERSION="=2.0.2"
;; ;;

6
.github/requirements/pip-requirements-macOS.txt vendored
View File

@ -12,7 +12,7 @@ numba==0.59.0
numpy==1.26.4 numpy==1.26.4
opt-einsum>=3.3 opt-einsum>=3.3
optree==0.13.0 optree==0.13.0
packaging==25.0 packaging==23.1
parameterized==0.8.1 parameterized==0.8.1
pillow==10.3.0 pillow==10.3.0
protobuf==5.29.4 protobuf==5.29.4
@ -26,11 +26,11 @@ pytest-xdist==3.3.1
pytest==7.3.2 pytest==7.3.2
pyyaml==6.0.2 pyyaml==6.0.2
scipy==1.12.0 scipy==1.12.0
setuptools==80.9.0 setuptools==72.1.0
sympy==1.13.3 sympy==1.13.3
tlparse==0.3.30 tlparse==0.3.30
tensorboard==2.13.0 tensorboard==2.13.0
typing-extensions==4.12.2 typing-extensions==4.12.2
unittest-xml-reporting<=3.2.0,>=2.0.0 unittest-xml-reporting<=3.2.0,>=2.0.0
xdoctest==1.1.0 xdoctest==1.1.0
z3-solver==4.15.1.0 z3-solver==4.12.2.0

2
.github/scripts/lintrunner.sh vendored
View File

@ -2,7 +2,7 @@
set -ex set -ex
# Use uv to speed up lintrunner init # Use uv to speed up lintrunner init
python3 -m pip install -U uv setuptools python3 -m pip install uv==0.1.45 setuptools
CACHE_DIRECTORY="/tmp/.lintbin" CACHE_DIRECTORY="/tmp/.lintbin"
# Try to recover the cached binaries # Try to recover the cached binaries

2
.github/scripts/windows/build_triton.bat vendored
View File

@ -10,7 +10,7 @@ if "%PY_VERS%" == "3.13t" (
call conda create -n %PYTHON_PREFIX% -y -c=conda-forge python=%PY_VERS% call conda create -n %PYTHON_PREFIX% -y -c=conda-forge python=%PY_VERS%
) )
:: Fix cmake version for issue https://github.com/pytorch/pytorch/issues/150480 :: Fix cmake version for issue https://github.com/pytorch/pytorch/issues/150480
call conda run -n %PYTHON_PREFIX% pip install wheel pybind11 certifi cython cmake==3.31.6 setuptools==78.1.1 ninja call conda run -n %PYTHON_PREFIX% pip install wheel pybind11 certifi cython cmake==3.31.6 setuptools==72.1.0 ninja
dir "%VC_INSTALL_PATH%" dir "%VC_INSTALL_PATH%"

11
pyproject.toml
View File

@ -2,12 +2,13 @@
[build-system] [build-system]
requires = [ requires = [
# 70.1.0: min version for integrated bdist_wheel command from wheel package
# 77.0.0: min version for SPDX expression support for project.license # 77.0.0: min version for SPDX expression support for project.license
"setuptools>=77.0.0,<80.0", "setuptools>=70.1.0,<80.0",
"cmake>=3.27", "cmake>=3.27",
"ninja", "ninja",
"numpy", "numpy",
"packaging>=24.2", "packaging",
"pyyaml", "pyyaml",
"requests", "requests",
"six", # dependency chain: NNPACK -> PeachPy -> six "six", # dependency chain: NNPACK -> PeachPy -> six
@ -20,7 +21,11 @@ name = "torch"
description = "Tensors and Dynamic neural networks in Python with strong GPU acceleration" description = "Tensors and Dynamic neural networks in Python with strong GPU acceleration"
readme = "README.md" readme = "README.md"
requires-python = ">=3.9,<3.14" requires-python = ">=3.9,<3.14"
license = "BSD-3-Clause" # TODO: change to `license = "BSD-3-Clause"` and enable PEP 639 after pinning setuptools>=77
# FIXME: As of 2025.06.20, it is hard to ensure the minimum version of setuptools in our CI environment.
# TOML-table-based license deprecated in setuptools>=77, and the deprecation warning will be changed
# to an error on 2026.02.18. See also: https://github.com/pypa/setuptools/issues/4903
license = { text = "BSD-3-Clause" }
authors = [{ name = "PyTorch Team", email = "packages@pytorch.org" }] authors = [{ name = "PyTorch Team", email = "packages@pytorch.org" }]
keywords = ["pytorch", "machine learning"] keywords = ["pytorch", "machine learning"]
classifiers = [ classifiers = [

4
requirements-build.txt
View File

@ -1,9 +1,9 @@
# Build System requirements # Build System requirements
setuptools>=77.0.0,<80.0 # setuptools develop deprecated on 80.0 setuptools>=70.1.0,<80.0 # setuptools develop deprecated on 80.0
cmake>=3.27 cmake>=3.27
ninja ninja
numpy numpy
packaging>=24.2 packaging
pyyaml pyyaml
requests requests
six # dependency chain: NNPACK -> PeachPy -> six six # dependency chain: NNPACK -> PeachPy -> six

16
test/dynamo/test_exc.py
View File

@ -251,13 +251,13 @@ translation validation failed.
Model: Model:
==> L['shape'][0]: 0 ==> L['shape'][0]: 0
==> L['shape'][1]: 0 ==> L['shape'][1]: 1
==> L['shape'][2]: 0 ==> L['shape'][2]: 1
==> L['x'].size()[0]: 3 ==> L['x'].size()[0]: 3
==> L['x'].storage_offset(): 0 ==> L['x'].storage_offset(): 0
==> L['x'].stride()[0]: 1 ==> L['x'].stride()[0]: 1
==> s3: 0 ==> s3: 1
==> s52: 0 ==> s52: 1
==> s77: 3 ==> s77: 3
==> s86: 0 ==> s86: 0
@ -315,16 +315,16 @@ Failure occurred while running node:
%split : [num_users=3] = call_method[target=split](args = (%l_x_, (%l_shape_0_, %l_shape_1_, %l_shape_2_)), kwargs = {}) %split : [num_users=3] = call_method[target=split](args = (%l_x_, (%l_shape_0_, %l_shape_1_, %l_shape_2_)), kwargs = {})
Model: Model:
==> L['shape'][0]: 0 ==> L['shape'][0]: 1
==> L['shape'][1]: 0 ==> L['shape'][1]: 1
==> L['shape'][2]: 0 ==> L['shape'][2]: 0
==> L['x'].size()[0]: 3 ==> L['x'].size()[0]: 3
==> L['x'].storage_offset(): 0 ==> L['x'].storage_offset(): 0
==> L['x'].stride()[0]: 1 ==> L['x'].stride()[0]: 1
==> s3: 0 ==> s3: 0
==> s52: 0 ==> s52: 1
==> s77: 3 ==> s77: 3
==> s86: 0 ==> s86: 1
Assertions: Assertions:
==> (== 0 L['x'].storage_offset()) ==> (== 0 L['x'].storage_offset())