Skip to content
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

pytorch v2.6.0 #326

Merged
merged 57 commits into from
Feb 13, 2025
Merged
Show file tree
Hide file tree
Changes from 45 commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
11db2ff
pytorch v2.6.0.rc7
h-vetinari Jan 18, 2025
5645301
MNT: Re-rendered with conda-build 25.1.1, conda-smithy 3.45.2, and co…
h-vetinari Jan 18, 2025
1219e26
rebase patches
h-vetinari Jan 18, 2025
1e211b2
Remove bound on setuptools version
h-vetinari Jan 19, 2025
63c7c00
better sort pytorch run requirements
h-vetinari Jan 19, 2025
bc3581d
update dependencies for 2.6.0
h-vetinari Jan 19, 2025
113d413
pin libtorch in pytorch
h-vetinari Jan 19, 2025
c1b9cf6
backport fix for aarch build failure
h-vetinari Jan 20, 2025
bf65aa4
reduce OMP_NUM_THREADS further due to OOMs in test
h-vetinari Jan 20, 2025
6757593
use full paths to patched files in submodule
h-vetinari Jan 20, 2025
fa31c3f
don't pin libtorch exactly for non-megabuilds
h-vetinari Jan 20, 2025
49d134a
make build number arithmetic explicit
h-vetinari Jan 20, 2025
7cd981d
disable patch in submodule
h-vetinari Jan 20, 2025
1405263
don't pin build number of libtorch in pytorch (for non-megabuild)
h-vetinari Jan 20, 2025
51155b0
Merge remote-tracking branch 'upstream/main' into 2.6
h-vetinari Feb 3, 2025
be1ff5b
pytorch v2.6.0
h-vetinari Jan 31, 2025
95eb614
MNT: Re-rendered with conda-build 25.1.1, conda-smithy 3.45.4, and co…
h-vetinari Jan 31, 2025
beb5481
remove test skips for 3.13
h-vetinari Jan 31, 2025
7c0d921
vendor upstream smoke_test.py; not part of tarball
h-vetinari Jan 31, 2025
b627641
skip torchinductor tests on osx; segfaults hard
h-vetinari Feb 2, 2025
c12f03d
backport patch for torchinductor failures on windows
h-vetinari Feb 2, 2025
ce47e0a
skip a minor tolerance violation on osx
h-vetinari Feb 3, 2025
ba2564b
drop unsuccessful patch; now covered by skip
h-vetinari Feb 3, 2025
ab889b7
drop unnecessary CUDAFLAGS in bld.bat
h-vetinari Feb 3, 2025
194f2d9
skip test_batchnorm_nhwc_cpu on linux as well
h-vetinari Feb 4, 2025
8804810
disable smoke test on aarch
h-vetinari Feb 4, 2025
93854a6
Revert "Unvendor pybind11 and eigen"
h-vetinari Feb 5, 2025
b4ab27b
use different formulation for ptxas warning filter
h-vetinari Feb 5, 2025
f72a13e
re-add zlib to pytorch's host deps
h-vetinari Feb 5, 2025
b1658ef
remove smoke test
h-vetinari Feb 5, 2025
8a43a63
deactivate pytest-xdist for linux-64+CUDA+MKL
h-vetinari Feb 7, 2025
1da1037
temporary: skip known-passing builds to conserve resources
h-vetinari Feb 7, 2025
4784f25
Revert "deactivate pytest-xdist for linux-64+CUDA+MKL"
h-vetinari Feb 7, 2025
51109f4
fix stray `)` that broke pytest
h-vetinari Feb 7, 2025
796a52b
fix the way we look for `$PREFIX/include` in cross-compilation
h-vetinari Feb 8, 2025
d72a0fd
Revert "temporary: skip known-passing builds to conserve resources"
h-vetinari Feb 8, 2025
96d3954
Reapply "Unvendor pybind11 and eigen"
h-vetinari Feb 8, 2025
051b686
different spelling for handing `-w` to `-Xptxas`
h-vetinari Feb 8, 2025
71e319d
skip test_mutable_custom_op_fixed_layout everywhere
h-vetinari Feb 8, 2025
de7707c
robustify CONDA_BUILD_CROSS_COMPILATION handling
h-vetinari Feb 8, 2025
381fcb8
set CUDA_VERSION during build; test `torch.version.cuda` is correct
h-vetinari Feb 9, 2025
04e1437
enable `torch.backends` tests also for win+CUDA
h-vetinari Feb 9, 2025
272621b
Build with `-Wl,-z,noexecstack` to fix glibc 2.41 compatibility
mgorny Feb 10, 2025
b254812
add v2.5.x to abi_migration_branches
h-vetinari Feb 10, 2025
2eb8ef4
actually move `_C.lib` back to `%SP_DIR%\torch\lib`
h-vetinari Feb 11, 2025
22ee0fe
avoid very verbose logs from setuptools
mgorny Feb 12, 2025
47f7f21
homogenize pytest invocation; also use -v on unix
h-vetinari Feb 12, 2025
35d03ed
filter out ptxas advisories
h-vetinari Feb 12, 2025
6d2a9a6
suppress warning block in pytest results
h-vetinari Feb 12, 2025
d31229e
run tests sequentially, but increase OMP_NUM_THREADS again
h-vetinari Feb 12, 2025
364ad9d
skip test failures that were not due to OOM
h-vetinari Feb 12, 2025
f14feb5
temporary: restrict jobs to linux64+CUDA
h-vetinari Feb 12, 2025
2e75510
minor skip updates
h-vetinari Feb 12, 2025
db4e301
ignore C++ warnings
h-vetinari Feb 12, 2025
5640240
skip some tests that take a very long time
h-vetinari Feb 12, 2025
395bea3
Revert "temporary: restrict jobs to linux64+CUDA"
h-vetinari Feb 12, 2025
a75ba71
avoid filter for ptxas advisories on osx
h-vetinari Feb 12, 2025
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
Original file line number Diff line number Diff line change
Expand Up @@ -80,3 +80,5 @@ zip_keys:
- is_rc
- - python
- numpy
zlib:
- '1'
Original file line number Diff line number Diff line change
Expand Up @@ -80,3 +80,5 @@ zip_keys:
- is_rc
- - python
- numpy
zlib:
- '1'
Original file line number Diff line number Diff line change
Expand Up @@ -80,3 +80,5 @@ zip_keys:
- is_rc
- - python
- numpy
zlib:
- '1'
Original file line number Diff line number Diff line change
Expand Up @@ -80,3 +80,5 @@ zip_keys:
- is_rc
- - python
- numpy
zlib:
- '1'
Original file line number Diff line number Diff line change
Expand Up @@ -80,3 +80,5 @@ zip_keys:
- is_rc
- - python
- numpy
zlib:
- '1'
Original file line number Diff line number Diff line change
Expand Up @@ -80,3 +80,5 @@ zip_keys:
- is_rc
- - python
- numpy
zlib:
- '1'
Original file line number Diff line number Diff line change
Expand Up @@ -67,3 +67,5 @@ zip_keys:
- is_rc
- - python
- numpy
zlib:
- '1'
Original file line number Diff line number Diff line change
Expand Up @@ -67,3 +67,5 @@ zip_keys:
- is_rc
- - python
- numpy
zlib:
- '1'
Original file line number Diff line number Diff line change
Expand Up @@ -67,3 +67,5 @@ zip_keys:
- is_rc
- - python
- numpy
zlib:
- '1'
Original file line number Diff line number Diff line change
Expand Up @@ -67,3 +67,5 @@ zip_keys:
- is_rc
- - python
- numpy
zlib:
- '1'
Original file line number Diff line number Diff line change
Expand Up @@ -67,3 +67,5 @@ zip_keys:
- is_rc
- - python
- numpy
zlib:
- '1'
Original file line number Diff line number Diff line change
Expand Up @@ -67,3 +67,5 @@ zip_keys:
- is_rc
- - python
- numpy
zlib:
- '1'
Original file line number Diff line number Diff line change
Expand Up @@ -67,3 +67,5 @@ zip_keys:
- is_rc
- - python
- numpy
zlib:
- '1'
Original file line number Diff line number Diff line change
Expand Up @@ -67,3 +67,5 @@ zip_keys:
- is_rc
- - python
- numpy
zlib:
- '1'
Original file line number Diff line number Diff line change
Expand Up @@ -67,3 +67,5 @@ zip_keys:
- is_rc
- - python
- numpy
zlib:
- '1'
Original file line number Diff line number Diff line change
Expand Up @@ -67,3 +67,5 @@ zip_keys:
- is_rc
- - python
- numpy
zlib:
- '1'
Original file line number Diff line number Diff line change
Expand Up @@ -67,3 +67,5 @@ zip_keys:
- is_rc
- - python
- numpy
zlib:
- '1'
Original file line number Diff line number Diff line change
Expand Up @@ -67,3 +67,5 @@ zip_keys:
- is_rc
- - python
- numpy
zlib:
- '1'
Original file line number Diff line number Diff line change
Expand Up @@ -67,3 +67,5 @@ zip_keys:
- is_rc
- - python
- numpy
zlib:
- '1'
Original file line number Diff line number Diff line change
Expand Up @@ -67,3 +67,5 @@ zip_keys:
- is_rc
- - python
- numpy
zlib:
- '1'
Original file line number Diff line number Diff line change
Expand Up @@ -67,3 +67,5 @@ zip_keys:
- is_rc
- - python
- numpy
zlib:
- '1'
Original file line number Diff line number Diff line change
Expand Up @@ -59,3 +59,5 @@ zip_keys:
- cuda_compiler_version
- - python
- numpy
zlib:
- '1'
Original file line number Diff line number Diff line change
Expand Up @@ -59,3 +59,5 @@ zip_keys:
- cuda_compiler_version
- - python
- numpy
zlib:
- '1'
2 changes: 1 addition & 1 deletion .github/workflows/conda-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
build:
name: ${{ matrix.CONFIG }}
runs-on: ${{ matrix.runs_on }}
timeout-minutes: 1080
timeout-minutes: 900
strategy:
fail-fast: false
matrix:
Expand Down
5 changes: 4 additions & 1 deletion conda-forge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ azure:
settings_win:
variables:
CONDA_BLD_PATH: C:\\bld\\
bot:
abi_migration_branches:
- v2.5.x
build_platform:
linux_aarch64: linux_64
osx_arm64: osx_64
Expand All @@ -16,7 +19,7 @@ github:
tooling_branch_name: main
github_actions:
self_hosted: true
timeout_minutes: 1080
timeout_minutes: 900
triggers:
- push
- pull_request
Expand Down
9 changes: 4 additions & 5 deletions recipe/bld.bat
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,7 @@ if not "%cuda_compiler_version%" == "None" (
set MAGMA_HOME=%LIBRARY_PREFIX%
set "PATH=%CUDA_BIN_PATH%;%PATH%"
set CUDNN_INCLUDE_DIR=%LIBRARY_PREFIX%\include
@REM turn off very noisy nvcc warnings
set "CUDAFLAGS=-w --ptxas-options=-w"
set "CUDA_VERSION=%cuda_compiler_version%"
) else (
set USE_CUDA=0
@REM MKLDNN is an Apache-2.0 licensed library for DNNs and is used
Expand Down Expand Up @@ -205,7 +204,7 @@ if "%PKG_NAME%" == "libtorch" (

@REM Remove the python binary file, that is placed in the site-packages
@REM directory by the specific python specific pytorch package.
del %LIBRARY_BIN%\torch_python.* %LIBRARY_LIB%\torch_python.* %LIBRARY_LIB%\_C.lib
del %LIBRARY_BIN%\torch_python.* %LIBRARY_LIB%\torch_python.*
if %ERRORLEVEL% neq 0 exit 1

popd
Expand All @@ -228,8 +227,8 @@ if "%PKG_NAME%" == "libtorch" (

@REM Copy libtorch_python.lib back -- that's much easier than the for loop
@REM needed to remove everything else.
robocopy /NP /NFL /NDL /NJH /E %LIBRARY_LIB%\ torch\lib\ torch_python.lib
robocopy /NP /NFL /NDL /NJH /E %LIBRARY_LIB%\ torch\lib\ _C.lib
mkdir %SP_DIR%\torch\lib
robocopy /NP /NFL /NDL /NJH /E /MOV %LIBRARY_LIB%\ %SP_DIR%\torch\lib\ torch_python.lib _C.lib
)

@REM Show the sccache stats.
Expand Down
7 changes: 6 additions & 1 deletion recipe/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@ export _GLIBCXX_USE_CXX11_ABI=1
if [[ "$target_platform" == "osx-64" ]]; then
export CXXFLAGS="$CXXFLAGS -DTARGET_OS_OSX=1"
export CFLAGS="$CFLAGS -DTARGET_OS_OSX=1"
elif [[ "$target_platform" == linux-* ]]; then
# Explicitly force non-executable stack to fix compatibility with glibc 2.41, due to:
# ittptmark64.S.o: missing .note.GNU-stack section implies executable stack
LDFLAGS="${LDFLAGS} -Wl,-z,noexecstack"
fi

# Dynamic libraries need to be lazily loaded so that torch
Expand Down Expand Up @@ -219,8 +223,9 @@ elif [[ ${cuda_compiler_version} != "None" ]]; then
export USE_STATIC_CUDNN=0
export MAGMA_HOME="${PREFIX}"
export USE_MAGMA=1
export CUDA_VERSION=$cuda_compiler_version
# turn off noisy nvcc warnings
export CMAKE_CUDA_FLAGS="-w --ptxas-options=-w"
export CMAKE_CUDA_FLAGS="-w -Xptxas -w"
else
if [[ "$target_platform" != *-64 ]]; then
# Breakpad seems to not work on aarch64 or ppc64le
Expand Down
Loading
Loading