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

Rebuild for CUDA 12 #19

Merged
merged 10 commits into from
Jun 8, 2023
Merged

Rebuild for CUDA 12 #19

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
e340f44
Rebuild for CUDA 12
regro-cf-autotick-bot Jun 1, 2023
58784a3
MNT: Re-rendered with conda-build 3.25.0, conda-smithy 3.23.1, and co…
regro-cf-autotick-bot Jun 1, 2023
911ca11
Add CUDA12 libs to dependencies
carterbox Jun 7, 2023
b1d72bf
Build for all archs automatically
carterbox Jun 7, 2023
e8062bd
MNT: Re-rendered with conda-build 3.25.0, conda-smithy 3.23.1, and co…
Jun 7, 2023
91ee1f9
Use Ninja for all platforms
carterbox Jun 7, 2023
b40b013
Verbose logs
carterbox Jun 7, 2023
b06408f
Update bld.bat
carterbox Jun 7, 2023
fea6164
Move windows test
carterbox Jun 7, 2023
12303b4
MNT: Re-rendered with conda-build 3.25.0, conda-smithy 3.23.1, and co…
Jun 7, 2023
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
60 changes: 30 additions & 30 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.

38 changes: 21 additions & 17 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.

5 changes: 3 additions & 2 deletions ...er_versionNonecxx_compiler_version10.yaml → ...er_versionNonecxx_compiler_version12.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ channel_sources:
channel_targets:
- conda-forge main
cuda_compiler:
- nvcc
- None
cuda_compiler_version:
- None
cxx_compiler:
- gxx
cxx_compiler_version:
- '10'
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
pin_run_as_build:
Expand All @@ -23,6 +23,7 @@ target_platform:
- linux-64
zip_keys:
- - cxx_compiler_version
- cuda_compiler
- cuda_compiler_version
- cdt_name
- docker_image
1 change: 1 addition & 0 deletions ...ler_version10.2cxx_compiler_version7.yaml → ...ler_version10.2cxx_compiler_version7.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ target_platform:
- linux-64
zip_keys:
- - cxx_compiler_version
- cuda_compiler
- cuda_compiler_version
- cdt_name
- docker_image
1 change: 1 addition & 0 deletions ...ler_version11.0cxx_compiler_version9.yaml → ...ler_version11.0cxx_compiler_version9.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ target_platform:
- linux-64
zip_keys:
- - cxx_compiler_version
- cuda_compiler
- cuda_compiler_version
- cdt_name
- docker_image
1 change: 1 addition & 0 deletions ...er_version11.1cxx_compiler_version10.yaml → ...er_version11.1cxx_compiler_version10.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ target_platform:
- linux-64
zip_keys:
- - cxx_compiler_version
- cuda_compiler
- cuda_compiler_version
- cdt_name
- docker_image
1 change: 1 addition & 0 deletions ...er_version11.2cxx_compiler_version10.yaml → ...er_version11.2cxx_compiler_version10.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ target_platform:
- linux-64
zip_keys:
- - cxx_compiler_version
- cuda_compiler
- cuda_compiler_version
- cdt_name
- docker_image
5 changes: 3 additions & 2 deletions ...ux_aarch64_cuda_compiler_versionNone.yaml → ...er_versionNonecxx_compiler_version12.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ channel_sources:
channel_targets:
- conda-forge main
cuda_compiler:
- nvcc
- None
cuda_compiler_version:
- None
cxx_compiler:
- gxx
cxx_compiler_version:
- '10'
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-aarch64
pin_run_as_build:
Expand All @@ -27,6 +27,7 @@ target_platform:
- linux-aarch64
zip_keys:
- - cxx_compiler_version
- cuda_compiler
- cuda_compiler_version
- cdt_name
- docker_image
1 change: 1 addition & 0 deletions ...ux_aarch64_cuda_compiler_version11.2.yaml → ...er_version11.2cxx_compiler_version10.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ target_platform:
- linux-aarch64
zip_keys:
- - cxx_compiler_version
- cuda_compiler
- cuda_compiler_version
- cdt_name
- docker_image
1 change: 1 addition & 0 deletions ...ux_ppc64le_cuda_compiler_version11.2.yaml → ...er_version11.2cxx_compiler_version10.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ target_platform:
- linux-ppc64le
zip_keys:
- - cxx_compiler_version
- cuda_compiler
- cuda_compiler_version
- cdt_name
- docker_image
5 changes: 3 additions & 2 deletions ...ux_ppc64le_cuda_compiler_versionNone.yaml → ...er_versionNonecxx_compiler_version12.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ channel_sources:
channel_targets:
- conda-forge main
cuda_compiler:
- nvcc
- None
cuda_compiler_version:
- None
cxx_compiler:
- gxx
cxx_compiler_version:
- '10'
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-ppc64le
pin_run_as_build:
Expand All @@ -23,6 +23,7 @@ target_platform:
- linux-ppc64le
zip_keys:
- - cxx_compiler_version
- cuda_compiler
- cuda_compiler_version
- cdt_name
- docker_image
9 changes: 0 additions & 9 deletions .ci_support/migrations/boost1780.yaml
View file
Open in desktop

