Skip to content

Bump version and simplify patches #61

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

Merged
h-vetinari merged 10 commits into from
Aug 2, 2025
Merged

Bump version and simplify patches #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a90d41f
Bump version and simplify patches
mmcauliffe Jul 30, 2025
398a39b
Working locally on windows
mmcauliffe Jul 30, 2025
5b17b45
Update patch for regex issue
mmcauliffe Jul 30, 2025
02e0c11
Update meta yaml for cuda issues
mmcauliffe Jul 30, 2025
e5a017e
Change build script to follow torchaudio
mmcauliffe Jul 30, 2025
2fa0496
Add debugging for missing libnvToolsExt.so
mmcauliffe Jul 30, 2025
12de43e
Revert changes to build.sh
mmcauliffe Aug 1, 2025
39a0e21
fix guard for CUDA deps
h-vetinari Aug 2, 2025
41568d3
fix condition that only exists to shut up linter
h-vetinari Aug 2, 2025
6932d02
Clean up debugging and unused patches
mmcauliffe Aug 2, 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
30 changes: 13 additions & 17 deletions .azure-pipelines/azure-pipelines-linux.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .azure-pipelines/azure-pipelines-osx.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 5 additions & 8 deletions .azure-pipelines/azure-pipelines-win.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions ..._version13fortran_compiler_version13.yaml → ..._version13fortran_compiler_version13.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@ target_platform:
zip_keys:
- - cxx_compiler_version
- fortran_compiler_version
- cuda_compiler
- cuda_compiler_version
- docker_image
zlib:
- '1'
8 changes: 3 additions & 5 deletions ..._version13fortran_compiler_version13.yaml → ..._version14fortran_compiler_version14.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,19 @@ channel_sources:
channel_targets:
- conda-forge main
cuda_compiler:
- None
- cuda-nvcc
cuda_compiler_version:
- None
cxx_compiler:
- gxx
cxx_compiler_version:
- '13'
- '14'
docker_image:
- quay.io/condaforge/linux-anvil-x86_64:alma9
fortran_compiler:
- gfortran
fortran_compiler_version:
- '13'
- '14'
icu:
- '75'
libblas:
Expand All @@ -39,8 +39,6 @@ target_platform:
zip_keys:
- - cxx_compiler_version
- fortran_compiler_version
- cuda_compiler
- cuda_compiler_version
- docker_image
zlib:
- '1'
46 changes: 0 additions & 46 deletions ...ompilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11.yaml
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions ..._version13fortran_compiler_version13.yaml → ..._version13fortran_compiler_version13.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@ target_platform:
zip_keys:
- - cxx_compiler_version
- fortran_compiler_version
- cuda_compiler
- cuda_compiler_version
- docker_image
zlib:
- '1'
8 changes: 3 additions & 5 deletions ..._version13fortran_compiler_version13.yaml → ..._version14fortran_compiler_version14.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,19 @@ channel_sources:
channel_targets:
- conda-forge main
cuda_compiler:
- None
- cuda-nvcc
cuda_compiler_version:
- None
cxx_compiler:
- gxx
cxx_compiler_version:
- '13'
- '14'
docker_image:
- quay.io/condaforge/linux-anvil-x86_64:alma9
fortran_compiler:
- gfortran
fortran_compiler_version:
- '13'
- '14'
icu:
- '75'
libblas:
Expand All @@ -39,8 +39,6 @@ target_platform:
zip_keys:
- - cxx_compiler_version
- fortran_compiler_version
- cuda_compiler
- cuda_compiler_version
- docker_image
zlib:
- '1'
2 changes: 0 additions & 2 deletions ..._version12fortran_compiler_version12.yaml → ..._version12fortran_compiler_version12.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@ target_platform:
zip_keys:
- - cxx_compiler_version
- fortran_compiler_version
- cuda_compiler
- cuda_compiler_version
- docker_image
zlib:
- '1'
8 changes: 3 additions & 5 deletions ..._version13fortran_compiler_version13.yaml → ..._version14fortran_compiler_version14.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,19 @@ channel_sources:
channel_targets:
- conda-forge main
cuda_compiler:
- None
- cuda-nvcc
cuda_compiler_version:
- None
cxx_compiler:
- gxx
cxx_compiler_version:
- '13'
- '14'
docker_image:
- quay.io/condaforge/linux-anvil-x86_64:alma9
fortran_compiler:
- gfortran
fortran_compiler_version:
- '13'
- '14'
icu:
- '75'
libblas:
Expand All @@ -39,8 +39,6 @@ target_platform:
zip_keys:
- - cxx_compiler_version
- fortran_compiler_version
- cuda_compiler
- cuda_compiler_version
- docker_image
zlib:
- '1'
6 changes: 3 additions & 3 deletions .ci_support/osx_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@ channel_sources:
channel_targets:
- conda-forge main
cuda_compiler:
- None
- cuda-nvcc
cuda_compiler_version:
- None
cxx_compiler:
- clangxx
cxx_compiler_version:
- '18'
- '19'
fortran_compiler:
- gfortran
fortran_compiler_version:
- '13'
- '14'
icu:
- '75'
libblas:
Expand Down
6 changes: 3 additions & 3 deletions .ci_support/osx_arm64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@ channel_sources:
channel_targets:
- conda-forge main
cuda_compiler:
- None
- cuda-nvcc
cuda_compiler_version:
- None
cxx_compiler:
- clangxx
cxx_compiler_version:
- '18'
- '19'
fortran_compiler:
- gfortran
fortran_compiler_version:
- '13'
- '14'
icu:
- '75'
libblas:
Expand Down
5 changes: 1 addition & 4 deletions ...ercuda-nvcccuda_compiler_version12.6.yaml → ...ort/win_64_cuda_compiler_version12.6.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ cuda_compiler:
cuda_compiler_version:
- '12.6'
cxx_compiler:
- vs2019
- vs2022
fortran_compiler:
- flang
fortran_compiler_version:
Expand All @@ -28,8 +28,5 @@ magma:
- '2.9'
target_platform:
- win-64
zip_keys:
- - cuda_compiler
- cuda_compiler_version
zlib:
- '1'
7 changes: 2 additions & 5 deletions ...ompilerNonecuda_compiler_versionNone.yaml → ...ort/win_64_cuda_compiler_versionNone.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ channel_sources:
channel_targets:
- conda-forge main
cuda_compiler:
- None
- cuda-nvcc
cuda_compiler_version:
- None
cxx_compiler:
- vs2019
- vs2022
fortran_compiler:
- flang
fortran_compiler_version:
Expand All @@ -28,8 +28,5 @@ magma:
- '2.9'
target_platform:
- win-64
zip_keys:
- - cuda_compiler
- cuda_compiler_version
zlib:
- '1'
35 changes: 0 additions & 35 deletions .ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8.yaml
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions .gitattributes
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .scripts/build_steps.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .scripts/run_docker_build.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading