diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 56d55fea..30209905 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -72,70 +72,38 @@ jobs: CONFIG: linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.0 - linux_aarch64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10python3.10.____cpython: - CONFIG: linux_aarch64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10python3.10.____cpython + linux_aarch64_python3.10.____cpython: + CONFIG: linux_aarch64_python3.10.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64-cuda:11.2 - linux_aarch64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10python3.11.____cpython: - CONFIG: linux_aarch64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10python3.11.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64-cuda:11.2 - linux_aarch64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10python3.8.____cpython: - CONFIG: linux_aarch64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10python3.8.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64-cuda:11.2 - linux_aarch64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10python3.9.____cpython: - CONFIG: linux_aarch64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10python3.9.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64-cuda:11.2 - linux_aarch64_c_compiler_version9cuda_compiler_version11.0cxx_compiler_version9python3.10.____cpython: - CONFIG: linux_aarch64_c_compiler_version9cuda_compiler_version11.0cxx_compiler_version9python3.10.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64-cuda:11.0 - linux_aarch64_c_compiler_version9cuda_compiler_version11.0cxx_compiler_version9python3.11.____cpython: - CONFIG: linux_aarch64_c_compiler_version9cuda_compiler_version11.0cxx_compiler_version9python3.11.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64-cuda:11.0 - linux_aarch64_c_compiler_version9cuda_compiler_version11.0cxx_compiler_version9python3.8.____cpython: - CONFIG: linux_aarch64_c_compiler_version9cuda_compiler_version11.0cxx_compiler_version9python3.8.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64-cuda:11.0 - linux_aarch64_c_compiler_version9cuda_compiler_version11.0cxx_compiler_version9python3.9.____cpython: - CONFIG: linux_aarch64_c_compiler_version9cuda_compiler_version11.0cxx_compiler_version9python3.9.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64-cuda:11.0 - linux_aarch64_c_compiler_version9cuda_compiler_version11.1cxx_compiler_version9python3.10.____cpython: - CONFIG: linux_aarch64_c_compiler_version9cuda_compiler_version11.1cxx_compiler_version9python3.10.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64-cuda:11.1 - linux_aarch64_c_compiler_version9cuda_compiler_version11.1cxx_compiler_version9python3.11.____cpython: - CONFIG: linux_aarch64_c_compiler_version9cuda_compiler_version11.1cxx_compiler_version9python3.11.____cpython + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 + linux_aarch64_python3.11.____cpython: + CONFIG: linux_aarch64_python3.11.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64-cuda:11.1 - linux_aarch64_c_compiler_version9cuda_compiler_version11.1cxx_compiler_version9python3.8.____cpython: - CONFIG: linux_aarch64_c_compiler_version9cuda_compiler_version11.1cxx_compiler_version9python3.8.____cpython + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 + linux_aarch64_python3.8.____cpython: + CONFIG: linux_aarch64_python3.8.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64-cuda:11.1 - linux_aarch64_c_compiler_version9cuda_compiler_version11.1cxx_compiler_version9python3.9.____cpython: - CONFIG: linux_aarch64_c_compiler_version9cuda_compiler_version11.1cxx_compiler_version9python3.9.____cpython + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 + linux_aarch64_python3.9.____cpython: + CONFIG: linux_aarch64_python3.9.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64-cuda:11.1 - linux_ppc64le_c_compiler_version10cuda_compiler_version11.2cudnn8cxx_compiler_version10python3.10.____cpython: - CONFIG: linux_ppc64le_c_compiler_version10cuda_compiler_version11.2cudnn8cxx_compiler_version10python3.10.____cpython + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 + linux_ppc64le_python3.10.____cpython: + CONFIG: linux_ppc64le_python3.10.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le-cuda:11.2 - linux_ppc64le_c_compiler_version10cuda_compiler_version11.2cudnn8cxx_compiler_version10python3.11.____cpython: - CONFIG: linux_ppc64le_c_compiler_version10cuda_compiler_version11.2cudnn8cxx_compiler_version10python3.11.____cpython + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 + linux_ppc64le_python3.11.____cpython: + CONFIG: linux_ppc64le_python3.11.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le-cuda:11.2 - linux_ppc64le_c_compiler_version10cuda_compiler_version11.2cudnn8cxx_compiler_version10python3.8.____cpython: - CONFIG: linux_ppc64le_c_compiler_version10cuda_compiler_version11.2cudnn8cxx_compiler_version10python3.8.____cpython + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 + linux_ppc64le_python3.8.____cpython: + CONFIG: linux_ppc64le_python3.8.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le-cuda:11.2 - linux_ppc64le_c_compiler_version10cuda_compiler_version11.2cudnn8cxx_compiler_version10python3.9.____cpython: - CONFIG: linux_ppc64le_c_compiler_version10cuda_compiler_version11.2cudnn8cxx_compiler_version10python3.9.____cpython + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 + linux_ppc64le_python3.9.____cpython: + CONFIG: linux_ppc64le_python3.9.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le-cuda:11.2 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 timeoutInMinutes: 360 steps: diff --git a/.ci_support/linux_aarch64_c_compiler_version9cuda_compiler_version11.0cxx_compiler_version9python3.10.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version9cuda_compiler_version11.0cxx_compiler_version9python3.10.____cpython.yaml deleted file mode 100644 index 61ce0641..00000000 --- a/.ci_support/linux_aarch64_c_compiler_version9cuda_compiler_version11.0cxx_compiler_version9python3.10.____cpython.yaml +++ /dev/null @@ -1,47 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -arm_variant_type: -- sbsa -c_compiler: -- gcc -c_compiler_version: -- '9' -cdt_arch: -- aarch64 -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- nvcc -cuda_compiler_version: -- '11.0' -cudnn: -- '8' -cutensor: -- '1' -cxx_compiler: -- gxx -cxx_compiler_version: -- '9' -docker_image: -- quay.io/condaforge/linux-anvil-aarch64-cuda:11.0 -nccl: -- '2' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.10.* *_cpython -target_platform: -- linux-aarch64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - cudnn - - cuda_compiler_version - - cdt_name - - docker_image diff --git a/.ci_support/linux_aarch64_c_compiler_version9cuda_compiler_version11.0cxx_compiler_version9python3.11.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version9cuda_compiler_version11.0cxx_compiler_version9python3.11.____cpython.yaml deleted file mode 100644 index 6f8cafdc..00000000 --- a/.ci_support/linux_aarch64_c_compiler_version9cuda_compiler_version11.0cxx_compiler_version9python3.11.____cpython.yaml +++ /dev/null @@ -1,47 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -arm_variant_type: -- sbsa -c_compiler: -- gcc -c_compiler_version: -- '9' -cdt_arch: -- aarch64 -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- nvcc -cuda_compiler_version: -- '11.0' -cudnn: -- '8' -cutensor: -- '1' -cxx_compiler: -- gxx -cxx_compiler_version: -- '9' -docker_image: -- quay.io/condaforge/linux-anvil-aarch64-cuda:11.0 -nccl: -- '2' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.11.* *_cpython -target_platform: -- linux-aarch64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - cudnn - - cuda_compiler_version - - cdt_name - - docker_image diff --git a/.ci_support/linux_aarch64_c_compiler_version9cuda_compiler_version11.0cxx_compiler_version9python3.8.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version9cuda_compiler_version11.0cxx_compiler_version9python3.8.____cpython.yaml deleted file mode 100644 index 8c2129d1..00000000 --- a/.ci_support/linux_aarch64_c_compiler_version9cuda_compiler_version11.0cxx_compiler_version9python3.8.____cpython.yaml +++ /dev/null @@ -1,47 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -arm_variant_type: -- sbsa -c_compiler: -- gcc -c_compiler_version: -- '9' -cdt_arch: -- aarch64 -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- nvcc -cuda_compiler_version: -- '11.0' -cudnn: -- '8' -cutensor: -- '1' -cxx_compiler: -- gxx -cxx_compiler_version: -- '9' -docker_image: -- quay.io/condaforge/linux-anvil-aarch64-cuda:11.0 -nccl: -- '2' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -target_platform: -- linux-aarch64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - cudnn - - cuda_compiler_version - - cdt_name - - docker_image diff --git a/.ci_support/linux_aarch64_c_compiler_version9cuda_compiler_version11.0cxx_compiler_version9python3.9.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version9cuda_compiler_version11.0cxx_compiler_version9python3.9.____cpython.yaml deleted file mode 100644 index 6843a922..00000000 --- a/.ci_support/linux_aarch64_c_compiler_version9cuda_compiler_version11.0cxx_compiler_version9python3.9.____cpython.yaml +++ /dev/null @@ -1,47 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -arm_variant_type: -- sbsa -c_compiler: -- gcc -c_compiler_version: -- '9' -cdt_arch: -- aarch64 -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- nvcc -cuda_compiler_version: -- '11.0' -cudnn: -- '8' -cutensor: -- '1' -cxx_compiler: -- gxx -cxx_compiler_version: -- '9' -docker_image: -- quay.io/condaforge/linux-anvil-aarch64-cuda:11.0 -nccl: -- '2' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_cpython -target_platform: -- linux-aarch64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - cudnn - - cuda_compiler_version - - cdt_name - - docker_image diff --git a/.ci_support/linux_aarch64_c_compiler_version9cuda_compiler_version11.1cxx_compiler_version9python3.10.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version9cuda_compiler_version11.1cxx_compiler_version9python3.10.____cpython.yaml deleted file mode 100644 index 8db40550..00000000 --- a/.ci_support/linux_aarch64_c_compiler_version9cuda_compiler_version11.1cxx_compiler_version9python3.10.____cpython.yaml +++ /dev/null @@ -1,47 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -arm_variant_type: -- sbsa -c_compiler: -- gcc -c_compiler_version: -- '9' -cdt_arch: -- aarch64 -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- nvcc -cuda_compiler_version: -- '11.1' -cudnn: -- '8' -cutensor: -- '1' -cxx_compiler: -- gxx -cxx_compiler_version: -- '9' -docker_image: -- quay.io/condaforge/linux-anvil-aarch64-cuda:11.1 -nccl: -- '2' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.10.* *_cpython -target_platform: -- linux-aarch64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - cudnn - - cuda_compiler_version - - cdt_name - - docker_image diff --git a/.ci_support/linux_aarch64_c_compiler_version9cuda_compiler_version11.1cxx_compiler_version9python3.11.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version9cuda_compiler_version11.1cxx_compiler_version9python3.11.____cpython.yaml deleted file mode 100644 index 248666ed..00000000 --- a/.ci_support/linux_aarch64_c_compiler_version9cuda_compiler_version11.1cxx_compiler_version9python3.11.____cpython.yaml +++ /dev/null @@ -1,47 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -arm_variant_type: -- sbsa -c_compiler: -- gcc -c_compiler_version: -- '9' -cdt_arch: -- aarch64 -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- nvcc -cuda_compiler_version: -- '11.1' -cudnn: -- '8' -cutensor: -- '1' -cxx_compiler: -- gxx -cxx_compiler_version: -- '9' -docker_image: -- quay.io/condaforge/linux-anvil-aarch64-cuda:11.1 -nccl: -- '2' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.11.* *_cpython -target_platform: -- linux-aarch64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - cudnn - - cuda_compiler_version - - cdt_name - - docker_image diff --git a/.ci_support/linux_aarch64_c_compiler_version9cuda_compiler_version11.1cxx_compiler_version9python3.8.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version9cuda_compiler_version11.1cxx_compiler_version9python3.8.____cpython.yaml deleted file mode 100644 index 1698ca44..00000000 --- a/.ci_support/linux_aarch64_c_compiler_version9cuda_compiler_version11.1cxx_compiler_version9python3.8.____cpython.yaml +++ /dev/null @@ -1,47 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -arm_variant_type: -- sbsa -c_compiler: -- gcc -c_compiler_version: -- '9' -cdt_arch: -- aarch64 -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- nvcc -cuda_compiler_version: -- '11.1' -cudnn: -- '8' -cutensor: -- '1' -cxx_compiler: -- gxx -cxx_compiler_version: -- '9' -docker_image: -- quay.io/condaforge/linux-anvil-aarch64-cuda:11.1 -nccl: -- '2' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -target_platform: -- linux-aarch64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - cudnn - - cuda_compiler_version - - cdt_name - - docker_image diff --git a/.ci_support/linux_aarch64_c_compiler_version9cuda_compiler_version11.1cxx_compiler_version9python3.9.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version9cuda_compiler_version11.1cxx_compiler_version9python3.9.____cpython.yaml deleted file mode 100644 index 22602d56..00000000 --- a/.ci_support/linux_aarch64_c_compiler_version9cuda_compiler_version11.1cxx_compiler_version9python3.9.____cpython.yaml +++ /dev/null @@ -1,47 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -arm_variant_type: -- sbsa -c_compiler: -- gcc -c_compiler_version: -- '9' -cdt_arch: -- aarch64 -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- nvcc -cuda_compiler_version: -- '11.1' -cudnn: -- '8' -cutensor: -- '1' -cxx_compiler: -- gxx -cxx_compiler_version: -- '9' -docker_image: -- quay.io/condaforge/linux-anvil-aarch64-cuda:11.1 -nccl: -- '2' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_cpython -target_platform: -- linux-aarch64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - cudnn - - cuda_compiler_version - - cdt_name - - docker_image diff --git a/.ci_support/linux_aarch64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10python3.10.____cpython.yaml b/.ci_support/linux_aarch64_python3.10.____cpython.yaml similarity index 92% rename from .ci_support/linux_aarch64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10python3.10.____cpython.yaml rename to .ci_support/linux_aarch64_python3.10.____cpython.yaml index d3acaa1a..1c13b5d4 100644 --- a/.ci_support/linux_aarch64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.10.____cpython.yaml @@ -27,7 +27,7 @@ cxx_compiler: cxx_compiler_version: - '10' docker_image: -- quay.io/condaforge/linux-anvil-aarch64-cuda:11.2 +- quay.io/condaforge/linux-anvil-cuda:11.2 nccl: - '2' pin_run_as_build: diff --git a/.ci_support/linux_aarch64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10python3.11.____cpython.yaml b/.ci_support/linux_aarch64_python3.11.____cpython.yaml similarity index 92% rename from .ci_support/linux_aarch64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10python3.11.____cpython.yaml rename to .ci_support/linux_aarch64_python3.11.____cpython.yaml index a99d2cfc..96f97689 100644 --- a/.ci_support/linux_aarch64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.11.____cpython.yaml @@ -27,7 +27,7 @@ cxx_compiler: cxx_compiler_version: - '10' docker_image: -- quay.io/condaforge/linux-anvil-aarch64-cuda:11.2 +- quay.io/condaforge/linux-anvil-cuda:11.2 nccl: - '2' pin_run_as_build: diff --git a/.ci_support/linux_aarch64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10python3.8.____cpython.yaml b/.ci_support/linux_aarch64_python3.8.____cpython.yaml similarity index 92% rename from .ci_support/linux_aarch64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10python3.8.____cpython.yaml rename to .ci_support/linux_aarch64_python3.8.____cpython.yaml index 003d0b1b..3e6bfa49 100644 --- a/.ci_support/linux_aarch64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10python3.8.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.8.____cpython.yaml @@ -27,7 +27,7 @@ cxx_compiler: cxx_compiler_version: - '10' docker_image: -- quay.io/condaforge/linux-anvil-aarch64-cuda:11.2 +- quay.io/condaforge/linux-anvil-cuda:11.2 nccl: - '2' pin_run_as_build: diff --git a/.ci_support/linux_aarch64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10python3.9.____cpython.yaml b/.ci_support/linux_aarch64_python3.9.____cpython.yaml similarity index 92% rename from .ci_support/linux_aarch64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10python3.9.____cpython.yaml rename to .ci_support/linux_aarch64_python3.9.____cpython.yaml index 69eb4a98..af9c6193 100644 --- a/.ci_support/linux_aarch64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.9.____cpython.yaml @@ -27,7 +27,7 @@ cxx_compiler: cxx_compiler_version: - '10' docker_image: -- quay.io/condaforge/linux-anvil-aarch64-cuda:11.2 +- quay.io/condaforge/linux-anvil-cuda:11.2 nccl: - '2' pin_run_as_build: diff --git a/.ci_support/linux_ppc64le_c_compiler_version10cuda_compiler_version11.2cudnn8cxx_compiler_version10python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_python3.10.____cpython.yaml similarity index 91% rename from .ci_support/linux_ppc64le_c_compiler_version10cuda_compiler_version11.2cudnn8cxx_compiler_version10python3.10.____cpython.yaml rename to .ci_support/linux_ppc64le_python3.10.____cpython.yaml index 2e61cf36..1a54839f 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version10cuda_compiler_version11.2cudnn8cxx_compiler_version10python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.10.____cpython.yaml @@ -21,7 +21,7 @@ cxx_compiler: cxx_compiler_version: - '10' docker_image: -- quay.io/condaforge/linux-anvil-ppc64le-cuda:11.2 +- quay.io/condaforge/linux-anvil-cuda:11.2 nccl: - '2' pin_run_as_build: diff --git a/.ci_support/linux_ppc64le_c_compiler_version10cuda_compiler_version11.2cudnn8cxx_compiler_version10python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_python3.11.____cpython.yaml similarity index 91% rename from .ci_support/linux_ppc64le_c_compiler_version10cuda_compiler_version11.2cudnn8cxx_compiler_version10python3.11.____cpython.yaml rename to .ci_support/linux_ppc64le_python3.11.____cpython.yaml index 908e4421..888b9396 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version10cuda_compiler_version11.2cudnn8cxx_compiler_version10python3.11.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.11.____cpython.yaml @@ -21,7 +21,7 @@ cxx_compiler: cxx_compiler_version: - '10' docker_image: -- quay.io/condaforge/linux-anvil-ppc64le-cuda:11.2 +- quay.io/condaforge/linux-anvil-cuda:11.2 nccl: - '2' pin_run_as_build: diff --git a/.ci_support/linux_ppc64le_c_compiler_version10cuda_compiler_version11.2cudnn8cxx_compiler_version10python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_python3.8.____cpython.yaml similarity index 91% rename from .ci_support/linux_ppc64le_c_compiler_version10cuda_compiler_version11.2cudnn8cxx_compiler_version10python3.8.____cpython.yaml rename to .ci_support/linux_ppc64le_python3.8.____cpython.yaml index 1dae812f..64970fb0 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version10cuda_compiler_version11.2cudnn8cxx_compiler_version10python3.8.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.8.____cpython.yaml @@ -21,7 +21,7 @@ cxx_compiler: cxx_compiler_version: - '10' docker_image: -- quay.io/condaforge/linux-anvil-ppc64le-cuda:11.2 +- quay.io/condaforge/linux-anvil-cuda:11.2 nccl: - '2' pin_run_as_build: diff --git a/.ci_support/linux_ppc64le_c_compiler_version10cuda_compiler_version11.2cudnn8cxx_compiler_version10python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_python3.9.____cpython.yaml similarity index 91% rename from .ci_support/linux_ppc64le_c_compiler_version10cuda_compiler_version11.2cudnn8cxx_compiler_version10python3.9.____cpython.yaml rename to .ci_support/linux_ppc64le_python3.9.____cpython.yaml index b89db266..7909891d 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version10cuda_compiler_version11.2cudnn8cxx_compiler_version10python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.9.____cpython.yaml @@ -21,7 +21,7 @@ cxx_compiler: cxx_compiler_version: - '10' docker_image: -- quay.io/condaforge/linux-anvil-ppc64le-cuda:11.2 +- quay.io/condaforge/linux-anvil-cuda:11.2 nccl: - '2' pin_run_as_build: diff --git a/.ci_support/migrations/cuda_112_ppc64le_aarch64.yaml b/.ci_support/migrations/cuda_112_ppc64le_aarch64.yaml deleted file mode 100644 index 675a3815..00000000 --- a/.ci_support/migrations/cuda_112_ppc64le_aarch64.yaml +++ /dev/null @@ -1,41 +0,0 @@ -migrator_ts: 1645421738 -__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 - wait_for_migrators: - - aarch64 and ppc64le addition - exclude_pinned_pkgs: False - commit_message: "Rebuild for cuda for ppc64le and aarch64" - -arm_variant_type: # [aarch64] - - sbsa # [aarch64] - -c_compiler_version: # [ppc64le or aarch64] - - 10 # [ppc64le or aarch64] -cxx_compiler_version: # [ppc64le or aarch64] - - 10 # [ppc64le or aarch64] -fortran_compiler_version: # [ppc64le or aarch64] - - 10 # [ppc64le or aarch64] - -cuda_compiler_version: # [ppc64le or aarch64] - - 11.2 # [ppc64le or aarch64] - -cudnn: # [ppc64le or aarch64] - - 8 # [ppc64le or aarch64] - -cdt_name: # [ppc64le or aarch64] - - cos7 # [ppc64le or aarch64] - -docker_image: # [os.environ.get("BUILD_PLATFORM", "").startswith("linux") and (ppc64le or aarch64)] - - quay.io/condaforge/linux-anvil-ppc64le-cuda:11.2 # [ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-ppc64le"] - - quay.io/condaforge/linux-anvil-aarch64-cuda:11.2 # [aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-aarch64"] diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 595f8b5e..7bc6afbb 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -45,7 +45,9 @@ source run_conda_forge_build_setup # make the build number clobber make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" - +if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]] && [[ "${BUILD_WITH_CONDA_DEBUG:-0}" != 1 ]]; then + EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" +fi ( endgroup "Configuring conda" ) 2> /dev/null diff --git a/README.md b/README.md index 15bfc33b..a0f94f93 100644 --- a/README.md +++ b/README.md @@ -144,115 +144,59 @@ Current build status - linux_aarch64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10python3.10.____cpython + linux_aarch64_python3.10.____cpython - variant + variant - linux_aarch64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10python3.11.____cpython + linux_aarch64_python3.11.____cpython - variant + variant - linux_aarch64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10python3.8.____cpython + linux_aarch64_python3.8.____cpython - variant + variant - linux_aarch64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10python3.9.____cpython + linux_aarch64_python3.9.____cpython - variant + variant - linux_aarch64_c_compiler_version9cuda_compiler_version11.0cxx_compiler_version9python3.10.____cpython + linux_ppc64le_python3.10.____cpython - variant + variant - linux_aarch64_c_compiler_version9cuda_compiler_version11.0cxx_compiler_version9python3.11.____cpython + linux_ppc64le_python3.11.____cpython - variant + variant - linux_aarch64_c_compiler_version9cuda_compiler_version11.0cxx_compiler_version9python3.8.____cpython + linux_ppc64le_python3.8.____cpython - variant + variant - linux_aarch64_c_compiler_version9cuda_compiler_version11.0cxx_compiler_version9python3.9.____cpython + linux_ppc64le_python3.9.____cpython - variant - - - - linux_aarch64_c_compiler_version9cuda_compiler_version11.1cxx_compiler_version9python3.10.____cpython - - - variant - - - - linux_aarch64_c_compiler_version9cuda_compiler_version11.1cxx_compiler_version9python3.11.____cpython - - - variant - - - - linux_aarch64_c_compiler_version9cuda_compiler_version11.1cxx_compiler_version9python3.8.____cpython - - - variant - - - - linux_aarch64_c_compiler_version9cuda_compiler_version11.1cxx_compiler_version9python3.9.____cpython - - - variant - - - - linux_ppc64le_c_compiler_version10cuda_compiler_version11.2cudnn8cxx_compiler_version10python3.10.____cpython - - - variant - - - - linux_ppc64le_c_compiler_version10cuda_compiler_version11.2cudnn8cxx_compiler_version10python3.11.____cpython - - - variant - - - - linux_ppc64le_c_compiler_version10cuda_compiler_version11.2cudnn8cxx_compiler_version10python3.8.____cpython - - - variant - - - - linux_ppc64le_c_compiler_version10cuda_compiler_version11.2cudnn8cxx_compiler_version10python3.9.____cpython - - - variant + variant diff --git a/conda-forge.yml b/conda-forge.yml index b1854bcb..2d07427e 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -7,8 +7,12 @@ os_version: linux_64: cos7 linux_aarch64: cos7 linux_ppc64le: cos7 +build_platform: + linux_ppc64le: linux_64 + linux_aarch64: linux_64 provider: linux_aarch64: azure linux_ppc64le: azure conda_build: pkg_format: '2' +test: native diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index b427a0ed..7334f314 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,38 +1,31 @@ arm_variant_type: # [aarch64] - sbsa # [aarch64] -# The added keys below are needed to enable ppc64le/aarch64 CUDA builds; the linux64 -# and win64 builds are already handled in the conda-forge-pinning feedstock. Once we -# migrate to enable CUDA builds on all supported platforms, these can be removed too. +# conda-forge only supports cross-compiling with CUDA 11.2 -docker_image: # [os.environ.get("BUILD_PLATFORM", "").startswith("linux")] - - quay.io/condaforge/linux-anvil-aarch64-cuda:11.0 # [aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-aarch64"] - - quay.io/condaforge/linux-anvil-aarch64-cuda:11.1 # [aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-aarch64"] +cuda_compiler: + - nvcc + +docker_image: # [os.environ.get("BUILD_PLATFORM", "").startswith("linux")] + - quay.io/condaforge/linux-anvil-cuda:11.2 # [(aarch64 or ppc64le) and os.environ.get("BUILD_PLATFORM") == "linux-64"] c_compiler_version: # [linux] - - 9 # [aarch64] - - 9 # [aarch64] + - 10 # [aarch64 or ppc64le] + cxx_compiler_version: # [linux] - - 9 # [aarch64] - - 9 # [aarch64] -fortran_compiler_version: # [linux] - - 9 # [aarch64] - - 9 # [aarch64] + - 10 # [aarch64 or ppc64le] -cuda_compiler: - - nvcc +fortran_compiler_version: # [linux] + - 10 # [aarch64 or ppc64le] cuda_compiler_version: - - 11.0 # [aarch64] - - 11.1 # [aarch64] + - 11.2 # [aarch64 or ppc64le] cudnn: - - 8 # [aarch64] - - 8 # [aarch64] + - 8 # [aarch64 or ppc64le] cdt_name: # [linux] - - cos7 # [aarch64] - - cos7 # [aarch64] + - cos7 # [aarch64 or ppc64le] c_compiler: # [win] - vs2017 # [win] diff --git a/recipe/cross_compile.diff b/recipe/cross_compile.diff new file mode 100644 index 00000000..58d73095 --- /dev/null +++ b/recipe/cross_compile.diff @@ -0,0 +1,95 @@ +diff --git a/install/cupy_builder/cupy_setup_build.py b/install/cupy_builder/cupy_setup_build.py +index 8023e46ad..bb407e8eb 100644 +--- a/install/cupy_builder/cupy_setup_build.py ++++ b/install/cupy_builder/cupy_setup_build.py +@@ -294,16 +294,34 @@ def make_extensions(ctx: Context, compiler, use_cython): + # deprecated since ROCm 4.2.0 + settings['define_macros'].append(('__HIP_PLATFORM_HCC__', '1')) + +- available_modules = [] +- if no_cuda: +- available_modules = [m['name'] for m in MODULES] +- else: +- available_modules, settings = preconfigure_modules( +- ctx, MODULES, compiler, settings) +- required_modules = get_required_modules(MODULES) +- if not (set(required_modules) <= set(available_modules)): +- raise Exception('Your CUDA environment is invalid. ' +- 'Please check above error log.') ++ try: ++ host_compiler = compiler ++ os.symlink(f'{os.environ["BUILD_PREFIX"]}/x86_64-conda-linux-gnu/bin/x86_64-conda-linux-gnu-ld', ++ f'{os.environ["BUILD_PREFIX"]}/bin/ld') ++ if os.environ.get('CONDA_BUILD_CROSS_COMPILATION'): ++ # If cross-compiling, we need build_and_run() & build_shlib() to use the compiler ++ # on the build platform to generate stub files that are executable in the build ++ # environment, not the target environment. ++ compiler = ccompiler.new_compiler() ++ compiler.compiler = [os.environ['CC_FOR_BUILD'],] ++ compiler.compiler_cxx = [os.environ['CXX_FOR_BUILD'],] ++ compiler.compiler_so = [os.environ['CC_FOR_BUILD'],] ++ compiler.linker_exe = [os.environ['CC_FOR_BUILD'], f'-B{os.environ["BUILD_PREFIX"]}/bin'] ++ compiler.linker_so = [os.environ['CC_FOR_BUILD'], f'-B{os.environ["BUILD_PREFIX"]}/bin', '-shared'] ++ ++ available_modules = [] ++ if no_cuda: ++ available_modules = [m['name'] for m in MODULES] ++ else: ++ available_modules, settings = preconfigure_modules( ++ ctx, MODULES, compiler, settings) ++ required_modules = get_required_modules(MODULES) ++ if not (set(required_modules) <= set(available_modules)): ++ raise Exception('Your CUDA environment is invalid. ' ++ 'Please check above error log.') ++ finally: ++ compiler = host_compiler ++ os.remove(f'{os.environ["BUILD_PREFIX"]}/bin/ld') + + ret = [] + for module in MODULES: +diff --git a/install/cupy_builder/install_build.py b/install/cupy_builder/install_build.py +index d0317e324..b0a65eb24 100644 +--- a/install/cupy_builder/install_build.py ++++ b/install/cupy_builder/install_build.py +@@ -1,6 +1,7 @@ + # mypy: ignore-errors + + import contextlib ++from distutils import log + import os + import re + import shlex +@@ -692,6 +693,16 @@ def get_cusparselt_version(formatted=False): + def build_shlib(compiler, source, libraries=(), + include_dirs=(), library_dirs=(), define_macros=None, + extra_compile_args=()): ++ if os.environ.get('CONDA_BUILD_CROSS_COMPILATION'): ++ # If we're cross compiling, we need to generate stub files that are ++ # executable in the build environment, not the target environment. ++ # This assumes, however, that the build/host environments see the same ++ # CUDA Toolkit. ++ extra_compile_args = list(extra_compile_args) + ['-march=native',] ++ include_dirs = list(include_dirs) + [f'{os.environ["BUILD_PREFIX"]}/include', '/usr/local/cuda/include'] ++ library_dirs = list(library_dirs) + [f'{os.environ["BUILD_PREFIX"]}/lib', '/usr/local/cuda/lib64/stubs'] ++ log.set_verbosity(1) ++ + with _tempdir() as temp_dir: + fname = os.path.join(temp_dir, 'a.cpp') + with open(fname, 'w') as f: +@@ -717,6 +728,16 @@ def build_shlib(compiler, source, libraries=(), + def build_and_run(compiler, source, libraries=(), + include_dirs=(), library_dirs=(), define_macros=None, + extra_compile_args=()): ++ if os.environ.get('CONDA_BUILD_CROSS_COMPILATION'): ++ # If we're cross compiling, we need to generate stub files that are ++ # executable in the build environment, not the target environment. ++ # This assumes, however, that the build/host environments see the same ++ # CUDA Toolkit. ++ extra_compile_args = list(extra_compile_args) + ['-march=native',] ++ include_dirs = list(include_dirs) + [f'{os.environ["BUILD_PREFIX"]}/include', '/usr/local/cuda/include'] ++ library_dirs = list(library_dirs) + [f'{os.environ["BUILD_PREFIX"]}/lib', '/usr/local/cuda/lib64/stubs'] ++ log.set_verbosity(1) ++ + with _tempdir() as temp_dir: + fname = os.path.join(temp_dir, 'a.cpp') + with open(fname, 'w') as f: diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 42c49da2..fd6ff4fd 100755 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -19,9 +19,11 @@ package: source: - url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz sha256: {{ sha256 }} + patches: + - cross_compile.diff # [build_platform != target_platform] build: - number: 0 + number: 1 skip: true # [(not win64 and not linux and not (aarch64 and arm_variant_type == "sbsa")) or cuda_compiler_version in (undefined, "None")] script: # CuPy default detects CUDA from nvcc, but on Conda-Forge's dockers nvcc lives in a different place... @@ -77,8 +79,15 @@ requirements: - {{ compiler("c") }} - {{ compiler("cxx") }} - {{ compiler("cuda") }} - - sysroot_linux-64 2.17 # [linux64] - + - sysroot_{{ target_platform }} 2.17 # [linux] + - cross-python_{{ target_platform }} # [build_platform != target_platform] + - python # [build_platform != target_platform] + - cython >=0.29.22,<3 # [build_platform != target_platform] + # optional dependencies for CUDA 11.2+ + - cudnn >=7.6 # [build_platform != target_platform] + - nccl >=2.8 # [build_platform != target_platform] + - cutensor >=1.4 # [build_platform != target_platform] + host: - python - pip