This file was deleted.

72 changes: 72 additions & 0 deletions .ci_support/migrations/cuda120.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
migrator_ts: 1682985063
__migrator:
kind:
version
migration_number:
1
build_number:
1
paused: false
override_cbc_keys:
- cuda_compiler_stub
operation: key_add
check_solvable: false
primary_key: cuda_compiler_version
ordering:
cxx_compiler_version:
- 9
- 8
- 7
c_compiler_version:
- 9
- 8
- 7
fortran_compiler_version:
- 9
- 8
- 7
docker_image:
- quay.io/condaforge/linux-anvil-comp7 # [os.environ.get("BUILD_PLATFORM") == "linux-64"]
- quay.io/condaforge/linux-anvil-aarch64 # [os.environ.get("BUILD_PLATFORM") == "linux-aarch64"]
- quay.io/condaforge/linux-anvil-ppc64le # [os.environ.get("BUILD_PLATFORM") == "linux-ppc64le"]
- quay.io/condaforge/linux-anvil-armv7l # [os.environ.get("BUILD_PLATFORM") == "linux-armv7l"]
- quay.io/condaforge/linux-anvil-cuda:9.2 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"]
- quay.io/condaforge/linux-anvil-cuda:10.0 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"]
- quay.io/condaforge/linux-anvil-cuda:10.1 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"]
- quay.io/condaforge/linux-anvil-cuda:10.2 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"]
- quay.io/condaforge/linux-anvil-cuda:11.0 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"]
- quay.io/condaforge/linux-anvil-cuda:11.1 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"]
- quay.io/condaforge/linux-anvil-cuda:11.2 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"]
- quay.io/condaforge/linux-anvil-cos7-x86_64 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"]
cuda_compiler_version:
- None
- 10.2 # [(linux64 or win) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- 11.0 # [(linux64 or win) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- 11.1 # [(linux64 or win) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- 11.2 # [(linux64 or win) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- 12.0 # [(linux64 or win) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
commit_message: "Rebuild for CUDA 12"

cuda_compiler: # [linux64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- cuda-nvcc # [linux64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]

cuda_compiler_version: # [linux64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- 12.0 # [linux64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]

c_compiler_version: # [linux64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- 12 # [linux64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]

cxx_compiler_version: # [linux64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- 12 # [linux64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]

fortran_compiler_version: # [linux64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- 12 # [linux64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]

cudnn: # [linux64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- 8 # [linux64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]

cdt_name: # [linux64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- cos7 # [linux64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]

docker_image: # [os.environ.get("BUILD_PLATFORM", "").startswith("linux-") and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- quay.io/condaforge/linux-anvil-cos7-x86_64 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64" and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
2 changes: 1 addition & 1 deletion .ci_support/osx_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ cuda_compiler_version:
cxx_compiler:
- clangxx
cxx_compiler_version:
- '14'
- '15'
macos_machine:
- x86_64-apple-darwin13.4.0
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ cuda_compiler_version:
cxx_compiler:
- clangxx
cxx_compiler_version:
- '14'
- '15'
macos_machine:
- arm64-apple-darwin20.0.0
pin_run_as_build:
Expand Down
5 changes: 4 additions & 1 deletion ...ort/win_64_cuda_compiler_versionNone.yaml → ...ompilerNonecuda_compiler_versionNone.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ channel_sources:
channel_targets:
- conda-forge main
cuda_compiler:
- nvcc
- None
cuda_compiler_version:
- None
cxx_compiler:
Expand All @@ -15,3 +15,6 @@ pin_run_as_build:
max_pin: x.x.x
target_platform:
- win-64
zip_keys:
- - cuda_compiler
- cuda_compiler_version
3 changes: 3 additions & 0 deletions ...ort/win_64_cuda_compiler_version10.2.yaml → ...ompilernvcccuda_compiler_version10.2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,6 @@ pin_run_as_build:
max_pin: x.x.x
target_platform:
- win-64
zip_keys:
- - cuda_compiler
- cuda_compiler_version
Loading