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.

Sign up for GitHub

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

#328 + remove TH_BINARY_BUILD #331

Merged
merged 44 commits into from
Jan 25, 2025
Merged

#328 + remove TH_BINARY_BUILD #331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
c3b2a1f
Attempt reenabling cuDSS, cuSPARSELt and CUPTI on Windows
mgorny Jan 19, 2025
673dd87
Bump build number
mgorny Jan 19, 2025
9008ca4
Skip non-Windows builds
mgorny Jan 19, 2025
d241483
Remove osx-64 code from bld.bat
mgorny Jan 20, 2025
62d4cbd
Remove py3.8 code from bld.bat
mgorny Jan 20, 2025
f8fa30a
Add error handling to bld.bat
mgorny Jan 20, 2025
8eb627d
Call clean only if build exists
mgorny Jan 20, 2025
7f0e31d
Use a consistent comment style in bld.bat
mgorny Jan 20, 2025
8e3e4c1
Move libraries & co. to %LIBRARY_PREFIX% and subdirs
mgorny Jan 20, 2025
8e3c175
MNT: Re-rendered with conda-build 25.1.1, conda-smithy 3.45.3, and co…
mgorny Jan 20, 2025
f8375c3
Move torch_python as well
mgorny Jan 20, 2025
776ef15
trigger
hmaarrfk Jan 20, 2025
1eb3609
fix robocopy syntax
h-vetinari Jan 21, 2025
afa02aa
syntax fixes
h-vetinari Jan 21, 2025
f21264d
remove superfluous errorlevel checks and remove unused label
h-vetinari Jan 21, 2025
3fb0821
use backslashes for windows paths
h-vetinari Jan 21, 2025
0cbb90f
don't bother with errorlevel checking for robocopy
h-vetinari Jan 21, 2025
9b3c70f
Apply suggestions from code review
mgorny Jan 21, 2025
0674c17
Add a test for TorchConfig.cmake being installed
mgorny Jan 21, 2025
855f15c
Copy torch_python.lib back to site-packages
mgorny Jan 21, 2025
c142c1e
align indentation
h-vetinari Jan 21, 2025
5887413
Fix copying libtorch_python.*
mgorny Jan 21, 2025
cb1bef2
remove skips
h-vetinari Jan 21, 2025
1ce4bd8
copy first, delete later
h-vetinari Jan 22, 2025
7b18054
more robocopy syntax fixes
h-vetinari Jan 22, 2025
a8d4380
move _C.lib back to site-packages
h-vetinari Jan 22, 2025
a239392
do not package `fmt.lib` in `libtorch`
h-vetinari Jan 22, 2025
fc5693c
pin python in build environment to same version as in host
h-vetinari Jan 22, 2025
3ebf1a9
DEBUG: build only one python version
h-vetinari Jan 22, 2025
7a1e86b
also delete fmt metadata
h-vetinari Jan 22, 2025
67a8fc5
only move torch* libraries into `%LIBRARY_{BIN,LIB}%`
h-vetinari Jan 22, 2025
eb8dc6f
Update tests to match new list of installed libs
mgorny Jan 22, 2025
851aae4
move c10/smh to %LIBRARY_PREFIX% as on unix; also asmjit/fbgemm; cons…
h-vetinari Jan 22, 2025
e0e34e3
adapt the way pytorch constructs include paths to $PREFIX/include
h-vetinari Jan 23, 2025
c26c87a
Match Python in build env
mgorny Jan 22, 2025
6355886
fix handling of CUDA libraries on windows
h-vetinari Jan 23, 2025
6c7d83f
add regression test for duplicate `.pyc` files
h-vetinari Jan 23, 2025
eb3c6d0
Revert "DEBUG: build only one python version"
h-vetinari Jan 23, 2025
92b4f30
Merge remote-tracking branch 'upstream/main' into more-win
h-vetinari Jan 23, 2025
1c1ac05
MNT: Re-rendered with conda-build 25.1.1, conda-smithy 3.45.3, and co…
h-vetinari Jan 23, 2025
1c3a925
Revert "pin python in build environment to same version as in host"
h-vetinari Jan 23, 2025
e067df1
Remove TH_BINARY_BUILD
mgorny Jan 23, 2025
6fb1a3e
Remove no-longer-needed libcufile build patch
mgorny Jan 23, 2025
b3b972f
MNT: Re-rendered with conda-build 25.1.1, conda-smithy 3.45.4, and co…
mgorny Jan 25, 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
8 changes: 5 additions & 3 deletions ...forge_maincuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13is_rcFalse.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ is_rc:
libabseil:
- '20240722'
libblas:
- 3.9 *netlib
- 3.9.* *netlib
libcblas:
- 3.9 *netlib
- 3.9.* *netlib
liblapack:
- 3.9 *netlib
- 3.9.* *netlib
libprotobuf:
- 5.28.3
libtorch:
Expand All @@ -54,6 +54,8 @@ numpy:
- '2.0'
- '2'
- '2.0'
orc:
- 2.0.3
pin_run_as_build:
python:
min_pin: x.x
Expand Down
8 changes: 5 additions & 3 deletions ..._maincuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13is_rcFalse.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ is_rc:
libabseil:
- '20240722'
libblas:
- 3.9 *netlib
- 3.9.* *netlib
libcblas:
- 3.9 *netlib
- 3.9.* *netlib
liblapack:
- 3.9 *netlib
- 3.9.* *netlib
libprotobuf:
- 5.28.3
libtorch:
Expand All @@ -54,6 +54,8 @@ numpy:
- '2.0'
- '2'
- '2.0'
orc:
- 2.0.3
pin_run_as_build:
python:
min_pin: x.x
Expand Down
8 changes: 5 additions & 3 deletions ...forge_maincuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13is_rcFalse.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ is_rc:
libabseil:
- '20240722'
libblas:
- 3.9 *netlib
- 3.9.* *netlib
libcblas:
- 3.9 *netlib
- 3.9.* *netlib
liblapack:
- 3.9 *netlib
- 3.9.* *netlib
libprotobuf:
- 5.28.3
libtorch:
Expand All @@ -54,6 +54,8 @@ numpy:
- '2.0'
- '2'
- '2.0'
orc:
- 2.0.3
pin_run_as_build:
python:
min_pin: x.x
Expand Down
8 changes: 5 additions & 3 deletions ..._maincuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13is_rcFalse.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ is_rc:
libabseil:
- '20240722'
libblas:
- 3.9 *netlib
- 3.9.* *netlib
libcblas:
- 3.9 *netlib
- 3.9.* *netlib
liblapack:
- 3.9 *netlib
- 3.9.* *netlib
libprotobuf:
- 5.28.3
libtorch:
Expand All @@ -54,6 +54,8 @@ numpy:
- '2.0'
- '2'
- '2.0'
orc:
- 2.0.3
pin_run_as_build:
python:
min_pin: x.x
Expand Down
8 changes: 5 additions & 3 deletions ...forge_maincuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13is_rcFalse.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ is_rc:
libabseil:
- '20240722'
libblas:
- 3.9 *netlib
- 3.9.* *netlib
libcblas:
- 3.9 *netlib
- 3.9.* *netlib
liblapack:
- 3.9 *netlib
- 3.9.* *netlib
libprotobuf:
- 5.28.3
libtorch:
Expand All @@ -54,6 +54,8 @@ numpy:
- '2.0'
- '2'
- '2.0'
orc:
- 2.0.3
pin_run_as_build:
python:
min_pin: x.x
Expand Down
8 changes: 5 additions & 3 deletions ..._maincuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13is_rcFalse.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ is_rc:
libabseil:
- '20240722'
libblas:
- 3.9 *netlib
- 3.9.* *netlib
libcblas:
- 3.9 *netlib
- 3.9.* *netlib
liblapack:
- 3.9 *netlib
- 3.9.* *netlib
libprotobuf:
- 5.28.3
libtorch:
Expand All @@ -54,6 +54,8 @@ numpy:
- '2.0'
- '2'
- '2.0'
orc:
- 2.0.3
pin_run_as_build:
python:
min_pin: x.x
Expand Down
8 changes: 5 additions & 3 deletions ...s_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.10.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ is_rc:
libabseil:
- '20240722'
libblas:
- 3.9 *netlib
- 3.9.* *netlib
libcblas:
- 3.9 *netlib
- 3.9.* *netlib
liblapack:
- 3.9 *netlib
- 3.9.* *netlib
libprotobuf:
- 5.28.3
libtorch:
Expand All @@ -48,6 +48,8 @@ mkl:
- '2023'
numpy:
- '2.0'
orc:
- 2.0.3
pin_run_as_build:
python:
min_pin: x.x
Expand Down
8 changes: 5 additions & 3 deletions ...s_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.11.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ is_rc:
libabseil:
- '20240722'
libblas:
- 3.9 *netlib
- 3.9.* *netlib
libcblas:
- 3.9 *netlib
- 3.9.* *netlib
liblapack:
- 3.9 *netlib
- 3.9.* *netlib
libprotobuf:
- 5.28.3
libtorch:
Expand All @@ -48,6 +48,8 @@ mkl:
- '2023'
numpy:
- '2.0'
orc:
- 2.0.3
pin_run_as_build:
python:
min_pin: x.x
Expand Down
8 changes: 5 additions & 3 deletions ...s_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.12.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ is_rc:
libabseil:
- '20240722'
libblas:
- 3.9 *netlib
- 3.9.* *netlib
libcblas:
- 3.9 *netlib
- 3.9.* *netlib
liblapack:
- 3.9 *netlib
- 3.9.* *netlib
libprotobuf:
- 5.28.3
libtorch:
Expand All @@ -48,6 +48,8 @@ mkl:
- '2023'
numpy:
- '2.0'
orc:
- 2.0.3
pin_run_as_build:
python:
min_pin: x.x
Expand Down
8 changes: 5 additions & 3 deletions ...as_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.9.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ is_rc:
libabseil:
- '20240722'
libblas:
- 3.9 *netlib
- 3.9.* *netlib
libcblas:
- 3.9 *netlib
- 3.9.* *netlib
liblapack:
- 3.9 *netlib
- 3.9.* *netlib
libprotobuf:
- 5.28.3
libtorch:
Expand All @@ -48,6 +48,8 @@ mkl:
- '2023'
numpy:
- '2.0'
orc:
- 2.0.3
pin_run_as_build:
python:
min_pin: x.x
Expand Down
8 changes: 5 additions & 3 deletions ..._blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2python3.13.____cp313.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ is_rc:
libabseil:
- '20240722'
libblas:
- 3.9 *netlib
- 3.9.* *netlib
libcblas:
- 3.9 *netlib
- 3.9.* *netlib
liblapack:
- 3.9 *netlib
- 3.9.* *netlib
libprotobuf:
- 5.28.3
libtorch:
Expand All @@ -48,6 +48,8 @@ mkl:
- '2023'
numpy:
- '2'
orc:
- 2.0.3
pin_run_as_build:
python:
min_pin: x.x
Expand Down
8 changes: 5 additions & 3 deletions ..._blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.10.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ is_rc:
libabseil:
- '20240722'
libblas:
- 3.9 *netlib
- 3.9.* *netlib
libcblas:
- 3.9 *netlib
- 3.9.* *netlib
liblapack:
- 3.9 *netlib
- 3.9.* *netlib
libprotobuf:
- 5.28.3
libtorch:
Expand All @@ -48,6 +48,8 @@ mkl:
- '2023'
numpy:
- '2.0'
orc:
- 2.0.3
pin_run_as_build:
python:
min_pin: x.x
Expand Down
8 changes: 5 additions & 3 deletions ..._blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.11.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ is_rc:
libabseil:
- '20240722'
libblas:
- 3.9 *netlib
- 3.9.* *netlib
libcblas:
- 3.9 *netlib
- 3.9.* *netlib
liblapack:
- 3.9 *netlib
- 3.9.* *netlib
libprotobuf:
- 5.28.3
libtorch:
Expand All @@ -48,6 +48,8 @@ mkl:
- '2023'
numpy:
- '2.0'
orc:
- 2.0.3
pin_run_as_build:
python:
min_pin: x.x
Expand Down
8 changes: 5 additions & 3 deletions ..._blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.12.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ is_rc:
libabseil:
- '20240722'
libblas:
- 3.9 *netlib
- 3.9.* *netlib
libcblas:
- 3.9 *netlib
- 3.9.* *netlib
liblapack:
- 3.9 *netlib
- 3.9.* *netlib
libprotobuf:
- 5.28.3
libtorch:
Expand All @@ -48,6 +48,8 @@ mkl:
- '2023'
numpy:
- '2.0'
orc:
- 2.0.3
pin_run_as_build:
python:
min_pin: x.x
Expand Down
8 changes: 5 additions & 3 deletions ...4_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.9.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ is_rc:
libabseil:
- '20240722'
libblas:
- 3.9 *netlib
- 3.9.* *netlib
libcblas:
- 3.9 *netlib
- 3.9.* *netlib
liblapack:
- 3.9 *netlib
- 3.9.* *netlib
libprotobuf:
- 5.28.3
libtorch:
Expand All @@ -48,6 +48,8 @@ mkl:
- '2023'
numpy:
- '2.0'
orc:
- 2.0.3
pin_run_as_build:
python:
min_pin: x.x
Expand Down
8 changes: 5 additions & 3 deletions ...x_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2python3.13.____cp313.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ is_rc:
libabseil:
- '20240722'
libblas:
- 3.9 *netlib
- 3.9.* *netlib
libcblas:
- 3.9 *netlib
- 3.9.* *netlib
liblapack:
- 3.9 *netlib
- 3.9.* *netlib
libprotobuf:
- 5.28.3
libtorch:
Expand All @@ -48,6 +48,8 @@ mkl:
- '2023'
numpy:
- '2'
orc:
- 2.0.3
pin_run_as_build:
python:
min_pin: x.x
Expand Down
Loading