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.

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

Add aarch64 #70

Merged
merged 5 commits into from
Sep 29, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 13 additions & 1 deletion .azure-pipelines/azure-pipelines-linux.yml

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-win.yml

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

Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
BUILD:
- aarch64-conda_cos7-linux-gnu
c_compiler:
- gcc
c_compiler_version:
- '8'
cdt_arch:
- aarch64
cdt_name:
- cos8
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cuda_compiler:
- nvcc
cuda_compiler_version:
- '11.0'
cxx_compiler:
- gxx
cxx_compiler_version:
- '8'
docker_image:
- quay.io/condaforge/linux-anvil-aarch64-cuda:11.0
target_platform:
- linux-aarch64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - cuda_compiler_version
- cdt_name
- docker_image
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
BUILD:
- aarch64-conda_cos7-linux-gnu
c_compiler:
- gcc
c_compiler_version:
- '8'
cdt_arch:
- aarch64
cdt_name:
- cos8
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cuda_compiler:
- nvcc
cuda_compiler_version:
- '11.1'
cxx_compiler:
- gxx
cxx_compiler_version:
- '8'
docker_image:
- quay.io/condaforge/linux-anvil-aarch64-cuda:11.1
target_platform:
- linux-aarch64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - cuda_compiler_version
- cdt_name
- docker_image
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
BUILD:
- aarch64-conda_cos7-linux-gnu
c_compiler:
- gcc
c_compiler_version:
- '8'
cdt_arch:
- aarch64
cdt_name:
- cos8
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cuda_compiler:
- nvcc
cuda_compiler_version:
- '11.2'
cxx_compiler:
- gxx
cxx_compiler_version:
- '8'
docker_image:
- quay.io/condaforge/linux-anvil-aarch64-cuda:11.2
target_platform:
- linux-aarch64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - cuda_compiler_version
- cdt_name
- docker_image
2 changes: 1 addition & 1 deletion .github/CODEOWNERS

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

22 changes: 22 additions & 0 deletions README.md

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

2 changes: 1 addition & 1 deletion conda-forge.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
conda_forge_output_validation: true
provider: {linux_ppc64le: azure}
provider: {linux_ppc64le: azure, linux_aarch64: azure}
39 changes: 28 additions & 11 deletions recipe/conda_build_config.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
arm_variant_type: # [aarch64]
- sbsa # [aarch64]

# 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,
Expand All @@ -8,14 +10,15 @@
# docker_image

zip_keys:
- - cuda_compiler_version # [linux64 or (linux and ppc64le)]
- cdt_name # [linux64 or (linux and ppc64le)]
- - cuda_compiler_version # [linux64 or (linux and ppc64le) or (linux and aarch64)]
- cdt_name # [linux64 or (linux and ppc64le) or (linux and aarch64)]
- docker_image # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"]
- docker_image # [linux and ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-ppc64le"]
- cudnn # [linux64 or (linux and ppc64le)]
- docker_image # [linux and aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-aarch64"]
- cudnn # [linux64 or (linux and ppc64le) or (linux and aarch64)]

cuda_compiler: # [linux64 or win or (linux and ppc64le)]
- nvcc # [linux64 or win or (linux and ppc64le)]
cuda_compiler: # [linux64 or win or (linux and ppc64le) or (linux and aarch64)]
- nvcc # [linux64 or win or (linux and ppc64le) or (linux and aarch64)]

cuda_compiler_version:
- None
Expand All @@ -24,17 +27,19 @@ cuda_compiler_version:
- 10.0 # [linux64 or win]
- 10.1 # [linux64 or win]
- 10.2 # [linux64 or win or (linux and ppc64le)]
- 11.0 # [linux64 or win or (linux and ppc64le)]
- 11.1 # [linux64 or win or (linux and ppc64le)]
- 11.2 # [linux64 or win or (linux and ppc64le)]
- 11.0 # [linux64 or win or (linux and ppc64le) or (linux and aarch64)]
- 11.1 # [linux64 or win or (linux and ppc64le) or (linux and aarch64)]
- 11.2 # [linux64 or win or (linux and ppc64le) or (linux and aarch64)]

