Skip to content

Commit

Permalink
Merge pull request #64 from jaimergp/expand-matrix
Browse files Browse the repository at this point in the history
expand matrix to cover 9.2-11.2
  • Loading branch information
Keith Kraus authored Feb 17, 2021
2 parents 2940033 + 74122a1 commit bb1b25f
Show file tree
Hide file tree
Showing 10 changed files with 228 additions and 91 deletions.
12 changes: 12 additions & 0 deletions .azure-pipelines/azure-pipelines-linux.yml

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

6 changes: 6 additions & 0 deletions .azure-pipelines/azure-pipelines-win.yml

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

28 changes: 28 additions & 0 deletions .ci_support/linux_64_cuda_compiler_version10.0.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
c_compiler:
- gcc
c_compiler_version:
- '7'
cdt_name:
- cos6
channel_sources:
- conda-forge,defaults
channel_targets:
- conda-forge main
cuda_compiler:
- nvcc
cuda_compiler_version:
- '10.0'
cxx_compiler:
- gxx
cxx_compiler_version:
- '7'
docker_image:
- quay.io/condaforge/linux-anvil-cuda:10.0
target_platform:
- linux-64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - cdt_name
- cuda_compiler_version
- docker_image
28 changes: 28 additions & 0 deletions .ci_support/linux_64_cuda_compiler_version10.1.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
c_compiler:
- gcc
c_compiler_version:
- '7'
cdt_name:
- cos6
channel_sources:
- conda-forge,defaults
channel_targets:
- conda-forge main
cuda_compiler:
- nvcc
cuda_compiler_version:
- '10.1'
cxx_compiler:
- gxx
cxx_compiler_version:
- '7'
docker_image:
- quay.io/condaforge/linux-anvil-cuda:10.1
target_platform:
- linux-64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - cdt_name
- cuda_compiler_version
- docker_image
28 changes: 28 additions & 0 deletions .ci_support/linux_64_cuda_compiler_version9.2.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
c_compiler:
- gcc
c_compiler_version:
- '7'
cdt_name:
- cos6
channel_sources:
- conda-forge,defaults
channel_targets:
- conda-forge main
cuda_compiler:
- nvcc
cuda_compiler_version:
- '9.2'
cxx_compiler:
- gxx
cxx_compiler_version:
- '7'
docker_image:
- quay.io/condaforge/linux-anvil-cuda:9.2
target_platform:
- linux-64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - cdt_name
- cuda_compiler_version
- docker_image
91 changes: 0 additions & 91 deletions .ci_support/migrations/cuda111_112.yaml

This file was deleted.

14 changes: 14 additions & 0 deletions .ci_support/win_64_cuda_compiler_version10.0.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
c_compiler:
- vs2017
channel_sources:
- conda-forge,defaults
channel_targets:
- conda-forge main
cuda_compiler:
- nvcc
cuda_compiler_version:
- '10.0'
cxx_compiler:
- vs2017
target_platform:
- win-64
14 changes: 14 additions & 0 deletions .ci_support/win_64_cuda_compiler_version10.1.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
c_compiler:
- vs2017
channel_sources:
- conda-forge,defaults
channel_targets:
- conda-forge main
cuda_compiler:
- nvcc
cuda_compiler_version:
- '10.1'
cxx_compiler:
- vs2017
target_platform:
- win-64
35 changes: 35 additions & 0 deletions README.md

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

63 changes: 63 additions & 0 deletions recipe/conda_build_config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
# When adding or removing cuda versions, make sure that the following entries are "zipped";
# e.g. each entry in cuda_compiler_version must have a matching entry in the other keys,
# considering the effect of the selector:
# cuda_compiler_version
# cudnn
# cdt_name
# docker_image

cuda_compiler_version:
- None

- 9.2 # [linux64]
- 10.0 # [linux64 or win]
- 10.1 # [linux64 or win]
- 10.2 # [linux64 or win]
- 11.0 # [linux64 or win]
- 11.1 # [linux64 or win]
- 11.2 # [linux64 or win]

docker_image: # [os.environ.get("BUILD_PLATFORM", "").startswith("linux-")]
# start cuda_compiler_version == None
- 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"]
# end of cuda_compiler_version == None

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

cudnn:
# start for cuda_compiler_version == None
- undefined
# end of cuda_compiler_version == None

- 7 # [linux64] # CUDA 9.2
- 7 # [linux64 or win] # CUDA 10.0
- 7 # [linux64 or win] # CUDA 10.1
- 7 # [linux64 or win] # CUDA 10.2
- 8 # [linux64 or win] # CUDA 11.0
- 8 # [linux64 or win] # CUDA 11.1
- 8 # [linux64 or win] # CUDA 11.2

cdt_name: # [linux]
# start cuda_compiler_version == None
- cos6 # [linux64]
- cos7 # [linux and aarch64]
- cos7 # [linux and ppc64le]
- cos7 # [linux and armv7l]
# end of cuda_compiler_version == None

- cos6 # [linux64] # CUDA 9.2
- cos6 # [linux64] # CUDA 10.0
- cos6 # [linux64] # CUDA 10.1
- cos6 # [linux64] # CUDA 10.2
- cos7 # [linux64] # CUDA 11.0
- cos7 # [linux64] # CUDA 11.1
- cos7 # [linux64] # CUDA 11.2

0 comments on commit bb1b25f

Please sign in to comment.