Skip to content

Commit

Permalink
Merge pull request #19 from regro-cf-autotick-bot/rebuild-cuda120-0-1…
Browse files Browse the repository at this point in the history 
…_h8540ee

Rebuild for CUDA 12
  • Loading branch information
@carterbox
carterbox authored Jun 8, 2023
2 parents d2ec72b + 12303b4 commit 29a2a54
Show file tree
Hide file tree
Showing 30 changed files with 244 additions and 137 deletions.
60 changes: 30 additions & 30 deletions .azure-pipelines/azure-pipelines-linux.yml
View file

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

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
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
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
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
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
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
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
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
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
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

This file was deleted.

72 changes: 72 additions & 0 deletions .ci_support/migrations/cuda120.yaml
View file
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
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
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
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
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

0 comments on commit 29a2a54

Please sign in to comment.