From 1d03156c949c063aaf563ac4b7e18f51bf740619 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <121827174+conda-forge-webservices[bot]@users.noreply.github.com> Date: Fri, 4 Aug 2023 02:42:06 +0000 Subject: [PATCH 01/12] dummy commit for rerendering --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 8821268b..2bd5bfa6 100644 --- a/README.md +++ b/README.md @@ -255,3 +255,6 @@ Feedstock Maintainers * [@mfansler](https://github.com/mfansler/) * [@xhochy](https://github.com/xhochy/) + + + From 5648f72d9a4e44583508e17dc0d7407be1868d1d Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Fri, 4 Aug 2023 02:49:39 +0000 Subject: [PATCH 02/12] MNT: Re-rendered with conda-build 3.26.0, conda-smithy 3.24.1, and conda-forge-pinning 2023.08.04.02.04.35 --- .azure-pipelines/azure-pipelines-linux.yml | 12 ++++++------ ...mpiler_version11.2cxx_compiler_version10.yaml} | 0 ...mpiler_version12.0cxx_compiler_version12.yaml} | 0 ...mpiler_versionNonecxx_compiler_version12.yaml} | 0 README.md | 15 ++++++--------- 5 files changed, 12 insertions(+), 15 deletions(-) rename .ci_support/{linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml => linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10.yaml} (100%) rename .ci_support/{linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml => linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12.yaml} (100%) rename .ci_support/{linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml => linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12.yaml} (100%) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 58450357..5980136a 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,16 +8,16 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10: - CONFIG: linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10 + linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10: + CONFIG: linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 - linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12: - CONFIG: linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12 + linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12: + CONFIG: linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12: - CONFIG: linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12 + linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12: + CONFIG: linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_aarch64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10: diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10.yaml similarity index 100% rename from .ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml rename to .ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10.yaml diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12.yaml similarity index 100% rename from .ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml rename to .ci_support/linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12.yaml diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12.yaml similarity index 100% rename from .ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml rename to .ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12.yaml diff --git a/README.md b/README.md index 2bd5bfa6..03cb3c61 100644 --- a/README.md +++ b/README.md @@ -41,24 +41,24 @@ Current build status - + - + - + @@ -255,6 +255,3 @@ Feedstock Maintainers * [@mfansler](https://github.com/mfansler/) * [@xhochy](https://github.com/xhochy/) - - - From bb3d8d14aeb38d5b2d94d9a1bd4663ba580a284e Mon Sep 17 00:00:00 2001 From: jakirkham Date: Thu, 3 Aug 2023 19:51:20 -0700 Subject: [PATCH 03/12] Sort `conda-forge.yml` keys --- conda-forge.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conda-forge.yml b/conda-forge.yml index bf694fac..6d3531e4 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,3 +1,5 @@ +azure: + free_disk_space: true build_platform: linux_aarch64: linux_64 linux_ppc64le: linux_64 @@ -12,5 +14,3 @@ provider: linux_aarch64: default linux_ppc64le: default test_on_native_only: true -azure: - free_disk_space: true From c6e50e80c2d53cd38ba13e329946da59585a3bce Mon Sep 17 00:00:00 2001 From: jakirkham Date: Thu, 3 Aug 2023 19:51:21 -0700 Subject: [PATCH 04/12] Drop unneeded `skip` --- recipe/meta.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 78f990b4..c5974401 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -18,7 +18,6 @@ source: build: number: 3 skip: true # [win and cuda_compiler_version != "None"] - skip: true # [cuda_compiler_version == "10.2"] requirements: build: From aa1682935db1a844345b9aacb444fc6643cb7abc Mon Sep 17 00:00:00 2001 From: jakirkham Date: Thu, 3 Aug 2023 19:51:22 -0700 Subject: [PATCH 05/12] Limit `nccl` usage to Linux As `nccl` is only built on Linux, restrict `nccl` usage to Linux. This is relevant for Windows CUDA builds. --- recipe/meta.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c5974401..d09bff63 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -31,7 +31,7 @@ requirements: - ninja host: - cudatoolkit # [(cuda_compiler_version or "").startswith("11")] - - nccl # [cuda_compiler_version != "None"] + - nccl # [linux and cuda_compiler_version != "None"] - llvm-openmp # [osx] outputs: @@ -54,7 +54,7 @@ outputs: host: - llvm-openmp # [osx] - cudatoolkit # [(cuda_compiler_version or "").startswith("11")] - - nccl # [cuda_compiler_version != "None"] + - nccl # [linux and cuda_compiler_version != "None"] run: - llvm-openmp # [osx] - __cuda # [cuda_compiler_version != "None"] @@ -128,7 +128,7 @@ outputs: # install llvm-openmp in the top-level host env above - llvm-openmp # [osx] - cudatoolkit # [(cuda_compiler_version or "").startswith("11")] - - nccl # [cuda_compiler_version != "None"] + - nccl # [linux and cuda_compiler_version != "None"] run: - python - {{ pin_subpackage('py-xgboost', exact=True) }} @@ -178,7 +178,7 @@ outputs: - r-jsonlite - r-knitr - cudatoolkit # [(cuda_compiler_version or "").startswith("11")] - - nccl # [cuda_compiler_version != "None"] + - nccl # [linux and cuda_compiler_version != "None"] run: - {{ pin_subpackage('libxgboost', exact=True) }} - {{ pin_subpackage('_r-xgboost-mutex', exact=True) }} From 525645f5e1f948dba8065b1af5e54f48f914392d Mon Sep 17 00:00:00 2001 From: jakirkham Date: Thu, 3 Aug 2023 19:51:23 -0700 Subject: [PATCH 06/12] Check `cuda_compiler` in selectors for CUDA builds --- recipe/meta.yaml | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d09bff63..463035d9 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -17,13 +17,13 @@ source: build: number: 3 - skip: true # [win and cuda_compiler_version != "None"] + skip: true # [win and cuda_compiler != "None"] requirements: build: - {{ compiler('c') }} - {{ compiler('cxx') }} - - {{ compiler('cuda') }} # [cuda_compiler_version != "None"] + - {{ compiler('cuda') }} # [cuda_compiler != "None"] - git # [not win] - m2-git # [win] - cmake @@ -31,7 +31,7 @@ requirements: - ninja host: - cudatoolkit # [(cuda_compiler_version or "").startswith("11")] - - nccl # [linux and cuda_compiler_version != "None"] + - nccl # [linux and cuda_compiler != "None"] - llvm-openmp # [osx] outputs: @@ -46,7 +46,7 @@ outputs: build: - {{ compiler('c') }} - {{ compiler('cxx') }} - - {{ compiler('cuda') }} # [cuda_compiler_version != "None"] + - {{ compiler('cuda') }} # [cuda_compiler != "None"] - git - cmake - make @@ -54,16 +54,16 @@ outputs: host: - llvm-openmp # [osx] - cudatoolkit # [(cuda_compiler_version or "").startswith("11")] - - nccl # [linux and cuda_compiler_version != "None"] + - nccl # [linux and cuda_compiler != "None"] run: - llvm-openmp # [osx] - - __cuda # [cuda_compiler_version != "None"] + - __cuda # [cuda_compiler != "None"] - name: _py-xgboost-mutex version: 2.0 build: - string: cpu_0 # [cuda_compiler_version == "None"] - string: gpu_0 # [cuda_compiler_version != "None"] + string: cpu_0 # [cuda_compiler == "None"] + string: gpu_0 # [cuda_compiler != "None"] - name: py-xgboost script: install-py-xgboost.sh # [not win] @@ -87,7 +87,7 @@ outputs: - numpy - scipy - scikit-learn - - __cuda # [cuda_compiler_version != "None"] + - __cuda # [cuda_compiler != "None"] test: script: test-py-xgboost.py imports: @@ -95,7 +95,7 @@ outputs: - name: py-xgboost-cpu build: - skip: true # [cuda_compiler_version != "None"] + skip: true # [cuda_compiler != "None"] requirements: host: - python @@ -106,7 +106,7 @@ outputs: - name: py-xgboost-gpu build: - skip: true # [cuda_compiler_version == "None"] + skip: true # [cuda_compiler == "None"] requirements: host: - python @@ -114,7 +114,7 @@ outputs: run: - python - {{ pin_subpackage('py-xgboost', exact=True) }} - - __cuda # [cuda_compiler_version != "None"] + - __cuda # [cuda_compiler != "None"] - name: xgboost @@ -128,17 +128,17 @@ outputs: # install llvm-openmp in the top-level host env above - llvm-openmp # [osx] - cudatoolkit # [(cuda_compiler_version or "").startswith("11")] - - nccl # [linux and cuda_compiler_version != "None"] + - nccl # [linux and cuda_compiler != "None"] run: - python - {{ pin_subpackage('py-xgboost', exact=True) }} - - __cuda # [cuda_compiler_version != "None"] + - __cuda # [cuda_compiler != "None"] - name: _r-xgboost-mutex version: 2.0 build: - string: cpu_0 # [cuda_compiler_version == "None"] - string: gpu_0 # [cuda_compiler_version != "None"] + string: cpu_0 # [cuda_compiler == "None"] + string: gpu_0 # [cuda_compiler != "None"] - name: r-xgboost script: install-r-xgboost.sh # [not win] @@ -154,7 +154,7 @@ outputs: - {{ compiler('m2w64_cxx') }} # [win] - {{ compiler('c') }} - {{ compiler('cxx') }} - - {{ compiler('cuda') }} # [cuda_compiler_version != "None"] + - {{ compiler('cuda') }} # [cuda_compiler != "None"] - llvm-openmp # [osx] - libgomp # [linux] - git @@ -178,7 +178,7 @@ outputs: - r-jsonlite - r-knitr - cudatoolkit # [(cuda_compiler_version or "").startswith("11")] - - nccl # [linux and cuda_compiler_version != "None"] + - nccl # [linux and cuda_compiler != "None"] run: - {{ pin_subpackage('libxgboost', exact=True) }} - {{ pin_subpackage('_r-xgboost-mutex', exact=True) }} @@ -187,7 +187,7 @@ outputs: - r-data.table - r-magrittr - r-jsonlite - - __cuda # [cuda_compiler_version != "None"] + - __cuda # [cuda_compiler != "None"] test: files: - test-r-xgboost.r @@ -196,7 +196,7 @@ outputs: - name: r-xgboost-cpu build: - skip: true # [cuda_compiler_version != "None"] + skip: true # [cuda_compiler != "None"] requirements: host: - r-base @@ -206,14 +206,14 @@ outputs: - name: r-xgboost-gpu build: - skip: true # [cuda_compiler_version == "None"] + skip: true # [cuda_compiler == "None"] requirements: host: - r-base run: - r-base - {{ pin_subpackage('r-xgboost', exact=True) }} - - __cuda # [cuda_compiler_version != "None"] + - __cuda # [cuda_compiler != "None"] about: home: https://github.com/dmlc/xgboost From 5ed74dea31db87a42de10de950ba87a88e570de9 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Thu, 3 Aug 2023 19:51:23 -0700 Subject: [PATCH 07/12] Drop unneeded dependencies from dependent packages As `libxgboost` does all the linking to CUDA libraries and the Python & R packages only link to `libxgboost`, drop CUDA library dependencies from the Python & R packages. --- recipe/meta.yaml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 463035d9..e7f75885 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -30,7 +30,6 @@ requirements: - llvm-openmp # [osx] - ninja host: - - cudatoolkit # [(cuda_compiler_version or "").startswith("11")] - nccl # [linux and cuda_compiler != "None"] - llvm-openmp # [osx] @@ -53,7 +52,6 @@ outputs: - llvm-openmp # [osx] host: - llvm-openmp # [osx] - - cudatoolkit # [(cuda_compiler_version or "").startswith("11")] - nccl # [linux and cuda_compiler != "None"] run: - llvm-openmp # [osx] @@ -124,11 +122,6 @@ outputs: requirements: host: - python - # we install llvm-opnemp here to convince conda to - # install llvm-openmp in the top-level host env above - - llvm-openmp # [osx] - - cudatoolkit # [(cuda_compiler_version or "").startswith("11")] - - nccl # [linux and cuda_compiler != "None"] run: - python - {{ pin_subpackage('py-xgboost', exact=True) }} @@ -154,7 +147,6 @@ outputs: - {{ compiler('m2w64_cxx') }} # [win] - {{ compiler('c') }} - {{ compiler('cxx') }} - - {{ compiler('cuda') }} # [cuda_compiler != "None"] - llvm-openmp # [osx] - libgomp # [linux] - git @@ -177,8 +169,6 @@ outputs: - r-magrittr - r-jsonlite - r-knitr - - cudatoolkit # [(cuda_compiler_version or "").startswith("11")] - - nccl # [linux and cuda_compiler != "None"] run: - {{ pin_subpackage('libxgboost', exact=True) }} - {{ pin_subpackage('_r-xgboost-mutex', exact=True) }} From 7d01e64f16804d48af79abda1aad4758dc9e51f6 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Thu, 3 Aug 2023 19:51:24 -0700 Subject: [PATCH 08/12] Fix OpenMP dependencies Make sure OpenMP libraries are added to `requirements/build` only. Also only add them where they are used. Drop them everywhere else. --- recipe/meta.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index e7f75885..9036b57c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -28,10 +28,10 @@ requirements: - m2-git # [win] - cmake - llvm-openmp # [osx] + - libgomp # [linux] - ninja host: - nccl # [linux and cuda_compiler != "None"] - - llvm-openmp # [osx] outputs: - name: libxgboost @@ -50,11 +50,10 @@ outputs: - cmake - make - llvm-openmp # [osx] + - libgomp # [linux] host: - - llvm-openmp # [osx] - nccl # [linux and cuda_compiler != "None"] run: - - llvm-openmp # [osx] - __cuda # [cuda_compiler != "None"] - name: _py-xgboost-mutex From 15fe61a203731d911bb6a64888affec5298d7f31 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Thu, 3 Aug 2023 19:51:25 -0700 Subject: [PATCH 09/12] Use `cuda-version` on CUDA 11 As `libxgboost` doesn't need anything from `cudatoolkit`, ignore `run_exports` from `{{ compiler('cuda') }}` on CUDA 11 and add `cuda-version` to encode CUDA driver version support there. Should lighten those packages a bit. --- recipe/meta.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 9036b57c..8b6838a4 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -41,6 +41,8 @@ outputs: activate_in_script: True string: cuda{{ cuda_compiler_version | replace('.', '') }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }} # [cuda_compiler_version != "None"] string: cpu_h{{ PKG_HASH }}_{{ PKG_BUILDNUM }} # [cuda_compiler_version == "None"] + ignore_run_exports_from: + - {{ compiler('cuda') }} # [(cuda_compiler_version or "").startswith("11")] requirements: build: - {{ compiler('c') }} @@ -54,6 +56,7 @@ outputs: host: - nccl # [linux and cuda_compiler != "None"] run: + - cuda-version >=11.2,<12 # [(cuda_compiler_version or "").startswith("11")] - __cuda # [cuda_compiler != "None"] - name: _py-xgboost-mutex From fe3d7b0ac7c3535da52d496c5da927d44ce3e339 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Thu, 3 Aug 2023 19:51:26 -0700 Subject: [PATCH 10/12] Fix selector spacing --- recipe/meta.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 8b6838a4..45fcc08b 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -23,15 +23,15 @@ requirements: build: - {{ compiler('c') }} - {{ compiler('cxx') }} - - {{ compiler('cuda') }} # [cuda_compiler != "None"] - - git # [not win] - - m2-git # [win] + - {{ compiler('cuda') }} # [cuda_compiler != "None"] + - git # [not win] + - m2-git # [win] - cmake - llvm-openmp # [osx] - libgomp # [linux] - ninja host: - - nccl # [linux and cuda_compiler != "None"] + - nccl # [linux and cuda_compiler != "None"] outputs: - name: libxgboost @@ -47,17 +47,17 @@ outputs: build: - {{ compiler('c') }} - {{ compiler('cxx') }} - - {{ compiler('cuda') }} # [cuda_compiler != "None"] + - {{ compiler('cuda') }} # [cuda_compiler != "None"] - git - cmake - make - llvm-openmp # [osx] - libgomp # [linux] host: - - nccl # [linux and cuda_compiler != "None"] + - nccl # [linux and cuda_compiler != "None"] run: - cuda-version >=11.2,<12 # [(cuda_compiler_version or "").startswith("11")] - - __cuda # [cuda_compiler != "None"] + - __cuda # [cuda_compiler != "None"] - name: _py-xgboost-mutex version: 2.0 From 427e4c62e66cd50b477d650998eb3713a749084a Mon Sep 17 00:00:00 2001 From: jakirkham Date: Thu, 3 Aug 2023 19:51:27 -0700 Subject: [PATCH 11/12] Bump `build/number` to `4` --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 45fcc08b..b4eb4a7c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -16,7 +16,7 @@ source: - 0001-Force-endian-flag-in-cross-compilation-mode.patch # [arm64 or aarch64 or ppc64le] build: - number: 3 + number: 4 skip: true # [win and cuda_compiler != "None"] requirements: From ae4541a99e20c8313e8b707a1ccd95f2b0402d2b Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Fri, 4 Aug 2023 02:57:56 +0000 Subject: [PATCH 12/12] MNT: Re-rendered with conda-build 3.26.0, conda-smithy 3.24.1, and conda-forge-pinning 2023.08.04.02.04.35 --- .azure-pipelines/azure-pipelines-linux.yml | 28 ++++++++-------- .azure-pipelines/azure-pipelines-win.yml | 4 +-- ...a_compilernvcccxx_compiler_version10.yaml} | 0 ...a_compilerNonecxx_compiler_version12.yaml} | 0 ...pilercuda-nvcccxx_compiler_version12.yaml} | 0 ...a_compilernvcccxx_compiler_version10.yaml} | 0 ...a_compilerNonecxx_compiler_version12.yaml} | 0 ...a_compilernvcccxx_compiler_version10.yaml} | 0 ...a_compilerNonecxx_compiler_version12.yaml} | 0 .ci_support/osx_64_.yaml | 2 ++ .ci_support/osx_arm64_.yaml | 2 ++ ...one.yaml => win_64_cuda_compilerNone.yaml} | 5 +++ README.md | 32 +++++++++---------- 13 files changed, 41 insertions(+), 32 deletions(-) rename .ci_support/{linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10.yaml => linux_64_c_compiler_version10cuda_compilernvcccxx_compiler_version10.yaml} (100%) rename .ci_support/{linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12.yaml => linux_64_c_compiler_version12cuda_compilerNonecxx_compiler_version12.yaml} (100%) rename .ci_support/{linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12.yaml => linux_64_c_compiler_version12cuda_compilercuda-nvcccxx_compiler_version12.yaml} (100%) rename .ci_support/{linux_aarch64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml => linux_aarch64_c_compiler_version10cuda_compilernvcccxx_compiler_version10.yaml} (100%) rename .ci_support/{linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml => linux_aarch64_c_compiler_version12cuda_compilerNonecxx_compiler_version12.yaml} (100%) rename .ci_support/{linux_ppc64le_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml => linux_ppc64le_c_compiler_version10cuda_compilernvcccxx_compiler_version10.yaml} (100%) rename .ci_support/{linux_ppc64le_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml => linux_ppc64le_c_compiler_version12cuda_compilerNonecxx_compiler_version12.yaml} (100%) rename .ci_support/{win_64_cuda_compiler_versionNone.yaml => win_64_cuda_compilerNone.yaml} (85%) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 5980136a..530be38d 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,32 +8,32 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10: - CONFIG: linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10 + linux_64_c_compiler_version10cuda_compilernvcccxx_compiler_version10: + CONFIG: linux_64_c_compiler_version10cuda_compilernvcccxx_compiler_version10 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 - linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12: - CONFIG: linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12 + linux_64_c_compiler_version12cuda_compilerNonecxx_compiler_version12: + CONFIG: linux_64_c_compiler_version12cuda_compilerNonecxx_compiler_version12 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12: - CONFIG: linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12 + linux_64_c_compiler_version12cuda_compilercuda-nvcccxx_compiler_version12: + CONFIG: linux_64_c_compiler_version12cuda_compilercuda-nvcccxx_compiler_version12 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10: - CONFIG: linux_aarch64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10 + linux_aarch64_c_compiler_version10cuda_compilernvcccxx_compiler_version10: + CONFIG: linux_aarch64_c_compiler_version10cuda_compilernvcccxx_compiler_version10 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 - linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12: - CONFIG: linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12 + linux_aarch64_c_compiler_version12cuda_compilerNonecxx_compiler_version12: + CONFIG: linux_aarch64_c_compiler_version12cuda_compilerNonecxx_compiler_version12 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10: - CONFIG: linux_ppc64le_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10 + linux_ppc64le_c_compiler_version10cuda_compilernvcccxx_compiler_version10: + CONFIG: linux_ppc64le_c_compiler_version10cuda_compilernvcccxx_compiler_version10 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 - linux_ppc64le_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12: - CONFIG: linux_ppc64le_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12 + linux_ppc64le_c_compiler_version12cuda_compilerNonecxx_compiler_version12: + CONFIG: linux_ppc64le_c_compiler_version12cuda_compilerNonecxx_compiler_version12 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index dcbbd1bc..1950d95f 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,8 +8,8 @@ jobs: vmImage: windows-2022 strategy: matrix: - win_64_cuda_compiler_versionNone: - CONFIG: win_64_cuda_compiler_versionNone + win_64_cuda_compilerNone: + CONFIG: win_64_cuda_compilerNone UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccxx_compiler_version10.yaml similarity index 100% rename from .ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10.yaml rename to .ci_support/linux_64_c_compiler_version10cuda_compilernvcccxx_compiler_version10.yaml diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecxx_compiler_version12.yaml similarity index 100% rename from .ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12.yaml rename to .ci_support/linux_64_c_compiler_version12cuda_compilerNonecxx_compiler_version12.yaml diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccxx_compiler_version12.yaml similarity index 100% rename from .ci_support/linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12.yaml rename to .ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccxx_compiler_version12.yaml diff --git a/.ci_support/linux_aarch64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml b/.ci_support/linux_aarch64_c_compiler_version10cuda_compilernvcccxx_compiler_version10.yaml similarity index 100% rename from .ci_support/linux_aarch64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml rename to .ci_support/linux_aarch64_c_compiler_version10cuda_compilernvcccxx_compiler_version10.yaml diff --git a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecxx_compiler_version12.yaml similarity index 100% rename from .ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml rename to .ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecxx_compiler_version12.yaml diff --git a/.ci_support/linux_ppc64le_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml b/.ci_support/linux_ppc64le_c_compiler_version10cuda_compilernvcccxx_compiler_version10.yaml similarity index 100% rename from .ci_support/linux_ppc64le_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml rename to .ci_support/linux_ppc64le_c_compiler_version10cuda_compilernvcccxx_compiler_version10.yaml diff --git a/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml b/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilerNonecxx_compiler_version12.yaml similarity index 100% rename from .ci_support/linux_ppc64le_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml rename to .ci_support/linux_ppc64le_c_compiler_version12cuda_compilerNonecxx_compiler_version12.yaml diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 1f72f6d0..4b03a974 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -8,6 +8,8 @@ channel_sources: - conda-forge channel_targets: - conda-forge main +cuda_compiler: +- None cuda_compiler_version: - None cxx_compiler: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 43fc5af1..c76b3cab 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -8,6 +8,8 @@ channel_sources: - conda-forge channel_targets: - conda-forge main +cuda_compiler: +- None cuda_compiler_version: - None cxx_compiler: diff --git a/.ci_support/win_64_cuda_compiler_versionNone.yaml b/.ci_support/win_64_cuda_compilerNone.yaml similarity index 85% rename from .ci_support/win_64_cuda_compiler_versionNone.yaml rename to .ci_support/win_64_cuda_compilerNone.yaml index 3089a0cb..399ceff9 100644 --- a/.ci_support/win_64_cuda_compiler_versionNone.yaml +++ b/.ci_support/win_64_cuda_compilerNone.yaml @@ -4,6 +4,8 @@ channel_sources: - conda-forge channel_targets: - conda-forge main +cuda_compiler: +- None cuda_compiler_version: - None cxx_compiler: @@ -28,3 +30,6 @@ r_base: - '4.1' target_platform: - win-64 +zip_keys: +- - cuda_compiler + - cuda_compiler_version diff --git a/README.md b/README.md index 03cb3c61..1710545f 100644 --- a/README.md +++ b/README.md @@ -41,52 +41,52 @@ Current build status
VariantStatus
linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10 - variant + variant
linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12 - variant + variant
linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12 - variant + variant
- + - + - + - + - + - + - + @@ -104,10 +104,10 @@ Current build status - +
VariantStatus
linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10linux_64_c_compiler_version10cuda_compilernvcccxx_compiler_version10 - variant + variant
linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12linux_64_c_compiler_version12cuda_compilerNonecxx_compiler_version12 - variant + variant
linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12linux_64_c_compiler_version12cuda_compilercuda-nvcccxx_compiler_version12 - variant + variant
linux_aarch64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10linux_aarch64_c_compiler_version10cuda_compilernvcccxx_compiler_version10 - variant + variant
linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12linux_aarch64_c_compiler_version12cuda_compilerNonecxx_compiler_version12 - variant + variant
linux_ppc64le_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10linux_ppc64le_c_compiler_version10cuda_compilernvcccxx_compiler_version10 - variant + variant
linux_ppc64le_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12linux_ppc64le_c_compiler_version12cuda_compilerNonecxx_compiler_version12 - variant + variant
win_64_cuda_compiler_versionNonewin_64_cuda_compilerNone - variant + variant