c_compiler_version: # [os.environ.get("BUILD_PLATFORM", "").startswith(("linux-64", "linux-ppc64le"))]
c_compiler_version: # [os.environ.get("BUILD_PLATFORM", "").startswith("linux")]
- 7 # [os.environ.get("BUILD_PLATFORM") == "linux-64"]
- 8 # [os.environ.get("BUILD_PLATFORM") == "linux-ppc64le"]
- 8 # [os.environ.get("BUILD_PLATFORM") == "linux-aarch64"]

cxx_compiler_version: # [os.environ.get("BUILD_PLATFORM", "").startswith(("linux-64", "linux-ppc64le"))]
cxx_compiler_version: # [os.environ.get("BUILD_PLATFORM", "").startswith("linux")]
- 7 # [os.environ.get("BUILD_PLATFORM") == "linux-64"]
- 8 # [os.environ.get("BUILD_PLATFORM") == "linux-ppc64le"]
- 8 # [os.environ.get("BUILD_PLATFORM") == "linux-aarch64"]

docker_image: # [os.environ.get("BUILD_PLATFORM", "").startswith("linux-")]
# start cuda_compiler_version == None
Expand All @@ -57,6 +62,10 @@ docker_image: # [os.environ.get("BUILD_PLATFOR
- quay.io/condaforge/linux-anvil-ppc64le-cuda:11.1 # [linux and ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-ppc64le"]
- quay.io/condaforge/linux-anvil-ppc64le-cuda:11.2 # [linux and ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-ppc64le"]

- quay.io/condaforge/linux-anvil-aarch64-cuda:11.0 # [linux and aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-aarch64"]
- quay.io/condaforge/linux-anvil-aarch64-cuda:11.1 # [linux and aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-aarch64"]
- quay.io/condaforge/linux-anvil-aarch64-cuda:11.2 # [linux and aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-aarch64"]

cudnn:
# start for cuda_compiler_version == None
- undefined
Expand All @@ -75,6 +84,10 @@ cudnn:
- undefined # [linux and ppc64le] # CUDA 11.1
- undefined # [linux and ppc64le] # CUDA 11.2

- undefined # [linux and aarch64] # CUDA 11.0
- undefined # [linux and aarch64] # CUDA 11.1
- undefined # [linux and aarch64] # CUDA 11.2

cdt_name: # [linux]
# start cuda_compiler_version == None
- cos6 # [linux64]
Expand All @@ -94,4 +107,8 @@ cdt_name: # [linux]
- cos7 # [linux and ppc64le] # CUDA 10.2
- cos8 # [linux and ppc64le] # CUDA 11.0
- cos8 # [linux and ppc64le] # CUDA 11.1
- cos8 # [linux and ppc64le] # CUDA 11.2
- cos8 # [linux and ppc64le] # CUDA 11.2

- cos8 # [linux and aarch64] # CUDA 11.0
- cos8 # [linux and aarch64] # CUDA 11.1
- cos8 # [linux and aarch64] # CUDA 11.2
7 changes: 5 additions & 2 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% set name = "nvcc" %}
{% set number = 13 %}
{% set number = 14 %}

{% if cuda_compiler_version in (None, "None", True, False) %}
{% set cuda_major = 0 %}
Expand All @@ -16,7 +16,9 @@ package:

build:
number: {{ number }}
{% if cuda_major == 0 or (target_platform == "linux-ppc64le" and cuda_major_minor != (10, 2)) %}
{% if cuda_major == 0
or (target_platform == "linux-ppc64le" and cuda_major_minor != (10, 2))
or (target_platform == "linux-aarch64" and (cuda_major_minor < (11, 0) or arm_variant_type != "sbsa")) %}
skip: true
{% endif %}

Expand Down Expand Up @@ -87,3 +89,4 @@ extra:
- mike-wendt
- raydouglass
- jaimergp
- leofang