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

Jump to bottom

Sync with conda-forge v2.5.1 b1 skip CI #49

Merged
merged 634 commits into from
Jan 13, 2025
Merged

Sync with conda-forge v2.5.1 b1 skip CI #49

merged 634 commits into from
Jan 13, 2025

Conversation

danpetry
Copy link
Contributor

@danpetry danpetry commented Dec 18, 2024 •
edited
Loading

Destination channel: none

Links

Explanation of changes:

  • syncs with conda-forge v2.5.1 b1. Note that this is not the latest v2.5.1 in the recipe, but upstream is under constant development, and pulling/rebasing/re-debugging this recipe isn't worth it, given the new additions upstream which are non-critical and mostly cuda related.
  • Additional changes on top of this for our use in a separate PR.
  • Changes here include:
    • separation of libtorch and the different python variants to save building time
    • nonfunctional changes to layout of build scripts
    • various changes in build configuration and dependencies, which have been carefully reviewed and kept or dropped according to suitability for us in the separate PR

RaulPPelaez and others added 30 commits October 25, 2023 13:26
@RaulPPelaez
Add archs for CUDA 12
c8a0f99
@RaulPPelaez
Add archs for CUDA 11.8
096a663
MNT: Re-rendered with conda-build 3.27.0, conda-smithy 3.27.1, and co…
a46b0ca 
…nda-forge-pinning 2023.10.23.08.51.53
@RaulPPelaez
Install cuda-libraries-dev if cuda version is 12
5318120
@RaulPPelaez
Fix CUDA 12 detection
70e2f97
@RaulPPelaez
Add archs for CUDA 11.8 and CUDA 12.0 to build_pytorch.sh
2b3578f
MNT: Re-rendered with conda-build 3.27.0, conda-smithy 3.27.1, and co…
f261952 
…nda-forge-pinning 2023.10.23.08.51.53
@RaulPPelaez
Add CUDA libraries
0c908ec
@RaulPPelaez
Add CUDA libraries to host too
038a2b8
@RaulPPelaez
Lint
337c6b8
@RaulPPelaez
Remove unused USE_NINJA
dd9a64a
@RaulPPelaez
Guard cuda_version
1e6e208
@RaulPPelaez
Add cuda-nvml
c67dd74
@RaulPPelaez @jakirkham
Update recipe/meta.yaml
06c2d68 
Co-authored-by: jakirkham <jakirkham@gmail.com>
@RaulPPelaez
Merge branch 'rebuild-cuda120-0-2_hdbc077' into rebuild-cuda118-0-1_h…
1f2a95f 
…58afc5
MNT: Re-rendered with conda-build 3.27.0, conda-smithy 3.27.1, and co…
9ba39b2 
…nda-forge-pinning 2023.10.30.17.31.54
@hmaarrfk
Add libprotobuf migration
3541ffc
@hmaarrfk
MNT: Re-rendered with conda-build 3.27.0, conda-smithy 3.27.1, and co…
cd4bbb4 
…nda-forge-pinning 2023.11.02.10.11.59
@hmaarrfk
Merge pull request #195 from RaulPPelaez/rebuild-cuda118-0-1_h58afc5
8659210 
Rebuild cuda118, cuda1120, and protobuf
@hmaarrfk
Try to update to 2.1.0
5ca4055
@hmaarrfk
Remove a file I accidentally added
5691492
@RaulPPelaez @hmaarrfk
Patch CUDACachingAllocator to use correct NVML function name
38d0d1e
@regro-cf-autotick-bot @hmaarrfk
Rebuild for python312
86a690b
@hmaarrfk
MNT: Re-rendered with conda-build 3.27.0, conda-smithy 3.27.1, and co…
71aa6c3 
…nda-forge-pinning 2023.11.02.10.11.59
@hmaarrfk
Skip linux on azure manually
a8e8a92
@hmaarrfk
Update my all.sh script
120d9c6
@hmaarrfk
Effectively disable linux builds
29a56db
@hmaarrfk
MNT: Re-rendered with conda-build 3.27.0, conda-smithy 3.27.1, and co…
f0dba59 
…nda-forge-pinning 2023.11.06.18.45.06
@hmaarrfk
Merge pull request #199 from hmaarrfk/update_2.1.0
dc47045 
Try to update to 2.1.0 and python 3.12
@hmaarrfk
Skip some stuff try to rebuild CUDA 12.0
2986a76
hmaarrfk and others added 22 commits October 9, 2024 12:21
@hmaarrfk
small mistakes.
ff54f0a
MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.41.1, and co…
1464783 
…nda-forge-pinning 2024.10.09.15.49.38
@hmaarrfk
cleanup
9526953
@hmaarrfk
Merge pull request #265 from regro-cf-autotick-bot/rebuild-libabseil2…
c44ef01 
…0240722_grpc165_libprotobuf5275-0-1_hfb9817

