From d2806388044bab804a90b6fabf38f3e602dfec45 Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Wed, 15 May 2024 21:29:55 +0000 Subject: [PATCH 1/3] Update recipe --- recipe/meta.yaml | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 99cea9e13..5813a50ea 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -2,7 +2,7 @@ {% set cuda_enabled = cuda_compiler_version != "None" %} {% set build_ext_version = "5.0.0" %} {% set build_ext = "cuda" if cuda_enabled else "cpu" %} -{% set proc_build_number = "0" %} +{% set proc_build_number = "1" %} {% set llvm_version = "16" %} # see https://github.com/apache/arrow/blob/apache-arrow-10.0.1/cpp/CMakeLists.txt#L88-L90 @@ -25,7 +25,7 @@ source: folder: testing build: - number: 0 + number: 1 # for cuda support, building with one version is enough to be compatible with # all later versions, since arrow is only using libcuda, and not libcudart. skip: true # [cuda_compiler_version not in ("None", cuda_compiler_version_min)] @@ -110,14 +110,14 @@ outputs: build: string: h{{ PKG_HASH }}_{{ PKG_BUILDNUM }}_{{ build_ext }} run_exports: - - {{ pin_subpackage("libarrow", max_pin="x") }} - - {{ pin_subpackage("libarrow-acero", max_pin="x") }} - - {{ pin_subpackage("libarrow-dataset", max_pin="x") }} - - {{ pin_subpackage("libarrow-flight", max_pin="x") }} - - {{ pin_subpackage("libarrow-flight-sql", max_pin="x") }} - - {{ pin_subpackage("libarrow-gandiva", max_pin="x") }} - - {{ pin_subpackage("libarrow-substrait", max_pin="x") }} - - {{ pin_subpackage("libparquet", max_pin="x") }} + - {{ pin_subpackage("libarrow", max_pin="x.x") }} + - {{ pin_subpackage("libarrow-acero", max_pin="x.x") }} + - {{ pin_subpackage("libarrow-dataset", max_pin="x.x") }} + - {{ pin_subpackage("libarrow-flight", max_pin="x.x") }} + - {{ pin_subpackage("libarrow-flight-sql", max_pin="x.x") }} + - {{ pin_subpackage("libarrow-gandiva", max_pin="x.x") }} + - {{ pin_subpackage("libarrow-substrait", max_pin="x.x") }} + - {{ pin_subpackage("libparquet", max_pin="x.x") }} requirements: build: - cmake @@ -158,7 +158,7 @@ outputs: build: string: h{{ PKG_HASH }}_{{ PKG_BUILDNUM }}_{{ build_ext }} run_exports: - - {{ pin_subpackage("libarrow", max_pin="x") }} + - {{ pin_subpackage("libarrow", max_pin="x.x") }} ignore_run_exports_from: - {{ compiler("cuda") }} # [cuda_compiler_version != "None"] # arrow only uses headers on osx/win, apparently @@ -277,7 +277,7 @@ outputs: build: string: h{{ PKG_HASH }}_{{ PKG_BUILDNUM }}_{{ build_ext }} run_exports: - - {{ pin_subpackage("libarrow-acero", max_pin="x") }} + - {{ pin_subpackage("libarrow-acero", max_pin="x.x") }} requirements: build: - cmake @@ -322,7 +322,7 @@ outputs: build: string: h{{ PKG_HASH }}_{{ PKG_BUILDNUM }}_{{ build_ext }} run_exports: - - {{ pin_subpackage("libarrow-dataset", max_pin="x") }} + - {{ pin_subpackage("libarrow-dataset", max_pin="x.x") }} requirements: build: - cmake @@ -371,7 +371,7 @@ outputs: build: string: h{{ PKG_HASH }}_{{ PKG_BUILDNUM }}_{{ build_ext }} run_exports: - - {{ pin_subpackage("libarrow-flight", max_pin="x") }} + - {{ pin_subpackage("libarrow-flight", max_pin="x.x") }} requirements: build: - cmake @@ -426,7 +426,7 @@ outputs: build: string: h{{ PKG_HASH }}_{{ PKG_BUILDNUM }}_{{ build_ext }} run_exports: - - {{ pin_subpackage("libarrow-flight-sql", max_pin="x") }} + - {{ pin_subpackage("libarrow-flight-sql", max_pin="x.x") }} requirements: build: - cmake @@ -477,7 +477,7 @@ outputs: build: string: h{{ PKG_HASH }}_{{ PKG_BUILDNUM }}_{{ build_ext }} run_exports: - - {{ pin_subpackage("libarrow-gandiva", max_pin="x") }} + - {{ pin_subpackage("libarrow-gandiva", max_pin="x.x") }} requirements: build: - cmake @@ -529,7 +529,7 @@ outputs: build: string: h{{ PKG_HASH }}_{{ PKG_BUILDNUM }}_{{ build_ext }} run_exports: - - {{ pin_subpackage("libarrow-substrait", max_pin="x") }} + - {{ pin_subpackage("libarrow-substrait", max_pin="x.x") }} requirements: build: - cmake @@ -586,7 +586,7 @@ outputs: build: string: h{{ PKG_HASH }}_{{ PKG_BUILDNUM }}_{{ build_ext }} run_exports: - - {{ pin_subpackage("libparquet", max_pin="x") }} + - {{ pin_subpackage("libparquet", max_pin="x.x") }} requirements: build: - cmake From 8abae49f92c7bf7e97dba5193f2fa3bfbbcd91d6 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Wed, 15 May 2024 21:37:07 +0000 Subject: [PATCH 2/3] MNT: Re-rendered with conda-build 24.5.0, conda-smithy 3.35.1, and conda-forge-pinning 2024.05.15.19.07.12 --- .azure-pipelines/azure-pipelines-linux.yml | 8 ++-- ...er_version11.8cxx_compiler_version11.yaml} | 0 ...er_versionNonecxx_compiler_version12.yaml} | 0 .ci_support/migrations/aws_crt_cpp0268.yaml | 9 ---- ...il20230802_libgrpc157_libprotobuf4234.yaml | 13 ------ ...il20240116_libgrpc161_libprotobuf4252.yaml | 22 --------- .../migrations/libgoogle_cloud223.yaml | 46 ------------------- .../libgrpc162_libprotobuf4253.yaml | 23 ---------- .ci_support/migrations/ucx116.yaml | 8 ---- README.md | 8 ++-- 10 files changed, 8 insertions(+), 129 deletions(-) rename .ci_support/{linux_64_c_compiler_version11c_stdlib_version2.17cuda_compiler_version11.8cxx_compiler_version11.yaml => linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml} (100%) rename .ci_support/{linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12.yaml => linux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml} (100%) delete mode 100644 .ci_support/migrations/aws_crt_cpp0268.yaml delete mode 100644 .ci_support/migrations/libabseil20230802_libgrpc157_libprotobuf4234.yaml delete mode 100644 .ci_support/migrations/libabseil20240116_libgrpc161_libprotobuf4252.yaml delete mode 100644 .ci_support/migrations/libgoogle_cloud223.yaml delete mode 100644 .ci_support/migrations/libgrpc162_libprotobuf4253.yaml delete mode 100644 .ci_support/migrations/ucx116.yaml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 5c5aec3d0..f7617462e 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,12 +8,12 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_c_compiler_version11c_stdlib_version2.17cuda_compiler_version11.8cxx_compiler_version11: - CONFIG: linux_64_c_compiler_version11c_stdlib_version2.17cuda_compiler_version11.8cxx_compiler_version11 + linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11: + CONFIG: linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.8 - linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12: - CONFIG: linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12 + linux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12: + CONFIG: linux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_aarch64_c_compiler_version10cuda_compiler_version11.8cxx_compiler_version10: diff --git a/.ci_support/linux_64_c_compiler_version11c_stdlib_version2.17cuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml similarity index 100% rename from .ci_support/linux_64_c_compiler_version11c_stdlib_version2.17cuda_compiler_version11.8cxx_compiler_version11.yaml rename to .ci_support/linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml diff --git a/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12.yaml b/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml similarity index 100% rename from .ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12.yaml rename to .ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml diff --git a/.ci_support/migrations/aws_crt_cpp0268.yaml b/.ci_support/migrations/aws_crt_cpp0268.yaml deleted file mode 100644 index b9c294404..000000000 --- a/.ci_support/migrations/aws_crt_cpp0268.yaml +++ /dev/null @@ -1,9 +0,0 @@ -__migrator: - build_number: 1 - commit_message: Rebuild for aws_crt_cpp 0.26.8 - kind: version - migration_number: 1 - automerge: true -aws_crt_cpp: -- 0.26.8 -migrator_ts: 1713020524.6837494 diff --git a/.ci_support/migrations/libabseil20230802_libgrpc157_libprotobuf4234.yaml b/.ci_support/migrations/libabseil20230802_libgrpc157_libprotobuf4234.yaml deleted file mode 100644 index 3781ea0c2..000000000 --- a/.ci_support/migrations/libabseil20230802_libgrpc157_libprotobuf4234.yaml +++ /dev/null @@ -1,13 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -libabseil: -- 20230802 -libgrpc: -- "1.57" -libprotobuf: -- 4.23.4 -MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64] -- "10.13" # [osx and x86_64] -migrator_ts: 1692632590.658328 diff --git a/.ci_support/migrations/libabseil20240116_libgrpc161_libprotobuf4252.yaml b/.ci_support/migrations/libabseil20240116_libgrpc161_libprotobuf4252.yaml deleted file mode 100644 index 08cd5a028..000000000 --- a/.ci_support/migrations/libabseil20240116_libgrpc161_libprotobuf4252.yaml +++ /dev/null @@ -1,22 +0,0 @@ -__migrator: - build_number: 1 - commit_message: Rebuild for libabseil 20240116, libgrp 1.61, libprotobuf 4.25.2 - kind: version - migration_number: 1 - exclude: - - abseil-cpp - - grpc-cpp - - libprotobuf - # this shouldn't attempt to modify the python feedstocks - - protobuf -libabseil: -- "20240116" -libgrpc: -- "1.61" -libprotobuf: -- 4.25.2 -# already covered by libabseil20230802_libgrpc157_libprotobuf4234, -# which we cannot delete yet, but keep for clarity -MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64] -- "10.13" # [osx and x86_64] -migrator_ts: 1705991934.9119136 diff --git a/.ci_support/migrations/libgoogle_cloud223.yaml b/.ci_support/migrations/libgoogle_cloud223.yaml deleted file mode 100644 index 39f4e0969..000000000 --- a/.ci_support/migrations/libgoogle_cloud223.yaml +++ /dev/null @@ -1,46 +0,0 @@ -__migrator: - build_number: 1 - commit_message: Rebuild for libgoogle_cloud 2.23 - kind: version - migration_number: 1 -google_cloud_cpp: - - '2.23' -libgoogle_cloud: - - '2.23' -libgoogle_cloud_devel: - - '2.23' -libgoogle_cloud_all_devel: - - '2.23' -libgoogle_cloud_aiplatform_devel: - - '2.23' -libgoogle_cloud_automl_devel: - - '2.23' -libgoogle_cloud_bigquery_devel: - - '2.23' -libgoogle_cloud_bigtable_devel: - - '2.23' -libgoogle_cloud_compute_devel: - - '2.23' -libgoogle_cloud_dialogflow_cx_devel: - - '2.23' -libgoogle_cloud_dialogflow_es_devel: - - '2.23' -libgoogle_cloud_discoveryengine_devel: - - '2.23' -libgoogle_cloud_dlp_devel: - - '2.23' -libgoogle_cloud_iam_devel: - - '2.23' -libgoogle_cloud_oauth2_devel: - - '2.23' -libgoogle_cloud_policytroubleshooter_devel: - - '2.23' -libgoogle_cloud_pubsub_devel: - - '2.23' -libgoogle_cloud_spanner_devel: - - '2.23' -libgoogle_cloud_speech_devel: - - '2.23' -libgoogle_cloud_storage_devel: - - '2.23' -migrator_ts: 1713301249.438007 diff --git a/.ci_support/migrations/libgrpc162_libprotobuf4253.yaml b/.ci_support/migrations/libgrpc162_libprotobuf4253.yaml deleted file mode 100644 index 16b401a5b..000000000 --- a/.ci_support/migrations/libgrpc162_libprotobuf4253.yaml +++ /dev/null @@ -1,23 +0,0 @@ -__migrator: - build_number: 1 - commit_message: Rebuild for libprotobuf 4.25.3 - kind: version - migration_number: 1 - exclude: - - abseil-cpp - - grpc-cpp - - libprotobuf - - protobuf -libgrpc: -- "1.62" -libprotobuf: -- 4.25.3 -# keep abseil bump from libabseil20240116_libgrpc161_libprotobuf4252; -# this ensures that this migration applies also without the previous one -libabseil: -- "20240116" -# already covered by libabseil20230802_libgrpc157_libprotobuf4234, -# which we cannot delete yet, but keep for clarity -MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64] -- "10.13" # [osx and x86_64] -migrator_ts: 1709522594.9193177 diff --git a/.ci_support/migrations/ucx116.yaml b/.ci_support/migrations/ucx116.yaml deleted file mode 100644 index 20d1b390a..000000000 --- a/.ci_support/migrations/ucx116.yaml +++ /dev/null @@ -1,8 +0,0 @@ -__migrator: - build_number: 1 - commit_message: Rebuild for ucx 1.16.0 - kind: version - migration_number: 1 -migrator_ts: 1714785040.2362041 -ucx: -- '1.16.0' diff --git a/README.md b/README.md index 1cb7aa653..7f2eb50b9 100644 --- a/README.md +++ b/README.md @@ -112,17 +112,17 @@ Current build status - + - + From 06163bd2bba32415446a7a55b3571279dad29227 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sat, 18 May 2024 11:08:12 +1100 Subject: [PATCH 3/3] fix some remaining too-loose `max_pin`s; unbump proc_build_number --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 5813a50ea..ae4ed5dbe 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -2,7 +2,7 @@ {% set cuda_enabled = cuda_compiler_version != "None" %} {% set build_ext_version = "5.0.0" %} {% set build_ext = "cuda" if cuda_enabled else "cpu" %} -{% set proc_build_number = "1" %} +{% set proc_build_number = "0" %} {% set llvm_version = "16" %} # see https://github.com/apache/arrow/blob/apache-arrow-10.0.1/cpp/CMakeLists.txt#L88-L90 @@ -487,7 +487,7 @@ outputs: - {{ stdlib("c") }} - {{ compiler("cxx") }} host: - - {{ pin_subpackage("libarrow", max_pin="x") }} + - {{ pin_subpackage("libarrow", exact=True) }} - libutf8proc # gandiva requires shared libllvm; needs to match version used at build time - llvm {{ llvm_version }} # [unix] @@ -596,7 +596,7 @@ outputs: - {{ stdlib("c") }} - {{ compiler("cxx") }} host: - - {{ pin_subpackage("libarrow", max_pin="x") }} + - {{ pin_subpackage("libarrow", exact=True) }} - openssl - thrift-cpp run:
VariantStatus
linux_64_c_compiler_version11c_stdlib_version2.17cuda_compiler_version11.8cxx_compiler_version11linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11 - variant + variant
linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12linux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12 - variant + variant