From 71a65ee1e4c939647413d320757bf3c1c72bc682 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 20 Jul 2023 22:19:18 +0200 Subject: [PATCH] MNT: Re-rendered with conda-build 3.25.0, conda-smithy 3.24.0, and conda-forge-pinning 2023.07.19.16.49.37 --- .azure-pipelines/azure-pipelines-linux.yml | 6 +++--- .azure-pipelines/azure-pipelines-win.yml | 4 ++-- ....yaml => linux_64_cuda_compiler_version11.2.yaml} | 12 ++++++------ .ci_support/linux_64_cuda_compiler_versionNone.yaml | 2 +- .ci_support/migrations/aws_crt_cpp0203.yaml | 8 -------- .ci_support/migrations/orc190.yaml | 7 ------- ....2.yaml => win_64_cuda_compiler_version11.2.yaml} | 4 ++-- .ci_support/win_64_cuda_compiler_versionNone.yaml | 2 +- README.md | 8 ++++---- 9 files changed, 19 insertions(+), 34 deletions(-) rename .ci_support/{linux_64_cuda_compiler_version10.2.yaml => linux_64_cuda_compiler_version11.2.yaml} (91%) delete mode 100644 .ci_support/migrations/aws_crt_cpp0203.yaml delete mode 100644 .ci_support/migrations/orc190.yaml rename .ci_support/{win_64_cuda_compiler_version10.2.yaml => win_64_cuda_compiler_version11.2.yaml} (97%) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 6cd2103f4..1bc1dd1ed 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,10 +8,10 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_cuda_compiler_version10.2: - CONFIG: linux_64_cuda_compiler_version10.2 + linux_64_cuda_compiler_version11.2: + CONFIG: linux_64_cuda_compiler_version11.2 UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-cuda:10.2 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 linux_64_cuda_compiler_versionNone: CONFIG: linux_64_cuda_compiler_versionNone UPLOAD_PACKAGES: 'True' diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index c091f43e9..40f42b025 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_version10.2: - CONFIG: win_64_cuda_compiler_version10.2 + win_64_cuda_compiler_version11.2: + CONFIG: win_64_cuda_compiler_version11.2 UPLOAD_PACKAGES: 'True' win_64_cuda_compiler_versionNone: CONFIG: win_64_cuda_compiler_versionNone diff --git a/.ci_support/linux_64_cuda_compiler_version10.2.yaml b/.ci_support/linux_64_cuda_compiler_version11.2.yaml similarity index 91% rename from .ci_support/linux_64_cuda_compiler_version10.2.yaml rename to .ci_support/linux_64_cuda_compiler_version11.2.yaml index 4403a295a..1cdcec199 100644 --- a/.ci_support/linux_64_cuda_compiler_version10.2.yaml +++ b/.ci_support/linux_64_cuda_compiler_version11.2.yaml @@ -7,9 +7,9 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '7' +- '10' cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: @@ -17,15 +17,15 @@ channel_targets: cuda_compiler: - nvcc cuda_compiler_version: -- '10.2' +- '11.2' cuda_compiler_version_min: -- '10.2' +- '11.2' cxx_compiler: - gxx cxx_compiler_version: -- '7' +- '10' docker_image: -- quay.io/condaforge/linux-anvil-cos7-cuda:10.2 +- quay.io/condaforge/linux-anvil-cuda:11.2 gflags: - '2.2' glog: diff --git a/.ci_support/linux_64_cuda_compiler_versionNone.yaml b/.ci_support/linux_64_cuda_compiler_versionNone.yaml index 11b231ce6..5be5b58a7 100644 --- a/.ci_support/linux_64_cuda_compiler_versionNone.yaml +++ b/.ci_support/linux_64_cuda_compiler_versionNone.yaml @@ -19,7 +19,7 @@ cuda_compiler: cuda_compiler_version: - None cuda_compiler_version_min: -- '10.2' +- '11.2' cxx_compiler: - gxx cxx_compiler_version: diff --git a/.ci_support/migrations/aws_crt_cpp0203.yaml b/.ci_support/migrations/aws_crt_cpp0203.yaml deleted file mode 100644 index c8af68b9f..000000000 --- a/.ci_support/migrations/aws_crt_cpp0203.yaml +++ /dev/null @@ -1,8 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 - automerge: true -aws_crt_cpp: -- 0.20.3 -migrator_ts: 1688632499.3242948 diff --git a/.ci_support/migrations/orc190.yaml b/.ci_support/migrations/orc190.yaml deleted file mode 100644 index 776577295..000000000 --- a/.ci_support/migrations/orc190.yaml +++ /dev/null @@ -1,7 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -migrator_ts: 1688114401.8279328 -orc: -- 1.9.0 diff --git a/.ci_support/win_64_cuda_compiler_version10.2.yaml b/.ci_support/win_64_cuda_compiler_version11.2.yaml similarity index 97% rename from .ci_support/win_64_cuda_compiler_version10.2.yaml rename to .ci_support/win_64_cuda_compiler_version11.2.yaml index a08f8b085..f75d92e27 100644 --- a/.ci_support/win_64_cuda_compiler_version10.2.yaml +++ b/.ci_support/win_64_cuda_compiler_version11.2.yaml @@ -15,9 +15,9 @@ channel_targets: cuda_compiler: - nvcc cuda_compiler_version: -- '10.2' +- '11.2' cuda_compiler_version_min: -- '10.2' +- '11.2' cxx_compiler: - vs2019 gflags: diff --git a/.ci_support/win_64_cuda_compiler_versionNone.yaml b/.ci_support/win_64_cuda_compiler_versionNone.yaml index 0a02e47e3..6d8fb15b1 100644 --- a/.ci_support/win_64_cuda_compiler_versionNone.yaml +++ b/.ci_support/win_64_cuda_compiler_versionNone.yaml @@ -17,7 +17,7 @@ cuda_compiler: cuda_compiler_version: - None cuda_compiler_version_min: -- '10.2' +- '11.2' cxx_compiler: - vs2019 gflags: diff --git a/README.md b/README.md index 6b5d2ac31..a006dd7c0 100644 --- a/README.md +++ b/README.md @@ -67,10 +67,10 @@ Current build status - + @@ -123,10 +123,10 @@ Current build status - +
VariantStatus
linux_64_cuda_compiler_version10.2linux_64_cuda_compiler_version11.2 - variant + variant
win_64_cuda_compiler_version10.2win_64_cuda_compiler_version11.2 - variant + variant