Rebuild for libabseil 20240722, libgrp 1.65 & libprotobuf 5.27.5
@carterbox
BUG: Add missing dep on setuptools for python>=3.12
cc5beb3 
pytorch/pytorch@d636898
Closes conda-forge/pytorch-cpu-feedstock#274
@carterbox
Update build number
5db7130
MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.42.2, and co…
23dea4f 
…nda-forge-pinning 2024.10.15.15.47.23
@hmaarrfk
Merge pull request #276 from carterbox/missing-setuptools
3b8d6fc 
BUG: Add missing dep on setuptools for python>=3.12
@regro-cf-autotick-bot
Rebuild for libgrpc 1.67 & libprotobuf 5.28.2
0262d6f
@regro-cf-autotick-bot
MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.43.0, and co…
7fa0475 
…nda-forge-pinning 2024.10.23.12.29.09
@h-vetinari
trigger CI
5c256d5
@hmaarrfk
Merge pull request #279 from regro-cf-autotick-bot/rebuild-libgrpc167…
44041ee 
…_libprotobuf5282-0-1_h71d96b

Rebuild for libgrpc 1.67 & libprotobuf 5.28.2
@jeongseok-meta @hmaarrfk
Update pytorch version to 2.5.1
584943d 
Co-authored-by: Mark Harfouche <mark.harfouche@gmail.com>
@jeongseok-meta
Fix duplicate linker script
978c35e
@jeongseok-meta
MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.43.2, and co…
f0df7dc 
…nda-forge-pinning 2024.11.01.21.49.52
@hmaarrfk
Merge pull request #277 from jeongseok-meta/pytorch_250
494d890 
PyTorch 2.5.1
@jeongseok-meta @hmaarrfk
Build with CUDA 12.6
7926f5a 
Co-authored-by: Mark Harfouche <mark.harfouche@gmail.com>
@jeongseok-meta
MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.43.2, and co…
4df1cc6 
…nda-forge-pinning 2024.11.01.21.49.52
@jeongseok-meta
Add aarch64 + cuda126
c11721d
@jeongseok-meta
MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.43.2, and co…
dc57d04 
…nda-forge-pinning 2024.11.03.21.31.08
@hmaarrfk
Merge pull request #271 from jeongseok-meta/cuda122
611bc61 
Build with CUDA 12.6
@danpetry
Merge branch 'master' into dpetry/conda-forge-sync
774d961
@danpetry danpetry force-pushed the dpetry/conda-forge-sync branch from c27e5ee to 774d961 Compare December 18, 2024 17:48
@danpetry danpetry mentioned this pull request Dec 18, 2024
Merged
@danpetry
Copy link
Contributor Author

danpetry commented Jan 7, 2025

thanks, will merge when the other one is approved so master isn't in a broken state

@danpetry danpetry merged commit 10e0781 into master Jan 13, 2025
1 of 23 checks passed
@danpetry danpetry deleted the dpetry/conda-forge-sync branch January 13, 2025 22:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ELundby45 ELundby45 ELundby45 approved these changes

@cbouss cbouss cbouss approved these changes

@bwingconda bwingconda bwingconda approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.