From 0f8350f33eb7fb934efe640ff295e720466705ec Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Wed, 7 May 2025 08:44:07 -0500 Subject: [PATCH 01/55] Rebuild for orc 2.1.2 (#1750) * Rebuild for orc 2.1.2 * MNT: Re-rendered with conda-build 25.4.2, conda-smithy 3.48.1, and conda-forge-pinning 2025.05.07.08.56.44 --- .azure-pipelines/azure-pipelines-win.yml | 8 ++-- ...ler_version11.8cxx_compiler_version11.yaml | 2 +- ...ler_versionNonecxx_compiler_version13.yaml | 2 +- ...ler_version11.8cxx_compiler_version11.yaml | 2 +- ...ler_versionNonecxx_compiler_version13.yaml | 2 +- ...ler_version11.8cxx_compiler_version11.yaml | 2 +- ...ler_versionNonecxx_compiler_version13.yaml | 2 +- .ci_support/migrations/aws_crt_cpp0324.yaml | 9 ---- .ci_support/migrations/libboost186.yaml | 14 ------- .ci_support/migrations/orc212.yaml | 8 ++++ .ci_support/osx_64_.yaml | 2 +- .ci_support/osx_arm64_.yaml | 2 +- ... => win_64_cuda_compiler_version11.8.yaml} | 2 +- ... => win_64_cuda_compiler_versionNone.yaml} | 2 +- .scripts/run_win_build.bat | 2 +- README.md | 42 +++++++++---------- recipe/meta.yaml | 2 +- 17 files changed, 45 insertions(+), 60 deletions(-) delete mode 100644 .ci_support/migrations/aws_crt_cpp0324.yaml delete mode 100644 .ci_support/migrations/libboost186.yaml create mode 100644 .ci_support/migrations/orc212.yaml rename .ci_support/{win_64_cuda_compilernvcccuda_compiler_version11.8.yaml => win_64_cuda_compiler_version11.8.yaml} (98%) rename .ci_support/{win_64_cuda_compilerNonecuda_compiler_versionNone.yaml => win_64_cuda_compiler_versionNone.yaml} (98%) diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index c6ed88960..89dcdd379 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,11 +8,11 @@ jobs: vmImage: windows-2022 strategy: matrix: - win_64_cuda_compilerNonecuda_compiler_versionNone: - CONFIG: win_64_cuda_compilerNonecuda_compiler_versionNone + win_64_cuda_compiler_version11.8: + CONFIG: win_64_cuda_compiler_version11.8 UPLOAD_PACKAGES: 'True' - win_64_cuda_compilernvcccuda_compiler_version11.8: - CONFIG: win_64_cuda_compilernvcccuda_compiler_version11.8 + win_64_cuda_compiler_versionNone: + CONFIG: win_64_cuda_compiler_versionNone UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml index 8c3881ddd..cad6579b2 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml @@ -65,7 +65,7 @@ lz4_c: openssl: - '3' orc: -- 2.1.1 +- 2.1.2 re2: - 2024.07.02 snappy: diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml index 0faf91694..c760b6e0d 100644 --- a/.ci_support/linux_64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml +++ b/.ci_support/linux_64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml @@ -65,7 +65,7 @@ lz4_c: openssl: - '3' orc: -- 2.1.1 +- 2.1.2 re2: - 2024.07.02 snappy: diff --git a/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml index 30f814b1e..dc52c8e28 100644 --- a/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml @@ -65,7 +65,7 @@ lz4_c: openssl: - '3' orc: -- 2.1.1 +- 2.1.2 re2: - 2024.07.02 snappy: diff --git a/.ci_support/linux_aarch64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml b/.ci_support/linux_aarch64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml index 282989dbc..d529698dd 100644 --- a/.ci_support/linux_aarch64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml @@ -65,7 +65,7 @@ lz4_c: openssl: - '3' orc: -- 2.1.1 +- 2.1.2 re2: - 2024.07.02 snappy: diff --git a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml index 462c615c0..38604d86e 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml @@ -65,7 +65,7 @@ lz4_c: openssl: - '3' orc: -- 2.1.1 +- 2.1.2 re2: - 2024.07.02 snappy: diff --git a/.ci_support/linux_ppc64le_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml b/.ci_support/linux_ppc64le_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml index 2500e271f..c31a26c4a 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml @@ -65,7 +65,7 @@ lz4_c: openssl: - '3' orc: -- 2.1.1 +- 2.1.2 re2: - 2024.07.02 snappy: diff --git a/.ci_support/migrations/aws_crt_cpp0324.yaml b/.ci_support/migrations/aws_crt_cpp0324.yaml deleted file mode 100644 index a62e28610..000000000 --- a/.ci_support/migrations/aws_crt_cpp0324.yaml +++ /dev/null @@ -1,9 +0,0 @@ -__migrator: - build_number: 1 - commit_message: Rebuild for aws_crt_cpp 0.32.4 - kind: version - migration_number: 1 - automerge: true -aws_crt_cpp: -- 0.32.4 -migrator_ts: 1744842909.2272944 diff --git a/.ci_support/migrations/libboost186.yaml b/.ci_support/migrations/libboost186.yaml deleted file mode 100644 index 001c6a638..000000000 --- a/.ci_support/migrations/libboost186.yaml +++ /dev/null @@ -1,14 +0,0 @@ -__migrator: - build_number: 1 - kind: version - commit_message: "Rebuild for libboost 1.86" - migration_number: 1 -assimp: -- 5.4.2 -libboost_devel: -- "1.86" -libboost_headers: -- "1.86" -libboost_python_devel: -- "1.86" -migrator_ts: 1723764795.6693385 diff --git a/.ci_support/migrations/orc212.yaml b/.ci_support/migrations/orc212.yaml new file mode 100644 index 000000000..f8ef43a70 --- /dev/null +++ b/.ci_support/migrations/orc212.yaml @@ -0,0 +1,8 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for orc 2.1.2 + kind: version + migration_number: 1 +migrator_ts: 1746607955.8238297 +orc: +- 2.1.2 diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 214c80336..62a7cde67 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -63,7 +63,7 @@ macos_machine: openssl: - '3' orc: -- 2.1.1 +- 2.1.2 re2: - 2024.07.02 snappy: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index ff314a802..7ced8c2c5 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -63,7 +63,7 @@ macos_machine: openssl: - '3' orc: -- 2.1.1 +- 2.1.2 re2: - 2024.07.02 snappy: diff --git a/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8.yaml b/.ci_support/win_64_cuda_compiler_version11.8.yaml similarity index 98% rename from .ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8.yaml rename to .ci_support/win_64_cuda_compiler_version11.8.yaml index 88bfe0321..5a8b89796 100644 --- a/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8.yaml +++ b/.ci_support/win_64_cuda_compiler_version11.8.yaml @@ -49,7 +49,7 @@ lz4_c: openssl: - '3' orc: -- 2.1.1 +- 2.1.2 re2: - 2024.07.02 snappy: diff --git a/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNone.yaml b/.ci_support/win_64_cuda_compiler_versionNone.yaml similarity index 98% rename from .ci_support/win_64_cuda_compilerNonecuda_compiler_versionNone.yaml rename to .ci_support/win_64_cuda_compiler_versionNone.yaml index 60a22e6ae..352891787 100644 --- a/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNone.yaml +++ b/.ci_support/win_64_cuda_compiler_versionNone.yaml @@ -49,7 +49,7 @@ lz4_c: openssl: - '3' orc: -- 2.1.1 +- 2.1.2 re2: - 2024.07.02 snappy: diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 283e14388..297498b12 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -25,7 +25,7 @@ set "MICROMAMBA_EXE=%MICROMAMBA_TMPDIR%\micromamba.exe" echo Downloading micromamba %MICROMAMBA_VERSION% if not exist "%MICROMAMBA_TMPDIR%" mkdir "%MICROMAMBA_TMPDIR%" -certutil -urlcache -split -f "%MICROMAMBA_URL%" "%MICROMAMBA_EXE%" +powershell -ExecutionPolicy Bypass -Command "(New-Object Net.WebClient).DownloadFile('%MICROMAMBA_URL%', '%MICROMAMBA_EXE%')" if !errorlevel! neq 0 exit /b !errorlevel! echo Creating environment diff --git a/README.md b/README.md index c0f928751..0dfd9a675 100644 --- a/README.md +++ b/README.md @@ -40,59 +40,59 @@ Package license: Apache-2.0 Summary: C++ libraries for Apache Arrow Acero -About libarrow-flight ---------------------- +About libarrow-dataset +---------------------- Home: http://github.com/apache/arrow Package license: Apache-2.0 -Summary: C++ libraries for Apache Arrow Flight +Summary: C++ libraries for Apache Arrow Dataset -About libarrow-gandiva ----------------------- +About libarrow-flight +--------------------- Home: http://github.com/apache/arrow Package license: Apache-2.0 -Summary: C++ libraries for Apache Arrow Gandiva +Summary: C++ libraries for Apache Arrow Flight -About libparquet ----------------- +About libarrow-flight-sql +------------------------- Home: http://github.com/apache/arrow Package license: Apache-2.0 -Summary: C++ libraries for Apache Parquet +Summary: C++ libraries for Apache Arrow Flight SQL -About libarrow-dataset +About libarrow-gandiva ---------------------- Home: http://github.com/apache/arrow Package license: Apache-2.0 -Summary: C++ libraries for Apache Arrow Dataset +Summary: C++ libraries for Apache Arrow Gandiva -About libarrow-flight-sql -------------------------- +About libarrow-substrait +------------------------ Home: http://github.com/apache/arrow Package license: Apache-2.0 -Summary: C++ libraries for Apache Arrow Flight SQL +Summary: C++ libraries for Apache Arrow Substrait -About libarrow-substrait ------------------------- +About libparquet +---------------- Home: http://github.com/apache/arrow Package license: Apache-2.0 -Summary: C++ libraries for Apache Arrow Substrait +Summary: C++ libraries for Apache Parquet Current build status ==================== @@ -168,17 +168,17 @@ Current build status - win_64_cuda_compilerNonecuda_compiler_versionNone + win_64_cuda_compiler_version11.8 - variant + variant - win_64_cuda_compilernvcccuda_compiler_version11.8 + win_64_cuda_compiler_versionNone - variant + variant diff --git a/recipe/meta.yaml b/recipe/meta.yaml index cb30f0e49..a3ca6ca6a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -38,7 +38,7 @@ source: folder: cpp/submodules/parquet-testing build: - number: 8 + number: 9 # 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)] From d9bfc7c60685a8a6660e5d3c55385f5eb97b8114 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Wed, 7 May 2025 12:31:38 -0500 Subject: [PATCH 02/55] Rebuild for aws_crt_cpp 0.32.5 (#1754) * Rebuild for aws_crt_cpp 0.32.5 * MNT: Re-rendered with conda-build 25.4.2, conda-smithy 3.48.1, and conda-forge-pinning 2025.05.07.13.46.03 --- ...11cuda_compiler_version11.8cxx_compiler_version11.yaml | 2 +- ...13cuda_compiler_versionNonecxx_compiler_version13.yaml | 2 +- ...11cuda_compiler_version11.8cxx_compiler_version11.yaml | 2 +- ...13cuda_compiler_versionNonecxx_compiler_version13.yaml | 2 +- ...11cuda_compiler_version11.8cxx_compiler_version11.yaml | 2 +- ...13cuda_compiler_versionNonecxx_compiler_version13.yaml | 2 +- .ci_support/migrations/aws_crt_cpp0325.yaml | 8 ++++++++ .ci_support/migrations/orc212.yaml | 8 -------- .ci_support/osx_64_.yaml | 2 +- .ci_support/osx_arm64_.yaml | 2 +- .ci_support/win_64_cuda_compiler_version11.8.yaml | 2 +- .ci_support/win_64_cuda_compiler_versionNone.yaml | 2 +- recipe/meta.yaml | 2 +- 13 files changed, 19 insertions(+), 19 deletions(-) create mode 100644 .ci_support/migrations/aws_crt_cpp0325.yaml delete mode 100644 .ci_support/migrations/orc212.yaml diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml index cad6579b2..91a9893b1 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml @@ -1,5 +1,5 @@ aws_crt_cpp: -- 0.32.4 +- 0.32.5 aws_sdk_cpp: - 1.11.510 azure_core_cpp: diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml index c760b6e0d..1aad25318 100644 --- a/.ci_support/linux_64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml +++ b/.ci_support/linux_64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml @@ -1,5 +1,5 @@ aws_crt_cpp: -- 0.32.4 +- 0.32.5 aws_sdk_cpp: - 1.11.510 azure_core_cpp: diff --git a/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml index dc52c8e28..4dccfcb77 100644 --- a/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml @@ -1,5 +1,5 @@ aws_crt_cpp: -- 0.32.4 +- 0.32.5 aws_sdk_cpp: - 1.11.510 azure_core_cpp: diff --git a/.ci_support/linux_aarch64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml b/.ci_support/linux_aarch64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml index d529698dd..6b8f551fc 100644 --- a/.ci_support/linux_aarch64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml @@ -1,5 +1,5 @@ aws_crt_cpp: -- 0.32.4 +- 0.32.5 aws_sdk_cpp: - 1.11.510 azure_core_cpp: diff --git a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml index 38604d86e..0c7145e3c 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml @@ -1,5 +1,5 @@ aws_crt_cpp: -- 0.32.4 +- 0.32.5 aws_sdk_cpp: - 1.11.510 azure_core_cpp: diff --git a/.ci_support/linux_ppc64le_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml b/.ci_support/linux_ppc64le_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml index c31a26c4a..7dde4f060 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml @@ -1,5 +1,5 @@ aws_crt_cpp: -- 0.32.4 +- 0.32.5 aws_sdk_cpp: - 1.11.510 azure_core_cpp: diff --git a/.ci_support/migrations/aws_crt_cpp0325.yaml b/.ci_support/migrations/aws_crt_cpp0325.yaml new file mode 100644 index 000000000..e5fc87e93 --- /dev/null +++ b/.ci_support/migrations/aws_crt_cpp0325.yaml @@ -0,0 +1,8 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for aws_crt_cpp 0.32.5 + kind: version + migration_number: 1 +aws_crt_cpp: +- 0.32.5 +migrator_ts: 1746565203.0514257 diff --git a/.ci_support/migrations/orc212.yaml b/.ci_support/migrations/orc212.yaml deleted file mode 100644 index f8ef43a70..000000000 --- a/.ci_support/migrations/orc212.yaml +++ /dev/null @@ -1,8 +0,0 @@ -__migrator: - build_number: 1 - commit_message: Rebuild for orc 2.1.2 - kind: version - migration_number: 1 -migrator_ts: 1746607955.8238297 -orc: -- 2.1.2 diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 62a7cde67..c0217aaa5 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: MACOSX_SDK_VERSION: - '10.14' aws_crt_cpp: -- 0.32.4 +- 0.32.5 aws_sdk_cpp: - 1.11.510 azure_core_cpp: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 7ced8c2c5..3b8b2103f 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: MACOSX_SDK_VERSION: - '11.0' aws_crt_cpp: -- 0.32.4 +- 0.32.5 aws_sdk_cpp: - 1.11.510 azure_core_cpp: diff --git a/.ci_support/win_64_cuda_compiler_version11.8.yaml b/.ci_support/win_64_cuda_compiler_version11.8.yaml index 5a8b89796..ed6f258d1 100644 --- a/.ci_support/win_64_cuda_compiler_version11.8.yaml +++ b/.ci_support/win_64_cuda_compiler_version11.8.yaml @@ -1,5 +1,5 @@ aws_crt_cpp: -- 0.32.4 +- 0.32.5 aws_sdk_cpp: - 1.11.510 bzip2: diff --git a/.ci_support/win_64_cuda_compiler_versionNone.yaml b/.ci_support/win_64_cuda_compiler_versionNone.yaml index 352891787..c99d4b50d 100644 --- a/.ci_support/win_64_cuda_compiler_versionNone.yaml +++ b/.ci_support/win_64_cuda_compiler_versionNone.yaml @@ -1,5 +1,5 @@ aws_crt_cpp: -- 0.32.4 +- 0.32.5 aws_sdk_cpp: - 1.11.510 bzip2: diff --git a/recipe/meta.yaml b/recipe/meta.yaml index a3ca6ca6a..128b530e7 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -38,7 +38,7 @@ source: folder: cpp/submodules/parquet-testing build: - number: 9 + number: 10 # 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)] From 375a550ac1272f5fb72d39bb8df874bac118e8bd Mon Sep 17 00:00:00 2001 From: AntoinePrv Date: Sat, 10 May 2025 16:09:49 +0200 Subject: [PATCH 03/55] Add utility executables --- recipe/bld.bat | 3 +- recipe/build.sh | 3 +- recipe/install-libarrow.bat | 4 ++ recipe/install-libarrow.sh | 4 ++ recipe/meta.yaml | 80 ++++++++++++++++++++++++++++++++++++- 5 files changed, 91 insertions(+), 3 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index cf1b7c596..c2ed88fc2 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -21,7 +21,7 @@ cmake -G "Ninja" ^ -DARROW_BOOST_USE_SHARED:BOOL=ON ^ -DARROW_BUILD_STATIC:BOOL=OFF ^ -DARROW_BUILD_TESTS:BOOL=ON ^ - -DARROW_BUILD_UTILITIES:BOOL=OFF ^ + -DARROW_BUILD_UTILITIES:BOOL=ON ^ -DARROW_COMPUTE:BOOL=ON ^ -DARROW_CSV:BOOL=ON ^ -DARROW_DATASET:BOOL=ON ^ @@ -39,6 +39,7 @@ cmake -G "Ninja" ^ -DARROW_ORC:BOOL=ON ^ -DARROW_PACKAGE_PREFIX="%LIBRARY_PREFIX%" ^ -DARROW_PARQUET:BOOL=ON ^ + -DPARQUET_BUILD_EXECUTABLES:BOOL=ON ^ -DARROW_S3:BOOL=ON ^ -DARROW_SIMD_LEVEL:STRING=NONE ^ -DARROW_SUBSTRAIT:BOOL=ON ^ diff --git a/recipe/build.sh b/recipe/build.sh index a26c2617f..52ca96327 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -58,7 +58,7 @@ cmake -GNinja \ -DARROW_BUILD_BENCHMARKS=OFF \ -DARROW_BUILD_STATIC=OFF \ -DARROW_BUILD_TESTS=ON \ - -DARROW_BUILD_UTILITIES=OFF \ + -DARROW_BUILD_UTILITIES=ON \ -DARROW_COMPUTE=ON \ -DARROW_CSV=ON \ -DARROW_CXXFLAGS="${CXXFLAGS}" \ @@ -80,6 +80,7 @@ cmake -GNinja \ -DARROW_ORC=ON \ -DARROW_PACKAGE_PREFIX=$PREFIX \ -DARROW_PARQUET=ON \ + -DPARQUET_BUILD_EXECUTABLES=ON \ -DARROW_S3=ON \ -DARROW_SIMD_LEVEL=NONE \ -DARROW_SUBSTRAIT=ON \ diff --git a/recipe/install-libarrow.bat b/recipe/install-libarrow.bat index e7011b579..9b817dfbd 100644 --- a/recipe/install-libarrow.bat +++ b/recipe/install-libarrow.bat @@ -73,6 +73,10 @@ if [%PKG_NAME%] == [libarrow] ( move .\temp_prefix\lib\cmake\Parquet\* %LIBRARY_LIB%\cmake\Parquet mkdir %LIBRARY_PREFIX%\include\parquet xcopy /s /y .\temp_prefix\include\parquet %LIBRARY_PREFIX%\include\parquet +) else if [%PKG_NAME%] == [parquet-utils] ( + copy .\temp_prefix\bin\parquet-*.exe %LIBRARY_BIN% +) else if [%PKG_NAME%] == [arrow-utils] ( + copy .\temp_prefix\bin\arrow-*.exe %LIBRARY_BIN% ) else if [%PKG_NAME%] == [libarrow-all] ( REM libarrow-all: install everything else (whatever ends up in this output REM should generally be installed into the appropriate libarrow-). diff --git a/recipe/install-libarrow.sh b/recipe/install-libarrow.sh index 23cf22afb..4b56a0cc4 100644 --- a/recipe/install-libarrow.sh +++ b/recipe/install-libarrow.sh @@ -69,6 +69,10 @@ elif [[ "${PKG_NAME}" == "libparquet" ]]; then cp ./temp_prefix/lib/pkgconfig/parquet.pc $PREFIX/lib/pkgconfig cp -R ./temp_prefix/lib/cmake/Parquet/. $PREFIX/lib/cmake/Parquet cp -R ./temp_prefix/include/parquet/. $PREFIX/include/parquet +elif [[ "${PKG_NAME}" == "parquet-utils" ]]; then + cp ./temp_prefix/bin/parquet-* $PREFIX/bin +elif [[ "${PKG_NAME}" == "arrow-utils" ]]; then + cp ./temp_prefix/bin/arrow-* $PREFIX/bin elif [[ "${PKG_NAME}" == "libarrow-all" ]]; then # libarrow-all: install everything else (whatever ends up in this output # should generally be installed into the appropriate libarrow-). diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 128b530e7..2441810d6 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -38,7 +38,7 @@ source: folder: cpp/submodules/parquet-testing build: - number: 10 + number: 11 # 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)] @@ -159,6 +159,8 @@ outputs: - {{ pin_subpackage("libarrow-gandiva", exact=True) }} - {{ pin_subpackage("libarrow-substrait", exact=True) }} - {{ pin_subpackage("libparquet", exact=True) }} + - {{ pin_subpackage("arrow-utils", exact=True) }} + - {{ pin_subpackage("parquet-utils", exact=True) }} run: - {{ pin_subpackage("libarrow", exact=True) }} - {{ pin_subpackage("libarrow-acero", exact=True) }} @@ -168,6 +170,8 @@ outputs: - {{ pin_subpackage("libarrow-gandiva", exact=True) }} - {{ pin_subpackage("libarrow-substrait", exact=True) }} - {{ pin_subpackage("libparquet", exact=True) }} + - {{ pin_subpackage("arrow-utils", exact=True) }} + - {{ pin_subpackage("parquet-utils", exact=True) }} test: commands: # absence of test bits @@ -655,6 +659,80 @@ outputs: - LICENSE.txt summary: C++ libraries for Apache Parquet + - name: parquet-utils + script: install-libarrow.sh # [unix] + script: install-libarrow.bat # [win] + version: {{ version }} + build: + string: h{{ PKG_HASH }}_{{ PKG_BUILDNUM }}_{{ build_ext }} + requirements: + build: + - cmake <4 + - ninja + # for strong run-exports + - {{ stdlib("c") }} + - {{ compiler("c") }} + - {{ compiler("cxx") }} + host: + - {{ pin_subpackage("libparquet", exact=True) }} + run: + - {{ pin_subpackage("libparquet", exact=True) }} + + test: + commands: + # bin + - test -f $PREFIX/bin/parquet-dump-arrow-statistics # [unix] + - test -f $PREFIX/bin/parquet-dump-footer # [unix] + - test -f $PREFIX/bin/parquet-dump-schema # [unix] + - test -f $PREFIX/bin/parquet-reader # [unix] + - test -f $PREFIX/bin/parquet-scan # [unix] + - if not exist %LIBRARY_BIN%\parquet-dump-arrow-statistics.exe exit 1 # [win] + - if not exist %LIBRARY_BIN%\parquet-dump-footer.exe exit 1 # [win] + - if not exist %LIBRARY_BIN%\parquet-dump-schema.exe exit 1 # [win] + - if not exist %LIBRARY_BIN%\parquet-reader.exe exit 1 # [win] + - if not exist %LIBRARY_BIN%\parquet-scan.exe exit 1 # [win] + + about: + home: http://github.com/apache/arrow + license: Apache-2.0 + license_file: + - LICENSE.txt + summary: Executables for inspecting Apache Parquet files + + - name: arrow-utils + script: install-libarrow.sh # [unix] + script: install-libarrow.bat # [win] + version: {{ version }} + build: + string: h{{ PKG_HASH }}_{{ PKG_BUILDNUM }}_{{ build_ext }} + requirements: + build: + - cmake <4 + - ninja + # for strong run-exports + - {{ stdlib("c") }} + - {{ compiler("c") }} + - {{ compiler("cxx") }} + host: + - {{ pin_subpackage("libarrow", exact=True) }} + run: + - {{ pin_subpackage("libarrow", exact=True) }} + + test: + commands: + # bin + - test -f $PREFIX/bin/arrow-file-to-stream # [unix] + - test -f $PREFIX/bin/arrow-stream-to-file # [unix] + - if not exist %LIBRARY_BIN%\arrow-file-to-stream.exe exit 1 # [win] + - if not exist %LIBRARY_BIN%\arrow-stream-to-file.exe exit 1 # [win] + + about: + home: http://github.com/apache/arrow + license: Apache-2.0 + license_file: + - LICENSE.txt + summary: Executables for manipulating Apache arrow files + about: home: http://github.com/apache/arrow license: Apache-2.0 From 6d946c5d7d0923fe9365bbfac33695352fc7bd3e Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 11 May 2025 09:54:18 +1100 Subject: [PATCH 04/55] MNT: Re-rendered with conda-build 25.4.2, conda-smithy 3.48.1, and conda-forge-pinning 2025.05.10.16.35.31 --- .ci_support/migrations/aws_crt_cpp0325.yaml | 8 ------- README.md | 26 ++++++++++++++++++--- 2 files changed, 23 insertions(+), 11 deletions(-) delete mode 100644 .ci_support/migrations/aws_crt_cpp0325.yaml diff --git a/.ci_support/migrations/aws_crt_cpp0325.yaml b/.ci_support/migrations/aws_crt_cpp0325.yaml deleted file mode 100644 index e5fc87e93..000000000 --- a/.ci_support/migrations/aws_crt_cpp0325.yaml +++ /dev/null @@ -1,8 +0,0 @@ -__migrator: - build_number: 1 - commit_message: Rebuild for aws_crt_cpp 0.32.5 - kind: version - migration_number: 1 -aws_crt_cpp: -- 0.32.5 -migrator_ts: 1746565203.0514257 diff --git a/README.md b/README.md index 0dfd9a675..cd877eb9b 100644 --- a/README.md +++ b/README.md @@ -22,6 +22,15 @@ Package license: Apache-2.0 Summary: A meta-package to select Arrow build variant +About arrow-utils +----------------- + +Home: http://github.com/apache/arrow + +Package license: Apache-2.0 + +Summary: Executables for manipulating Apache arrow files + About libarrow -------------- @@ -94,6 +103,15 @@ Package license: Apache-2.0 Summary: C++ libraries for Apache Parquet +About parquet-utils +------------------- + +Home: http://github.com/apache/arrow + +Package license: Apache-2.0 + +Summary: Executables for inspecting Apache Parquet files + Current build status ==================== @@ -195,6 +213,7 @@ Current release info | Name | Downloads | Version | Platforms | | --- | --- | --- | --- | | [![Conda Recipe](https://img.shields.io/badge/recipe-apache--arrow--proc-green.svg)](https://anaconda.org/conda-forge/apache-arrow-proc) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/apache-arrow-proc.svg)](https://anaconda.org/conda-forge/apache-arrow-proc) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/apache-arrow-proc.svg)](https://anaconda.org/conda-forge/apache-arrow-proc) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/apache-arrow-proc.svg)](https://anaconda.org/conda-forge/apache-arrow-proc) | +| [![Conda Recipe](https://img.shields.io/badge/recipe-arrow--utils-green.svg)](https://anaconda.org/conda-forge/arrow-utils) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/arrow-utils.svg)](https://anaconda.org/conda-forge/arrow-utils) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/arrow-utils.svg)](https://anaconda.org/conda-forge/arrow-utils) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/arrow-utils.svg)](https://anaconda.org/conda-forge/arrow-utils) | | [![Conda Recipe](https://img.shields.io/badge/recipe-libarrow-green.svg)](https://anaconda.org/conda-forge/libarrow) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libarrow.svg)](https://anaconda.org/conda-forge/libarrow) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libarrow.svg)](https://anaconda.org/conda-forge/libarrow) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libarrow.svg)](https://anaconda.org/conda-forge/libarrow) | | [![Conda Recipe](https://img.shields.io/badge/recipe-libarrow--acero-green.svg)](https://anaconda.org/conda-forge/libarrow-acero) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libarrow-acero.svg)](https://anaconda.org/conda-forge/libarrow-acero) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libarrow-acero.svg)](https://anaconda.org/conda-forge/libarrow-acero) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libarrow-acero.svg)](https://anaconda.org/conda-forge/libarrow-acero) | | [![Conda Recipe](https://img.shields.io/badge/recipe-libarrow--all-green.svg)](https://anaconda.org/conda-forge/libarrow-all) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libarrow-all.svg)](https://anaconda.org/conda-forge/libarrow-all) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libarrow-all.svg)](https://anaconda.org/conda-forge/libarrow-all) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libarrow-all.svg)](https://anaconda.org/conda-forge/libarrow-all) | @@ -204,6 +223,7 @@ Current release info | [![Conda Recipe](https://img.shields.io/badge/recipe-libarrow--gandiva-green.svg)](https://anaconda.org/conda-forge/libarrow-gandiva) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libarrow-gandiva.svg)](https://anaconda.org/conda-forge/libarrow-gandiva) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libarrow-gandiva.svg)](https://anaconda.org/conda-forge/libarrow-gandiva) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libarrow-gandiva.svg)](https://anaconda.org/conda-forge/libarrow-gandiva) | | [![Conda Recipe](https://img.shields.io/badge/recipe-libarrow--substrait-green.svg)](https://anaconda.org/conda-forge/libarrow-substrait) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libarrow-substrait.svg)](https://anaconda.org/conda-forge/libarrow-substrait) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libarrow-substrait.svg)](https://anaconda.org/conda-forge/libarrow-substrait) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libarrow-substrait.svg)](https://anaconda.org/conda-forge/libarrow-substrait) | | [![Conda Recipe](https://img.shields.io/badge/recipe-libparquet-green.svg)](https://anaconda.org/conda-forge/libparquet) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libparquet.svg)](https://anaconda.org/conda-forge/libparquet) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libparquet.svg)](https://anaconda.org/conda-forge/libparquet) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libparquet.svg)](https://anaconda.org/conda-forge/libparquet) | +| [![Conda Recipe](https://img.shields.io/badge/recipe-parquet--utils-green.svg)](https://anaconda.org/conda-forge/parquet-utils) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/parquet-utils.svg)](https://anaconda.org/conda-forge/parquet-utils) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/parquet-utils.svg)](https://anaconda.org/conda-forge/parquet-utils) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/parquet-utils.svg)](https://anaconda.org/conda-forge/parquet-utils) | Installing arrow-cpp ==================== @@ -215,16 +235,16 @@ conda config --add channels conda-forge conda config --set channel_priority strict ``` -Once the `conda-forge` channel has been enabled, `apache-arrow-proc, libarrow, libarrow-acero, libarrow-all, libarrow-dataset, libarrow-flight, libarrow-flight-sql, libarrow-gandiva, libarrow-substrait, libparquet` can be installed with `conda`: +Once the `conda-forge` channel has been enabled, `apache-arrow-proc, arrow-utils, libarrow, libarrow-acero, libarrow-all, libarrow-dataset, libarrow-flight, libarrow-flight-sql, libarrow-gandiva, libarrow-substrait, libparquet, parquet-utils` can be installed with `conda`: ``` -conda install apache-arrow-proc libarrow libarrow-acero libarrow-all libarrow-dataset libarrow-flight libarrow-flight-sql libarrow-gandiva libarrow-substrait libparquet +conda install apache-arrow-proc arrow-utils libarrow libarrow-acero libarrow-all libarrow-dataset libarrow-flight libarrow-flight-sql libarrow-gandiva libarrow-substrait libparquet parquet-utils ``` or with `mamba`: ``` -mamba install apache-arrow-proc libarrow libarrow-acero libarrow-all libarrow-dataset libarrow-flight libarrow-flight-sql libarrow-gandiva libarrow-substrait libparquet +mamba install apache-arrow-proc arrow-utils libarrow libarrow-acero libarrow-all libarrow-dataset libarrow-flight libarrow-flight-sql libarrow-gandiva libarrow-substrait libparquet parquet-utils ``` It is possible to list all of the versions of `apache-arrow-proc` available on your platform with `conda`: From 9a6fe65750a794d2903b9877c7acb3e84f967c70 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Mon, 26 May 2025 15:48:00 +0000 Subject: [PATCH 05/55] Rebuild for aws_crt_cpp 0.32.6 --- .ci_support/migrations/aws_crt_cpp0326.yaml | 8 ++++++++ recipe/meta.yaml | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/aws_crt_cpp0326.yaml diff --git a/.ci_support/migrations/aws_crt_cpp0326.yaml b/.ci_support/migrations/aws_crt_cpp0326.yaml new file mode 100644 index 000000000..dfc186e8b --- /dev/null +++ b/.ci_support/migrations/aws_crt_cpp0326.yaml @@ -0,0 +1,8 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for aws_crt_cpp 0.32.6 + kind: version + migration_number: 1 +aws_crt_cpp: +- 0.32.6 +migrator_ts: 1747875601.303153 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 2441810d6..e3c0aedb2 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -38,7 +38,7 @@ source: folder: cpp/submodules/parquet-testing build: - number: 11 + number: 12 # 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)] From a84910ef5c30d30d6742949d356dc065541d9aa9 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Mon, 26 May 2025 15:51:34 +0000 Subject: [PATCH 06/55] MNT: Re-rendered with conda-build 25.4.2, conda-smithy 3.48.1, and conda-forge-pinning 2025.05.26.14.37.37 --- ...ersion11cuda_compiler_version11.8cxx_compiler_version11.yaml | 2 +- ...ersion13cuda_compiler_versionNonecxx_compiler_version13.yaml | 2 +- ...ersion11cuda_compiler_version11.8cxx_compiler_version11.yaml | 2 +- ...ersion13cuda_compiler_versionNonecxx_compiler_version13.yaml | 2 +- ...ersion11cuda_compiler_version11.8cxx_compiler_version11.yaml | 2 +- ...ersion13cuda_compiler_versionNonecxx_compiler_version13.yaml | 2 +- .ci_support/osx_64_.yaml | 2 +- .ci_support/osx_arm64_.yaml | 2 +- .ci_support/win_64_cuda_compiler_version11.8.yaml | 2 +- .ci_support/win_64_cuda_compiler_versionNone.yaml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml index 91a9893b1..9b6acf59f 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml @@ -1,5 +1,5 @@ aws_crt_cpp: -- 0.32.5 +- 0.32.6 aws_sdk_cpp: - 1.11.510 azure_core_cpp: diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml index 1aad25318..529cbc637 100644 --- a/.ci_support/linux_64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml +++ b/.ci_support/linux_64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml @@ -1,5 +1,5 @@ aws_crt_cpp: -- 0.32.5 +- 0.32.6 aws_sdk_cpp: - 1.11.510 azure_core_cpp: diff --git a/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml index 4dccfcb77..fd9fda119 100644 --- a/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml @@ -1,5 +1,5 @@ aws_crt_cpp: -- 0.32.5 +- 0.32.6 aws_sdk_cpp: - 1.11.510 azure_core_cpp: diff --git a/.ci_support/linux_aarch64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml b/.ci_support/linux_aarch64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml index 6b8f551fc..4d76fad27 100644 --- a/.ci_support/linux_aarch64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml @@ -1,5 +1,5 @@ aws_crt_cpp: -- 0.32.5 +- 0.32.6 aws_sdk_cpp: - 1.11.510 azure_core_cpp: diff --git a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml index 0c7145e3c..d14ef3451 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml @@ -1,5 +1,5 @@ aws_crt_cpp: -- 0.32.5 +- 0.32.6 aws_sdk_cpp: - 1.11.510 azure_core_cpp: diff --git a/.ci_support/linux_ppc64le_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml b/.ci_support/linux_ppc64le_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml index 7dde4f060..6195d7091 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml @@ -1,5 +1,5 @@ aws_crt_cpp: -- 0.32.5 +- 0.32.6 aws_sdk_cpp: - 1.11.510 azure_core_cpp: diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index c0217aaa5..d9df9d77d 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: MACOSX_SDK_VERSION: - '10.14' aws_crt_cpp: -- 0.32.5 +- 0.32.6 aws_sdk_cpp: - 1.11.510 azure_core_cpp: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 3b8b2103f..586523a38 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: MACOSX_SDK_VERSION: - '11.0' aws_crt_cpp: -- 0.32.5 +- 0.32.6 aws_sdk_cpp: - 1.11.510 azure_core_cpp: diff --git a/.ci_support/win_64_cuda_compiler_version11.8.yaml b/.ci_support/win_64_cuda_compiler_version11.8.yaml index ed6f258d1..24b66c045 100644 --- a/.ci_support/win_64_cuda_compiler_version11.8.yaml +++ b/.ci_support/win_64_cuda_compiler_version11.8.yaml @@ -1,5 +1,5 @@ aws_crt_cpp: -- 0.32.5 +- 0.32.6 aws_sdk_cpp: - 1.11.510 bzip2: diff --git a/.ci_support/win_64_cuda_compiler_versionNone.yaml b/.ci_support/win_64_cuda_compiler_versionNone.yaml index c99d4b50d..cce1cd94c 100644 --- a/.ci_support/win_64_cuda_compiler_versionNone.yaml +++ b/.ci_support/win_64_cuda_compiler_versionNone.yaml @@ -1,5 +1,5 @@ aws_crt_cpp: -- 0.32.5 +- 0.32.6 aws_sdk_cpp: - 1.11.510 bzip2: From c926295735a89140a3b20310ae1d3e34248fc53a Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sun, 1 Jun 2025 00:33:57 +0000 Subject: [PATCH 07/55] Rebuild for libopentelemetry_cpp 1.21 --- .ci_support/migrations/libopentelemetry_cpp121.yaml | 8 ++++++++ recipe/meta.yaml | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/libopentelemetry_cpp121.yaml diff --git a/.ci_support/migrations/libopentelemetry_cpp121.yaml b/.ci_support/migrations/libopentelemetry_cpp121.yaml new file mode 100644 index 000000000..0e01608c8 --- /dev/null +++ b/.ci_support/migrations/libopentelemetry_cpp121.yaml @@ -0,0 +1,8 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for libopentelemetry_cpp 1.21 + kind: version + migration_number: 1 +libopentelemetry_cpp: +- '1.21' +migrator_ts: 1748596442.9304578 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index e3c0aedb2..c95352afd 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -38,7 +38,7 @@ source: folder: cpp/submodules/parquet-testing build: - number: 12 + number: 13 # 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)] From 343e858f85da2ba67926a108a0728585916acf5d Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sun, 1 Jun 2025 00:37:54 +0000 Subject: [PATCH 08/55] MNT: Re-rendered with conda-build 25.5.0, conda-smithy 3.50.0, and conda-forge-pinning 2025.05.31.21.44.08 --- ...11cuda_compiler_version11.8cxx_compiler_version11.yaml | 2 +- ...13cuda_compiler_versionNonecxx_compiler_version13.yaml | 2 +- ...11cuda_compiler_version11.8cxx_compiler_version11.yaml | 2 +- ...13cuda_compiler_versionNonecxx_compiler_version13.yaml | 2 +- ...11cuda_compiler_version11.8cxx_compiler_version11.yaml | 2 +- ...13cuda_compiler_versionNonecxx_compiler_version13.yaml | 2 +- .ci_support/migrations/aws_crt_cpp0326.yaml | 8 -------- .ci_support/osx_64_.yaml | 2 +- .ci_support/osx_arm64_.yaml | 2 +- 9 files changed, 8 insertions(+), 16 deletions(-) delete mode 100644 .ci_support/migrations/aws_crt_cpp0326.yaml diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml index 9b6acf59f..b278e9f67 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml @@ -55,7 +55,7 @@ libgoogle_cloud_storage_devel: libgrpc: - '1.71' libopentelemetry_cpp: -- '1.20' +- '1.21' libprotobuf: - 5.29.3 libutf8proc: diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml index 529cbc637..b3b3462b8 100644 --- a/.ci_support/linux_64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml +++ b/.ci_support/linux_64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml @@ -55,7 +55,7 @@ libgoogle_cloud_storage_devel: libgrpc: - '1.71' libopentelemetry_cpp: -- '1.20' +- '1.21' libprotobuf: - 5.29.3 libutf8proc: diff --git a/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml index fd9fda119..46bf74d10 100644 --- a/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml @@ -55,7 +55,7 @@ libgoogle_cloud_storage_devel: libgrpc: - '1.71' libopentelemetry_cpp: -- '1.20' +- '1.21' libprotobuf: - 5.29.3 libutf8proc: diff --git a/.ci_support/linux_aarch64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml b/.ci_support/linux_aarch64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml index 4d76fad27..0c5e522d6 100644 --- a/.ci_support/linux_aarch64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml @@ -55,7 +55,7 @@ libgoogle_cloud_storage_devel: libgrpc: - '1.71' libopentelemetry_cpp: -- '1.20' +- '1.21' libprotobuf: - 5.29.3 libutf8proc: diff --git a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml index d14ef3451..8c3ea0207 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml @@ -55,7 +55,7 @@ libgoogle_cloud_storage_devel: libgrpc: - '1.71' libopentelemetry_cpp: -- '1.20' +- '1.21' libprotobuf: - 5.29.3 libutf8proc: diff --git a/.ci_support/linux_ppc64le_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml b/.ci_support/linux_ppc64le_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml index 6195d7091..f5fdc2b23 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml @@ -55,7 +55,7 @@ libgoogle_cloud_storage_devel: libgrpc: - '1.71' libopentelemetry_cpp: -- '1.20' +- '1.21' libprotobuf: - 5.29.3 libutf8proc: diff --git a/.ci_support/migrations/aws_crt_cpp0326.yaml b/.ci_support/migrations/aws_crt_cpp0326.yaml deleted file mode 100644 index dfc186e8b..000000000 --- a/.ci_support/migrations/aws_crt_cpp0326.yaml +++ /dev/null @@ -1,8 +0,0 @@ -__migrator: - build_number: 1 - commit_message: Rebuild for aws_crt_cpp 0.32.6 - kind: version - migration_number: 1 -aws_crt_cpp: -- 0.32.6 -migrator_ts: 1747875601.303153 diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index d9df9d77d..78c1c816d 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -51,7 +51,7 @@ libgoogle_cloud_storage_devel: libgrpc: - '1.71' libopentelemetry_cpp: -- '1.20' +- '1.21' libprotobuf: - 5.29.3 libutf8proc: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 586523a38..de32f53ae 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -51,7 +51,7 @@ libgoogle_cloud_storage_devel: libgrpc: - '1.71' libopentelemetry_cpp: -- '1.20' +- '1.21' libprotobuf: - 5.29.3 libutf8proc: From 0e7a016b569a4625768414e8e2306616e29d154c Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Tue, 3 Jun 2025 09:36:44 +0000 Subject: [PATCH 09/55] Rebuild for aws_crt_cpp 0.32.8 --- .ci_support/migrations/aws_crt_cpp0328.yaml | 8 ++++++++ recipe/meta.yaml | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/aws_crt_cpp0328.yaml diff --git a/.ci_support/migrations/aws_crt_cpp0328.yaml b/.ci_support/migrations/aws_crt_cpp0328.yaml new file mode 100644 index 000000000..38df153c0 --- /dev/null +++ b/.ci_support/migrations/aws_crt_cpp0328.yaml @@ -0,0 +1,8 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for aws_crt_cpp 0.32.8 + kind: version + migration_number: 1 +aws_crt_cpp: +- 0.32.8 +migrator_ts: 1748599780.2909708 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c95352afd..dba9c785f 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -38,7 +38,7 @@ source: folder: cpp/submodules/parquet-testing build: - number: 13 + number: 14 # 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)] From 19e10449e306146a3160fd7fd1fc81ac103f2d9a Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Tue, 3 Jun 2025 09:40:49 +0000 Subject: [PATCH 10/55] MNT: Re-rendered with conda-build 25.5.0, conda-smithy 3.50.0, and conda-forge-pinning 2025.06.03.08.06.15 --- ...11cuda_compiler_version11.8cxx_compiler_version11.yaml | 2 +- ...13cuda_compiler_versionNonecxx_compiler_version13.yaml | 2 +- ...11cuda_compiler_version11.8cxx_compiler_version11.yaml | 2 +- ...13cuda_compiler_versionNonecxx_compiler_version13.yaml | 2 +- ...11cuda_compiler_version11.8cxx_compiler_version11.yaml | 2 +- ...13cuda_compiler_versionNonecxx_compiler_version13.yaml | 2 +- .ci_support/migrations/libopentelemetry_cpp121.yaml | 8 -------- .ci_support/osx_64_.yaml | 2 +- .ci_support/osx_arm64_.yaml | 2 +- .ci_support/win_64_cuda_compiler_version11.8.yaml | 2 +- .ci_support/win_64_cuda_compiler_versionNone.yaml | 2 +- 11 files changed, 10 insertions(+), 18 deletions(-) delete mode 100644 .ci_support/migrations/libopentelemetry_cpp121.yaml diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml index b278e9f67..50ecf2635 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml @@ -1,5 +1,5 @@ aws_crt_cpp: -- 0.32.6 +- 0.32.8 aws_sdk_cpp: - 1.11.510 azure_core_cpp: diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml index b3b3462b8..43b629935 100644 --- a/.ci_support/linux_64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml +++ b/.ci_support/linux_64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml @@ -1,5 +1,5 @@ aws_crt_cpp: -- 0.32.6 +- 0.32.8 aws_sdk_cpp: - 1.11.510 azure_core_cpp: diff --git a/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml index 46bf74d10..369dc062a 100644 --- a/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml @@ -1,5 +1,5 @@ aws_crt_cpp: -- 0.32.6 +- 0.32.8 aws_sdk_cpp: - 1.11.510 azure_core_cpp: diff --git a/.ci_support/linux_aarch64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml b/.ci_support/linux_aarch64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml index 0c5e522d6..4783557a3 100644 --- a/.ci_support/linux_aarch64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml @@ -1,5 +1,5 @@ aws_crt_cpp: -- 0.32.6 +- 0.32.8 aws_sdk_cpp: - 1.11.510 azure_core_cpp: diff --git a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml index 8c3ea0207..07f976396 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml @@ -1,5 +1,5 @@ aws_crt_cpp: -- 0.32.6 +- 0.32.8 aws_sdk_cpp: - 1.11.510 azure_core_cpp: diff --git a/.ci_support/linux_ppc64le_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml b/.ci_support/linux_ppc64le_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml index f5fdc2b23..b6687dcc6 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml @@ -1,5 +1,5 @@ aws_crt_cpp: -- 0.32.6 +- 0.32.8 aws_sdk_cpp: - 1.11.510 azure_core_cpp: diff --git a/.ci_support/migrations/libopentelemetry_cpp121.yaml b/.ci_support/migrations/libopentelemetry_cpp121.yaml deleted file mode 100644 index 0e01608c8..000000000 --- a/.ci_support/migrations/libopentelemetry_cpp121.yaml +++ /dev/null @@ -1,8 +0,0 @@ -__migrator: - build_number: 1 - commit_message: Rebuild for libopentelemetry_cpp 1.21 - kind: version - migration_number: 1 -libopentelemetry_cpp: -- '1.21' -migrator_ts: 1748596442.9304578 diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 78c1c816d..d14134eb1 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: MACOSX_SDK_VERSION: - '10.14' aws_crt_cpp: -- 0.32.6 +- 0.32.8 aws_sdk_cpp: - 1.11.510 azure_core_cpp: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index de32f53ae..3286c3335 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: MACOSX_SDK_VERSION: - '11.0' aws_crt_cpp: -- 0.32.6 +- 0.32.8 aws_sdk_cpp: - 1.11.510 azure_core_cpp: diff --git a/.ci_support/win_64_cuda_compiler_version11.8.yaml b/.ci_support/win_64_cuda_compiler_version11.8.yaml index 24b66c045..945d38a86 100644 --- a/.ci_support/win_64_cuda_compiler_version11.8.yaml +++ b/.ci_support/win_64_cuda_compiler_version11.8.yaml @@ -1,5 +1,5 @@ aws_crt_cpp: -- 0.32.6 +- 0.32.8 aws_sdk_cpp: - 1.11.510 bzip2: diff --git a/.ci_support/win_64_cuda_compiler_versionNone.yaml b/.ci_support/win_64_cuda_compiler_versionNone.yaml index cce1cd94c..0e52db9eb 100644 --- a/.ci_support/win_64_cuda_compiler_versionNone.yaml +++ b/.ci_support/win_64_cuda_compiler_versionNone.yaml @@ -1,5 +1,5 @@ aws_crt_cpp: -- 0.32.6 +- 0.32.8 aws_sdk_cpp: - 1.11.510 bzip2: From f4f2445b9d0f945d69496d7bb82defc110cc86b2 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sat, 14 Jun 2025 07:25:46 +1100 Subject: [PATCH 11/55] stay on CUDA 11.8 --- .ci_support/migrations/cuda118.yaml | 70 +++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 .ci_support/migrations/cuda118.yaml diff --git a/.ci_support/migrations/cuda118.yaml b/.ci_support/migrations/cuda118.yaml new file mode 100644 index 000000000..de3fb48c6 --- /dev/null +++ b/.ci_support/migrations/cuda118.yaml @@ -0,0 +1,70 @@ +migrator_ts: 1748496951 +__migrator: + kind: + version + migration_number: + 1 + build_number: + 1 + # This is intended as a _manual_ migrator to re-add CUDA 11.8, after we + # dropped it as version that's built by default; DO NOT unpause + paused: true + override_cbc_keys: + - cuda_compiler_stub + operation: key_add + check_solvable: false + primary_key: cuda_compiler_version + additional_zip_keys: + - cuda_compiler + - docker_image # [linux] + ordering: + cuda_compiler: + - None + - cuda-nvcc + - nvcc + cuda_compiler_version: + - 12.4 + - 12.6 + - 12.8 + - None + - 12.9 + - 11.8 + cuda_compiler_version_min: + - 12.4 + - 12.6 + - 12.8 + - 12.9 + - 11.8 + +cuda_compiler: # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - nvcc # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + +cuda_compiler_version: # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - 11.8 # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + +cuda_compiler_version_min: # [linux or win64] + - 11.8 # [linux or win64] + +c_compiler_version: # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - 11 # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + +cxx_compiler_version: # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - 11 # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + +fortran_compiler_version: # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - 11 # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + +docker_image: # [os.environ.get("BUILD_PLATFORM", "").startswith("linux-") and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + ### Docker images with CUDA 11.8 support + + # CUDA 11.8 builds (only x64 has a DEFAULT_LINUX_VERSION choice; alma9 not available) + - quay.io/condaforge/linux-anvil-x86_64-cuda11.8:cos7 # [linux64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True" and os.environ.get("BUILD_PLATFORM") == "linux-64" and os.environ.get("DEFAULT_LINUX_VERSION", "ubi8") == "cos7"] + - quay.io/condaforge/linux-anvil-x86_64-cuda11.8:ubi8 # [linux64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True" and os.environ.get("BUILD_PLATFORM") == "linux-64" and os.environ.get("DEFAULT_LINUX_VERSION", "ubi8") in ("ubi8", "alma8", "alma9")] + + # CUDA 11.8 arch: native compilation (build == target) + - quay.io/condaforge/linux-anvil-aarch64-cuda11.8:ubi8 # [aarch64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True" and os.environ.get("BUILD_PLATFORM") == "linux-aarch64"] + - quay.io/condaforge/linux-anvil-ppc64le-cuda11.8:ubi8 # [ppc64le and os.environ.get("CF_CUDA_ENABLED", "False") == "True" and os.environ.get("BUILD_PLATFORM") == "linux-ppc64le"] + + # CUDA 11.8 arch: cross-compilation (build != target) + - quay.io/condaforge/linux-anvil-x86_64-cuda11.8:ubi8 # [aarch64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True" and os.environ.get("BUILD_PLATFORM") == "linux-64"] + - quay.io/condaforge/linux-anvil-x86_64-cuda11.8:ubi8 # [ppc64le and os.environ.get("CF_CUDA_ENABLED", "False") == "True" and os.environ.get("BUILD_PLATFORM") == "linux-64"] From 4a147a7cfef251fb6b63a1b6a3af0f402c741d06 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 15 Jun 2025 07:58:27 +1100 Subject: [PATCH 12/55] bump build number because hashes change --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index dba9c785f..c221909e4 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -38,7 +38,7 @@ source: folder: cpp/submodules/parquet-testing build: - number: 14 + number: 15 # 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)] From eabc6e03e8fc388c706d2b59211903bf4a1c9912 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 15 Jun 2025 08:01:18 +1100 Subject: [PATCH 13/55] MNT: Re-rendered with conda-build 25.5.0, conda-smithy 3.50.1, and conda-forge-pinning 2025.06.14.20.26.40 --- ...11cuda_compiler_version11.8cxx_compiler_version11.yaml | 2 +- ...13cuda_compiler_versionNonecxx_compiler_version13.yaml | 4 ++-- ...11cuda_compiler_version11.8cxx_compiler_version11.yaml | 2 +- ...13cuda_compiler_versionNonecxx_compiler_version13.yaml | 4 ++-- ...11cuda_compiler_version11.8cxx_compiler_version11.yaml | 2 +- ...13cuda_compiler_versionNonecxx_compiler_version13.yaml | 4 ++-- .ci_support/win_64_cuda_compiler_version11.8.yaml | 4 ++-- .ci_support/win_64_cuda_compiler_versionNone.yaml | 6 +++--- build-locally.py | 8 ++------ 9 files changed, 16 insertions(+), 20 deletions(-) diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml index 50ecf2635..0dd77e577 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml @@ -77,8 +77,8 @@ thrift_cpp: zip_keys: - - c_compiler_version - cxx_compiler_version - - cuda_compiler - cuda_compiler_version + - cuda_compiler - docker_image zlib: - '1' diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml index 43b629935..f064837f2 100644 --- a/.ci_support/linux_64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml +++ b/.ci_support/linux_64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml @@ -27,7 +27,7 @@ channel_sources: channel_targets: - conda-forge main cuda_compiler: -- None +- cuda-nvcc cuda_compiler_version: - None cuda_compiler_version_min: @@ -77,8 +77,8 @@ thrift_cpp: zip_keys: - - c_compiler_version - cxx_compiler_version - - cuda_compiler - cuda_compiler_version + - cuda_compiler - docker_image zlib: - '1' diff --git a/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml index 369dc062a..3a4c8fe81 100644 --- a/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml @@ -77,8 +77,8 @@ thrift_cpp: zip_keys: - - c_compiler_version - cxx_compiler_version - - cuda_compiler - cuda_compiler_version + - cuda_compiler - docker_image zlib: - '1' diff --git a/.ci_support/linux_aarch64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml b/.ci_support/linux_aarch64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml index 4783557a3..818e6ce98 100644 --- a/.ci_support/linux_aarch64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml @@ -27,7 +27,7 @@ channel_sources: channel_targets: - conda-forge main cuda_compiler: -- None +- cuda-nvcc cuda_compiler_version: - None cuda_compiler_version_min: @@ -77,8 +77,8 @@ thrift_cpp: zip_keys: - - c_compiler_version - cxx_compiler_version - - cuda_compiler - cuda_compiler_version + - cuda_compiler - docker_image zlib: - '1' diff --git a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml index 07f976396..05ca17d4c 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml @@ -77,8 +77,8 @@ thrift_cpp: zip_keys: - - c_compiler_version - cxx_compiler_version - - cuda_compiler - cuda_compiler_version + - cuda_compiler - docker_image zlib: - '1' diff --git a/.ci_support/linux_ppc64le_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml b/.ci_support/linux_ppc64le_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml index b6687dcc6..cc800a706 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml @@ -27,7 +27,7 @@ channel_sources: channel_targets: - conda-forge main cuda_compiler: -- None +- cuda-nvcc cuda_compiler_version: - None cuda_compiler_version_min: @@ -77,8 +77,8 @@ thrift_cpp: zip_keys: - - c_compiler_version - cxx_compiler_version - - cuda_compiler - cuda_compiler_version + - cuda_compiler - docker_image zlib: - '1' diff --git a/.ci_support/win_64_cuda_compiler_version11.8.yaml b/.ci_support/win_64_cuda_compiler_version11.8.yaml index 945d38a86..3e7ee853c 100644 --- a/.ci_support/win_64_cuda_compiler_version11.8.yaml +++ b/.ci_support/win_64_cuda_compiler_version11.8.yaml @@ -59,8 +59,8 @@ target_platform: thrift_cpp: - 0.21.0 zip_keys: -- - cuda_compiler - - cuda_compiler_version +- - cuda_compiler_version + - cuda_compiler zlib: - '1' zstd: diff --git a/.ci_support/win_64_cuda_compiler_versionNone.yaml b/.ci_support/win_64_cuda_compiler_versionNone.yaml index 0e52db9eb..4b5821620 100644 --- a/.ci_support/win_64_cuda_compiler_versionNone.yaml +++ b/.ci_support/win_64_cuda_compiler_versionNone.yaml @@ -13,7 +13,7 @@ channel_sources: channel_targets: - conda-forge main cuda_compiler: -- None +- cuda-nvcc cuda_compiler_version: - None cuda_compiler_version_min: @@ -59,8 +59,8 @@ target_platform: thrift_cpp: - 0.21.0 zip_keys: -- - cuda_compiler - - cuda_compiler_version +- - cuda_compiler_version + - cuda_compiler zlib: - '1' zstd: diff --git a/build-locally.py b/build-locally.py index 02c23747b..9dfe44039 100755 --- a/build-locally.py +++ b/build-locally.py @@ -106,9 +106,7 @@ def main(args=None): action="store_true", help="Setup debug environment using `conda debug`", ) - p.add_argument( - "--output-id", help="If running debug, specify the output to setup." - ) + p.add_argument("--output-id", help="If running debug, specify the output to setup.") ns = p.parse_args(args=args) verify_config(ns) @@ -124,9 +122,7 @@ def main(args=None): elif ns.config.startswith("win"): run_win_build(ns) finally: - recipe_license_file = os.path.join( - "recipe", "recipe-scripts-license.txt" - ) + recipe_license_file = os.path.join("recipe", "recipe-scripts-license.txt") if os.path.exists(recipe_license_file): os.remove(recipe_license_file) From 31400b92987b9a4a074e470fbffeabb747a81206 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Wed, 25 Jun 2025 10:25:57 +0000 Subject: [PATCH 14/55] Rebuild for aws_crt_cpp 0.32.10 --- .ci_support/migrations/aws_crt_cpp03210.yaml | 8 ++++++++ recipe/meta.yaml | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/aws_crt_cpp03210.yaml diff --git a/.ci_support/migrations/aws_crt_cpp03210.yaml b/.ci_support/migrations/aws_crt_cpp03210.yaml new file mode 100644 index 000000000..911ff41f4 --- /dev/null +++ b/.ci_support/migrations/aws_crt_cpp03210.yaml @@ -0,0 +1,8 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for aws_crt_cpp 0.32.10 + kind: version + migration_number: 1 +aws_crt_cpp: +- 0.32.10 +migrator_ts: 1750807365.719297 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c221909e4..6f50ed5a4 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -38,7 +38,7 @@ source: folder: cpp/submodules/parquet-testing build: - number: 15 + number: 16 # 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)] From 0526ffb571a159634bf7ded8b65ca6deeb960b18 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Wed, 25 Jun 2025 10:30:12 +0000 Subject: [PATCH 15/55] MNT: Re-rendered with conda-build 25.5.0, conda-smithy 3.50.1, and conda-forge-pinning 2025.06.25.09.37.28 --- ...11cuda_compiler_version11.8cxx_compiler_version11.yaml | 2 +- ...13cuda_compiler_versionNonecxx_compiler_version13.yaml | 2 +- ...11cuda_compiler_version11.8cxx_compiler_version11.yaml | 2 +- ...13cuda_compiler_versionNonecxx_compiler_version13.yaml | 2 +- ...11cuda_compiler_version11.8cxx_compiler_version11.yaml | 2 +- ...13cuda_compiler_versionNonecxx_compiler_version13.yaml | 2 +- .ci_support/migrations/aws_crt_cpp0328.yaml | 8 -------- .ci_support/osx_64_.yaml | 2 +- .ci_support/osx_arm64_.yaml | 2 +- .ci_support/win_64_cuda_compiler_version11.8.yaml | 2 +- .ci_support/win_64_cuda_compiler_versionNone.yaml | 2 +- 11 files changed, 10 insertions(+), 18 deletions(-) delete mode 100644 .ci_support/migrations/aws_crt_cpp0328.yaml diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml index 0dd77e577..8c151c4cb 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml @@ -1,5 +1,5 @@ aws_crt_cpp: -- 0.32.8 +- 0.32.10 aws_sdk_cpp: - 1.11.510 azure_core_cpp: diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml index f064837f2..a4ed9356a 100644 --- a/.ci_support/linux_64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml +++ b/.ci_support/linux_64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml @@ -1,5 +1,5 @@ aws_crt_cpp: -- 0.32.8 +- 0.32.10 aws_sdk_cpp: - 1.11.510 azure_core_cpp: diff --git a/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml index 3a4c8fe81..3fdced49e 100644 --- a/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml @@ -1,5 +1,5 @@ aws_crt_cpp: -- 0.32.8 +- 0.32.10 aws_sdk_cpp: - 1.11.510 azure_core_cpp: diff --git a/.ci_support/linux_aarch64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml b/.ci_support/linux_aarch64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml index 818e6ce98..147550452 100644 --- a/.ci_support/linux_aarch64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml @@ -1,5 +1,5 @@ aws_crt_cpp: -- 0.32.8 +- 0.32.10 aws_sdk_cpp: - 1.11.510 azure_core_cpp: diff --git a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml index 05ca17d4c..ae39673e7 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml @@ -1,5 +1,5 @@ aws_crt_cpp: -- 0.32.8 +- 0.32.10 aws_sdk_cpp: - 1.11.510 azure_core_cpp: diff --git a/.ci_support/linux_ppc64le_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml b/.ci_support/linux_ppc64le_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml index cc800a706..7aad59d70 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml @@ -1,5 +1,5 @@ aws_crt_cpp: -- 0.32.8 +- 0.32.10 aws_sdk_cpp: - 1.11.510 azure_core_cpp: diff --git a/.ci_support/migrations/aws_crt_cpp0328.yaml b/.ci_support/migrations/aws_crt_cpp0328.yaml deleted file mode 100644 index 38df153c0..000000000 --- a/.ci_support/migrations/aws_crt_cpp0328.yaml +++ /dev/null @@ -1,8 +0,0 @@ -__migrator: - build_number: 1 - commit_message: Rebuild for aws_crt_cpp 0.32.8 - kind: version - migration_number: 1 -aws_crt_cpp: -- 0.32.8 -migrator_ts: 1748599780.2909708 diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index d14134eb1..d657a5624 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: MACOSX_SDK_VERSION: - '10.14' aws_crt_cpp: -- 0.32.8 +- 0.32.10 aws_sdk_cpp: - 1.11.510 azure_core_cpp: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 3286c3335..6ccedc3eb 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: MACOSX_SDK_VERSION: - '11.0' aws_crt_cpp: -- 0.32.8 +- 0.32.10 aws_sdk_cpp: - 1.11.510 azure_core_cpp: diff --git a/.ci_support/win_64_cuda_compiler_version11.8.yaml b/.ci_support/win_64_cuda_compiler_version11.8.yaml index 3e7ee853c..4305131bf 100644 --- a/.ci_support/win_64_cuda_compiler_version11.8.yaml +++ b/.ci_support/win_64_cuda_compiler_version11.8.yaml @@ -1,5 +1,5 @@ aws_crt_cpp: -- 0.32.8 +- 0.32.10 aws_sdk_cpp: - 1.11.510 bzip2: diff --git a/.ci_support/win_64_cuda_compiler_versionNone.yaml b/.ci_support/win_64_cuda_compiler_versionNone.yaml index 4b5821620..c8247d5f3 100644 --- a/.ci_support/win_64_cuda_compiler_versionNone.yaml +++ b/.ci_support/win_64_cuda_compiler_versionNone.yaml @@ -1,5 +1,5 @@ aws_crt_cpp: -- 0.32.8 +- 0.32.10 aws_sdk_cpp: - 1.11.510 bzip2: From dc97f4442a1c906ee6875098c8eddc59aee62c56 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sun, 6 Jul 2025 08:44:22 +0000 Subject: [PATCH 16/55] Rebuild for libabseil 20250512, libgrpc 1.73 & libprotobuf 6.31.1 --- .../migrations/absl_grpc_proto_25Q2.yaml | 29 +++++++++++++++++++ recipe/meta.yaml | 2 +- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/absl_grpc_proto_25Q2.yaml diff --git a/.ci_support/migrations/absl_grpc_proto_25Q2.yaml b/.ci_support/migrations/absl_grpc_proto_25Q2.yaml new file mode 100644 index 000000000..10b7a0955 --- /dev/null +++ b/.ci_support/migrations/absl_grpc_proto_25Q2.yaml @@ -0,0 +1,29 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for libabseil 20250512, libgrpc 1.73 & libprotobuf 6.31.1 + kind: version + migration_number: 1 + exclude: + # core deps + - abseil-cpp + - grpc-cpp + - libprotobuf + # required for building/testing + - protobuf + - re2 + # bazel stack + - bazel + - grpc_java_plugin + - singlejar +libabseil: +- 20250512 +libgrpc: +- "1.73" +libprotobuf: +- 6.31.1 +# we need to leave this migration open until we're ready to move the global baseline, see +# https://github.com/conda-forge/conda-forge.github.io/issues/2467; grpc 1.72 requires 11.0, +# see https://github.com/grpc/grpc/commit/f122d248443c81592e748da1adb240cbf0a0231c +c_stdlib_version: # [osx] + - 11.0 # [osx] +migrator_ts: 1748506837.6039238 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 6f50ed5a4..cc9bc4c5d 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -38,7 +38,7 @@ source: folder: cpp/submodules/parquet-testing build: - number: 16 + number: 17 # 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)] From ef66904d3828ee95ffe16cb2b98325b100ea521f Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sun, 6 Jul 2025 08:48:22 +0000 Subject: [PATCH 17/55] MNT: Re-rendered with conda-build 25.5.0, conda-smithy 3.50.1, and conda-forge-pinning 2025.07.06.02.50.29 --- ...a_compiler_version11.8cxx_compiler_version11.yaml | 6 +++--- ...a_compiler_versionNonecxx_compiler_version13.yaml | 6 +++--- ...a_compiler_version11.8cxx_compiler_version11.yaml | 6 +++--- ...a_compiler_versionNonecxx_compiler_version13.yaml | 6 +++--- ...a_compiler_version11.8cxx_compiler_version11.yaml | 6 +++--- ...a_compiler_versionNonecxx_compiler_version13.yaml | 6 +++--- .ci_support/migrations/aws_crt_cpp03210.yaml | 8 -------- .ci_support/osx_64_.yaml | 12 ++++++------ .ci_support/osx_arm64_.yaml | 6 +++--- .ci_support/win_64_cuda_compiler_version11.8.yaml | 6 +++--- .ci_support/win_64_cuda_compiler_versionNone.yaml | 6 +++--- 11 files changed, 33 insertions(+), 41 deletions(-) delete mode 100644 .ci_support/migrations/aws_crt_cpp03210.yaml diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml index 8c151c4cb..245a81ba9 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml @@ -43,7 +43,7 @@ gflags: glog: - '0.7' libabseil: -- '20250127' +- '20250512' libarrow: - '*' libboost_devel: @@ -53,11 +53,11 @@ libgoogle_cloud_devel: libgoogle_cloud_storage_devel: - '2.36' libgrpc: -- '1.71' +- '1.73' libopentelemetry_cpp: - '1.21' libprotobuf: -- 5.29.3 +- 6.31.1 libutf8proc: - '2.10' lz4_c: diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml index a4ed9356a..d269d7f46 100644 --- a/.ci_support/linux_64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml +++ b/.ci_support/linux_64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml @@ -43,7 +43,7 @@ gflags: glog: - '0.7' libabseil: -- '20250127' +- '20250512' libarrow: - '*' libboost_devel: @@ -53,11 +53,11 @@ libgoogle_cloud_devel: libgoogle_cloud_storage_devel: - '2.36' libgrpc: -- '1.71' +- '1.73' libopentelemetry_cpp: - '1.21' libprotobuf: -- 5.29.3 +- 6.31.1 libutf8proc: - '2.10' lz4_c: diff --git a/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml index 3fdced49e..13be37a71 100644 --- a/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml @@ -43,7 +43,7 @@ gflags: glog: - '0.7' libabseil: -- '20250127' +- '20250512' libarrow: - '*' libboost_devel: @@ -53,11 +53,11 @@ libgoogle_cloud_devel: libgoogle_cloud_storage_devel: - '2.36' libgrpc: -- '1.71' +- '1.73' libopentelemetry_cpp: - '1.21' libprotobuf: -- 5.29.3 +- 6.31.1 libutf8proc: - '2.10' lz4_c: diff --git a/.ci_support/linux_aarch64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml b/.ci_support/linux_aarch64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml index 147550452..30d547cff 100644 --- a/.ci_support/linux_aarch64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml @@ -43,7 +43,7 @@ gflags: glog: - '0.7' libabseil: -- '20250127' +- '20250512' libarrow: - '*' libboost_devel: @@ -53,11 +53,11 @@ libgoogle_cloud_devel: libgoogle_cloud_storage_devel: - '2.36' libgrpc: -- '1.71' +- '1.73' libopentelemetry_cpp: - '1.21' libprotobuf: -- 5.29.3 +- 6.31.1 libutf8proc: - '2.10' lz4_c: diff --git a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml index ae39673e7..cadd38940 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml @@ -43,7 +43,7 @@ gflags: glog: - '0.7' libabseil: -- '20250127' +- '20250512' libarrow: - '*' libboost_devel: @@ -53,11 +53,11 @@ libgoogle_cloud_devel: libgoogle_cloud_storage_devel: - '2.36' libgrpc: -- '1.71' +- '1.73' libopentelemetry_cpp: - '1.21' libprotobuf: -- 5.29.3 +- 6.31.1 libutf8proc: - '2.10' lz4_c: diff --git a/.ci_support/linux_ppc64le_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml b/.ci_support/linux_ppc64le_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml index 7aad59d70..471c6b6b1 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml @@ -43,7 +43,7 @@ gflags: glog: - '0.7' libabseil: -- '20250127' +- '20250512' libarrow: - '*' libboost_devel: @@ -53,11 +53,11 @@ libgoogle_cloud_devel: libgoogle_cloud_storage_devel: - '2.36' libgrpc: -- '1.71' +- '1.73' libopentelemetry_cpp: - '1.21' libprotobuf: -- 5.29.3 +- 6.31.1 libutf8proc: - '2.10' lz4_c: diff --git a/.ci_support/migrations/aws_crt_cpp03210.yaml b/.ci_support/migrations/aws_crt_cpp03210.yaml deleted file mode 100644 index 911ff41f4..000000000 --- a/.ci_support/migrations/aws_crt_cpp03210.yaml +++ /dev/null @@ -1,8 +0,0 @@ -__migrator: - build_number: 1 - commit_message: Rebuild for aws_crt_cpp 0.32.10 - kind: version - migration_number: 1 -aws_crt_cpp: -- 0.32.10 -migrator_ts: 1750807365.719297 diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index d657a5624..b5d2e2613 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -1,7 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.14' +- '11.0' MACOSX_SDK_VERSION: -- '10.14' +- '11.0' aws_crt_cpp: - 0.32.10 aws_sdk_cpp: @@ -23,7 +23,7 @@ c_compiler_version: c_stdlib: - macosx_deployment_target c_stdlib_version: -- '10.14' +- '11.0' channel_sources: - conda-forge channel_targets: @@ -39,7 +39,7 @@ gflags: glog: - '0.7' libabseil: -- '20250127' +- '20250512' libarrow: - '*' libboost_devel: @@ -49,11 +49,11 @@ libgoogle_cloud_devel: libgoogle_cloud_storage_devel: - '2.36' libgrpc: -- '1.71' +- '1.73' libopentelemetry_cpp: - '1.21' libprotobuf: -- 5.29.3 +- 6.31.1 libutf8proc: - '2.10' lz4_c: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 6ccedc3eb..3323fa46f 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -39,7 +39,7 @@ gflags: glog: - '0.7' libabseil: -- '20250127' +- '20250512' libarrow: - '*' libboost_devel: @@ -49,11 +49,11 @@ libgoogle_cloud_devel: libgoogle_cloud_storage_devel: - '2.36' libgrpc: -- '1.71' +- '1.73' libopentelemetry_cpp: - '1.21' libprotobuf: -- 5.29.3 +- 6.31.1 libutf8proc: - '2.10' lz4_c: diff --git a/.ci_support/win_64_cuda_compiler_version11.8.yaml b/.ci_support/win_64_cuda_compiler_version11.8.yaml index 4305131bf..6f3d40f35 100644 --- a/.ci_support/win_64_cuda_compiler_version11.8.yaml +++ b/.ci_support/win_64_cuda_compiler_version11.8.yaml @@ -25,7 +25,7 @@ gflags: glog: - '0.7' libabseil: -- '20250127' +- '20250512' libarrow: - '*' libboost_devel: @@ -39,9 +39,9 @@ libgoogle_cloud_devel: libgoogle_cloud_storage_devel: - '2.36' libgrpc: -- '1.71' +- '1.73' libprotobuf: -- 5.29.3 +- 6.31.1 libutf8proc: - '2.10' lz4_c: diff --git a/.ci_support/win_64_cuda_compiler_versionNone.yaml b/.ci_support/win_64_cuda_compiler_versionNone.yaml index c8247d5f3..b3deaf5e9 100644 --- a/.ci_support/win_64_cuda_compiler_versionNone.yaml +++ b/.ci_support/win_64_cuda_compiler_versionNone.yaml @@ -25,7 +25,7 @@ gflags: glog: - '0.7' libabseil: -- '20250127' +- '20250512' libarrow: - '*' libboost_devel: @@ -39,9 +39,9 @@ libgoogle_cloud_devel: libgoogle_cloud_storage_devel: - '2.36' libgrpc: -- '1.71' +- '1.73' libprotobuf: -- 5.29.3 +- 6.31.1 libutf8proc: - '2.10' lz4_c: From cc047325e8e867ad279cf2f3e4456ee4bd5e7cab Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Mon, 7 Jul 2025 14:14:13 +1100 Subject: [PATCH 18/55] backport patch for compatibility with protobuf using string_view --- recipe/meta.yaml | 2 + recipe/patches/0001-disable-gcsfs_test.patch | 2 +- ...2-skip-NonExistentBucket-test-on-osx.patch | 2 +- ...ude-in-cpp-src-parquet-size_statisti.patch | 2 +- ...H-45225-C-Upgrade-ORC-to-2.1.0-45226.patch | 2 +- ...-1.19-compat-after-silent-breaking-c.patch | 2 +- ...plicit-conversion-of-possible-absl-s.patch | 78 +++++++++++++++++++ 7 files changed, 85 insertions(+), 5 deletions(-) create mode 100644 recipe/patches/0006-GH-46134-CI-C-Explicit-conversion-of-possible-absl-s.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index cc9bc4c5d..b42ac6dd6 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -28,6 +28,8 @@ source: - patches/0004-GH-45225-C-Upgrade-ORC-to-2.1.0-45226.patch # backport https://github.com/apache/arrow/pull/45859 - patches/0005-MINOR-C-Fix-OTel-1.19-compat-after-silent-breaking-c.patch + # backport https://github.com/apache/arrow/pull/46136 + - patches/0006-GH-46134-CI-C-Explicit-conversion-of-possible-absl-s.patch # testing-submodules not part of release tarball - git_url: https://github.com/apache/arrow-testing.git diff --git a/recipe/patches/0001-disable-gcsfs_test.patch b/recipe/patches/0001-disable-gcsfs_test.patch index c8541189b..a08af3092 100644 --- a/recipe/patches/0001-disable-gcsfs_test.patch +++ b/recipe/patches/0001-disable-gcsfs_test.patch @@ -1,7 +1,7 @@ From e35ee3c6edc44b9bc3bd998afc4b3ad3227b6a56 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sat, 2 Nov 2024 15:41:34 +1100 -Subject: [PATCH 1/5] disable gcsfs_test +Subject: [PATCH 1/6] disable gcsfs_test it cannot work unless we package https://github.com/googleapis/storage-testbench, which however has extremely tight dependencies on protobuf etc., making it very diff --git a/recipe/patches/0002-skip-NonExistentBucket-test-on-osx.patch b/recipe/patches/0002-skip-NonExistentBucket-test-on-osx.patch index d8cef70cb..ca713c67d 100644 --- a/recipe/patches/0002-skip-NonExistentBucket-test-on-osx.patch +++ b/recipe/patches/0002-skip-NonExistentBucket-test-on-osx.patch @@ -1,7 +1,7 @@ From f9e6ab1ac71c1bc69905adc397302d14bf0e92f1 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 24 Nov 2024 20:22:35 +1100 -Subject: [PATCH 2/5] skip NonExistentBucket test on osx +Subject: [PATCH 2/6] skip NonExistentBucket test on osx --- cpp/src/arrow/filesystem/s3fs_test.cc | 4 ++++ diff --git a/recipe/patches/0003-add-missing-include-in-cpp-src-parquet-size_statisti.patch b/recipe/patches/0003-add-missing-include-in-cpp-src-parquet-size_statisti.patch index 02b61f997..1e6e797db 100644 --- a/recipe/patches/0003-add-missing-include-in-cpp-src-parquet-size_statisti.patch +++ b/recipe/patches/0003-add-missing-include-in-cpp-src-parquet-size_statisti.patch @@ -1,7 +1,7 @@ From cf86fabb1dda76ba45b97e84d0566540e3bcc242 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Mon, 17 Feb 2025 11:56:43 +1100 -Subject: [PATCH 3/5] add missing include in cpp/src/parquet/size_statistics.cc +Subject: [PATCH 3/6] add missing include in cpp/src/parquet/size_statistics.cc Suggested-By: Bryce Mecum --- diff --git a/recipe/patches/0004-GH-45225-C-Upgrade-ORC-to-2.1.0-45226.patch b/recipe/patches/0004-GH-45225-C-Upgrade-ORC-to-2.1.0-45226.patch index 1882bb38f..c70213de7 100644 --- a/recipe/patches/0004-GH-45225-C-Upgrade-ORC-to-2.1.0-45226.patch +++ b/recipe/patches/0004-GH-45225-C-Upgrade-ORC-to-2.1.0-45226.patch @@ -1,7 +1,7 @@ From c403b19c68babb050b98a0a5203153dd36ab1db3 Mon Sep 17 00:00:00 2001 From: Gang Wu Date: Tue, 14 Jan 2025 10:25:08 +0800 -Subject: [PATCH 4/5] GH-45225: [C++] Upgrade ORC to 2.1.0 (#45226) +Subject: [PATCH 4/6] GH-45225: [C++] Upgrade ORC to 2.1.0 (#45226) ### Rationale for this change diff --git a/recipe/patches/0005-MINOR-C-Fix-OTel-1.19-compat-after-silent-breaking-c.patch b/recipe/patches/0005-MINOR-C-Fix-OTel-1.19-compat-after-silent-breaking-c.patch index 2c8621bbb..de5f2da7d 100644 --- a/recipe/patches/0005-MINOR-C-Fix-OTel-1.19-compat-after-silent-breaking-c.patch +++ b/recipe/patches/0005-MINOR-C-Fix-OTel-1.19-compat-after-silent-breaking-c.patch @@ -1,7 +1,7 @@ From 4d2513bec967c2a671f96039fbc1e91a627a36fa Mon Sep 17 00:00:00 2001 From: David Li Date: Wed, 19 Mar 2025 09:34:50 +0900 -Subject: [PATCH 5/5] MINOR: [C++] Fix OTel 1.19 compat after silent breaking +Subject: [PATCH 5/6] MINOR: [C++] Fix OTel 1.19 compat after silent breaking change --- diff --git a/recipe/patches/0006-GH-46134-CI-C-Explicit-conversion-of-possible-absl-s.patch b/recipe/patches/0006-GH-46134-CI-C-Explicit-conversion-of-possible-absl-s.patch new file mode 100644 index 000000000..4bbf66724 --- /dev/null +++ b/recipe/patches/0006-GH-46134-CI-C-Explicit-conversion-of-possible-absl-s.patch @@ -0,0 +1,78 @@ +From 78e297360e6a335904fabed75ec0b2dd0cf7ade4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= +Date: Mon, 14 Apr 2025 23:46:23 +0200 +Subject: [PATCH 6/6] GH-46134: [CI][C++] Explicit conversion of possible + `absl::string_view` on protobuf methods to `std::string` (#46136) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +### Rationale for this change + +Protobuf v30.2 uses `absl::string_view` instead of `const char*` as seen here: +https://github.com/protocolbuffers/protobuf/commit/a9ad51f5b6a19eacc934bcb51db6282ec1fabb8c +This is breaking on our CI. + +### What changes are included in this PR? + +Explicitly convert `google::protobuf::EnumValueDescriptor::name()` and `google::protobuf::Message::descriptor()->full_name()` from `absl::string_view` to `std::string` + +### Are these changes tested? + +Via CI, MinGW CI jobs use protobuf v30.2 and those are fixed with this change. + +### Are there any user-facing changes? + +No + +* GitHub Issue: #46134 + +Authored-by: Raúl Cumplido +Signed-off-by: Sutou Kouhei +--- + cpp/src/arrow/engine/substrait/expression_internal.cc | 2 +- + cpp/src/arrow/engine/substrait/serde.cc | 4 ++-- + cpp/src/arrow/engine/substrait/util_internal.cc | 2 +- + 3 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/cpp/src/arrow/engine/substrait/expression_internal.cc b/cpp/src/arrow/engine/substrait/expression_internal.cc +index 16dcba8944..02e453fbff 100644 +--- a/cpp/src/arrow/engine/substrait/expression_internal.cc ++++ b/cpp/src/arrow/engine/substrait/expression_internal.cc +@@ -142,7 +142,7 @@ std::string EnumToString(int value, const google::protobuf::EnumDescriptor* desc + if (value_desc == nullptr) { + return "unknown"; + } +- return value_desc->name(); ++ return std::string(value_desc->name()); + } + + Result FromProto(const substrait::Expression::ReferenceSegment* ref, +diff --git a/cpp/src/arrow/engine/substrait/serde.cc b/cpp/src/arrow/engine/substrait/serde.cc +index 6b4c05a3b1..db2dcb5928 100644 +--- a/cpp/src/arrow/engine/substrait/serde.cc ++++ b/cpp/src/arrow/engine/substrait/serde.cc +@@ -62,8 +62,8 @@ Status ParseFromBufferImpl(const Buffer& buf, const std::string& full_name, + template + Result ParseFromBuffer(const Buffer& buf) { + Message message; +- ARROW_RETURN_NOT_OK( +- ParseFromBufferImpl(buf, Message::descriptor()->full_name(), &message)); ++ ARROW_RETURN_NOT_OK(ParseFromBufferImpl( ++ buf, std::string(Message::descriptor()->full_name()), &message)); + return message; + } + +diff --git a/cpp/src/arrow/engine/substrait/util_internal.cc b/cpp/src/arrow/engine/substrait/util_internal.cc +index 89034784ab..35e3baf94a 100644 +--- a/cpp/src/arrow/engine/substrait/util_internal.cc ++++ b/cpp/src/arrow/engine/substrait/util_internal.cc +@@ -30,7 +30,7 @@ std::string EnumToString(int value, const google::protobuf::EnumDescriptor& desc + if (value_desc == nullptr) { + return "unknown"; + } +- return value_desc->name(); ++ return std::string(value_desc->name()); + } + + std::unique_ptr CreateVersion() { From 8b495a5c26b7e38496511fcdddcc2c1d7f37a260 Mon Sep 17 00:00:00 2001 From: Srinivas Lade Date: Tue, 16 Jul 2024 13:56:08 -0400 Subject: [PATCH 19/55] Build linux64 with Bodo Changes - With Sccache - Upload to Internal Artifactory Apply Bodo Changes Update Bodo Patch Enable SIMD and Upload Disable SIMD from failure Fix and SCCache Add creds Forgot Creds Pass through docker Was gitignored pass through correctly Fix Bug --- .azure-pipelines/azure-pipelines-linux.yml | 39 ++- .scripts/build_steps.sh | 5 +- .scripts/run_docker_build.sh | 5 +- .scripts/upload_binary.sh | 20 ++ azure-pipelines.yml | 2 - recipe/build.sh | 7 + recipe/meta.yaml | 7 + recipe/patches/0006-Bodo-Changes.patch | 303 +++++++++++++++++++++ 8 files changed, 361 insertions(+), 27 deletions(-) create mode 100644 .scripts/upload_binary.sh create mode 100644 recipe/patches/0006-Bodo-Changes.patch diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 8bf9ccf17..5a8d26061 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,34 +8,21 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11: - CONFIG: linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11 - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64-cuda11.8:ubi8 linux_64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13: CONFIG: linux_64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11: - CONFIG: linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11 - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64-cuda11.8:ubi8 - linux_aarch64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13: - CONFIG: linux_aarch64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13 - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11: - CONFIG: linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11 - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64-cuda11.8:ubi8 - linux_ppc64le_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13: - CONFIG: linux_ppc64le_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13 - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 timeoutInMinutes: 360 - variables: {} + variables: + - group: AWS-427-S3-Access-Keys steps: + - task: DownloadSecureFile@1 + name: secret_file + displayName: "Download Secrets File" + inputs: + secureFile: "publish_binary_secrets" + - script: | sudo mkdir -p /opt/empty_dir || true for d in \ @@ -77,9 +64,17 @@ jobs: else export IS_PR_BUILD="False" fi + + sudo chmod a+r $(secret_file.secureFilePath) + export SECRETS_DIR=$HOME/secrets + mkdir -p $SECRETS_DIR + sudo cp $(secret_file.secureFilePath) $SECRETS_DIR/secret_file + .scripts/run_docker_build.sh displayName: Run docker build env: BINSTAR_TOKEN: $(BINSTAR_TOKEN) FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) - STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) \ No newline at end of file + STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) + AWS_ACCESS_KEY_ID: $(AWS_ACCESS_KEY_ID) + AWS_SECRET_ACCESS_KEY: $(AWS_SECRET_ACCESS_KEY) diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 827a29fbc..c6830decb 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -89,7 +89,8 @@ else ( startgroup "Uploading packages" ) 2> /dev/null if [[ "${UPLOAD_PACKAGES}" != "False" ]] && [[ "${IS_PR_BUILD}" == "False" ]]; then - upload_package --validate --feedstock-name="${FEEDSTOCK_NAME}" "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" + # upload_package --validate --feedstock-name="${FEEDSTOCK_NAME}" "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" + bash ${FEEDSTOCK_ROOT}/.scripts/upload_binary.sh fi ( endgroup "Uploading packages" ) 2> /dev/null @@ -97,4 +98,4 @@ fi ( startgroup "Final checks" ) 2> /dev/null -touch "${FEEDSTOCK_ROOT}/build_artifacts/conda-forge-build-done-${CONFIG}" \ No newline at end of file +touch "${FEEDSTOCK_ROOT}/build_artifacts/conda-forge-build-done-${CONFIG}" diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index 6ee04aa12..311d80bd2 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -86,6 +86,7 @@ docker pull "${DOCKER_IMAGE}" docker run ${DOCKER_RUN_ARGS} \ -v "${RECIPE_ROOT}":/home/conda/recipe_root:rw,z,delegated \ -v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root:rw,z,delegated \ + -v "${SECRETS_DIR}":/home/secrets:rw,z,delegated \ -e CONFIG \ -e HOST_USER_ID \ -e UPLOAD_PACKAGES \ @@ -103,6 +104,8 @@ docker run ${DOCKER_RUN_ARGS} \ -e BINSTAR_TOKEN \ -e FEEDSTOCK_TOKEN \ -e STAGING_BINSTAR_TOKEN \ + -e AWS_ACCESS_KEY_ID \ + -e AWS_SECRET_ACCESS_KEY \ "${DOCKER_IMAGE}" \ bash \ "/home/conda/feedstock_root/${PROVIDER_DIR}/build_steps.sh" @@ -111,4 +114,4 @@ docker run ${DOCKER_RUN_ARGS} \ test -f "$DONE_CANARY" # This closes the last group opened in `build_steps.sh` -( endgroup "Final checks" ) 2> /dev/null \ No newline at end of file +( endgroup "Final checks" ) 2> /dev/null diff --git a/.scripts/upload_binary.sh b/.scripts/upload_binary.sh new file mode 100644 index 000000000..44347096e --- /dev/null +++ b/.scripts/upload_binary.sh @@ -0,0 +1,20 @@ +#!/usr/bin/env bash +set -exo pipefail + +echo "********** Publishing to Artifactory **********" +USERNAME=`cat /home/secrets/secret_file | grep artifactory.ci.username | cut -f 2 -d' '` +TOKEN=`cat /home/secrets/secret_file | grep artifactory.ci.token | cut -f 2 -d' '` +ANACONDA_TOKEN=`cat /home/secrets/secret_file | grep anaconda.org.token | cut -f 2 -d' '` + +CHANNEL_NAME="bodo.ai-platform" + +for package in `ls ${FEEDSTOCK_ROOT}/build_artifacts/linux-64/*.conda`; do + package_name=`basename $package` + echo "Package Name: $package_name" + + curl -u${USERNAME}:${TOKEN} -T $package "https://bodo.jfrog.io/artifactory/${CHANNEL_NAME}/linux-64/$package_name" +done +curl -X POST https://$USERNAME:$TOKEN@bodo.jfrog.io/artifactory/api/conda/$CHANNEL_NAME/reindex + +# Reindex Conda +curl -s -X POST "https://$USERNAME:$TOKEN@bodo.jfrog.io/artifactory/api/conda/$CHANNEL_NAME/reindex?async=0" diff --git a/azure-pipelines.yml b/azure-pipelines.yml index eff4ad66b..bb0a82330 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -29,5 +29,3 @@ stages: dependsOn: Check jobs: - template: ./.azure-pipelines/azure-pipelines-linux.yml - - template: ./.azure-pipelines/azure-pipelines-osx.yml - - template: ./.azure-pipelines/azure-pipelines-win.yml \ No newline at end of file diff --git a/recipe/build.sh b/recipe/build.sh index 52ca96327..0d14fab70 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -48,6 +48,12 @@ fi # reusable variable for dependencies we cannot yet unvendor export READ_RECIPE_META_YAML_WHY_NOT=OFF +# Enable SCCache +export SCCACHE_BUCKET=engine-codebuild-cache +export SCCACHE_REGION=us-east-2 +export SCCACHE_S3_USE_SSL=true +export SCCACHE_S3_SERVER_SIDE_ENCRYPTION=true + # for available switches see # https://github.com/apache/arrow/blame/apache-arrow-12.0.0/cpp/cmake_modules/DefineOptions.cmake # placeholder in ARROW_GDB_INSTALL_DIR must match _la_placeholder in activate.sh @@ -86,6 +92,7 @@ cmake -GNinja \ -DARROW_SUBSTRAIT=ON \ -DARROW_USE_GLOG=ON \ -DARROW_USE_LD_GOLD=ON \ + -DARROW_USE_SCCACHE=ON \ -DARROW_WITH_BROTLI=ON \ -DARROW_WITH_BZ2=ON \ -DARROW_WITH_LZ4=ON \ diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 6f50ed5a4..4d3536492 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -28,6 +28,7 @@ source: - patches/0004-GH-45225-C-Upgrade-ORC-to-2.1.0-45226.patch # backport https://github.com/apache/arrow/pull/45859 - patches/0005-MINOR-C-Fix-OTel-1.19-compat-after-silent-breaking-c.patch + - pathces/0006-Bodo-Changes.patch # testing-submodules not part of release tarball - git_url: https://github.com/apache/arrow-testing.git @@ -42,6 +43,11 @@ build: # 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)] + # arrow promises API- & ABI-compatibility along SemVer, see #1096 + script_env: + # Necessary for sccache to find AWS + - AWS_ACCESS_KEY_ID + - AWS_SECRET_ACCESS_KEY requirements: build: @@ -63,6 +69,7 @@ requirements: - make # [unix] # where orc ends up looking (because during build, CONDA_PREFIX==BUILD_PREFIX) - tzdata + - sccache host: # for required dependencies, see # https://github.com/apache/arrow/blob/apache-arrow-11.0.0/cpp/cmake_modules/ThirdpartyToolchain.cmake#L46-L75 diff --git a/recipe/patches/0006-Bodo-Changes.patch b/recipe/patches/0006-Bodo-Changes.patch new file mode 100644 index 000000000..38929da79 --- /dev/null +++ b/recipe/patches/0006-Bodo-Changes.patch @@ -0,0 +1,303 @@ +diff --git a/cpp/CMakePresets.json b/cpp/CMakePresets.json +index 13d1241990..cb64601b6f 100644 +--- a/cpp/CMakePresets.json ++++ b/cpp/CMakePresets.json +@@ -182,6 +182,21 @@ + "ARROW_ORC": "ON" + } + }, ++ { ++ "name": "features-python-bodo", ++ "inherits": [ ++ "features-filesystems", ++ "features-flight-sql", ++ "features-gandiva", ++ "features-main", ++ "features-python-minimal" ++ ], ++ "hidden": true, ++ "cacheVariables": { ++ "ARROW_ORC": "ON", ++ "PARQUET_REQUIRE_ENCRYPTION": "ON" ++ } ++ }, + { + "name": "features-python-maximal", + "inherits": [ +@@ -430,6 +445,15 @@ + "displayName": "Release build for PyArrow with common features (for backward compatibility)", + "cacheVariables": {} + }, ++ { ++ "name": "ninja-release-python-bodo", ++ "inherits": [ ++ "base-release", ++ "features-python-bodo" ++ ], ++ "displayName": "Release build for PyArrow with everything required for Bodo", ++ "cacheVariables": {} ++ }, + { + "name": "ninja-release-python-maximal", + "inherits": [ +@@ -491,4 +515,4 @@ + } + } + ] +-} +\ No newline at end of file ++} +diff --git a/cpp/src/arrow/dataset/file_parquet.cc b/cpp/src/arrow/dataset/file_parquet.cc +index c17ba89be7..15bde86ba4 100644 +--- a/cpp/src/arrow/dataset/file_parquet.cc ++++ b/cpp/src/arrow/dataset/file_parquet.cc +@@ -36,6 +36,7 @@ + #include "arrow/util/iterator.h" + #include "arrow/util/logging.h" + #include "arrow/util/range.h" ++#include "arrow/util/thread_pool.h" + #include "arrow/util/tracing_internal.h" + #include "parquet/arrow/reader.h" + #include "parquet/arrow/schema.h" +@@ -630,10 +631,15 @@ Result ParquetFileFormat::ScanBatchesAsync( + kParquetTypeName, options.get(), default_fragment_scan_options)); + int batch_readahead = options->batch_readahead; + int64_t rows_to_readahead = batch_readahead * options->batch_size; +- ARROW_ASSIGN_OR_RAISE(auto generator, +- reader->GetRecordBatchGenerator( +- reader, row_groups, column_projection, +- ::arrow::internal::GetCpuThreadPool(), rows_to_readahead)); ++ // Modified this to pass the executor in scan_options instead of always using the ++ // default CPU thread pool. ++ // XXX Should we get it from options->fragment_scan_options instead?? ++ auto cpu_executor = options->exec_context.executor() ++ ? options->exec_context.executor() ++ : ::arrow::internal::GetCpuThreadPool(); ++ ARROW_ASSIGN_OR_RAISE(auto generator, reader->GetRecordBatchGenerator( ++ reader, row_groups, column_projection, ++ cpu_executor, rows_to_readahead)); + RecordBatchGenerator sliced = + SlicingGenerator(std::move(generator), options->batch_size); + if (batch_readahead == 0) { +diff --git a/cpp/src/arrow/dataset/scanner.cc b/cpp/src/arrow/dataset/scanner.cc +index 18981d1451..cdf5f586b4 100644 +--- a/cpp/src/arrow/dataset/scanner.cc ++++ b/cpp/src/arrow/dataset/scanner.cc +@@ -302,6 +302,7 @@ Result FragmentToBatches( + {"arrow.dataset.fragment.type_name", fragment.value->type_name()}, + }); + #endif ++ // This is the call site. + ARROW_ASSIGN_OR_RAISE(auto batch_gen, fragment.value->ScanBatchesAsync(options)); + ArrayVector columns; + for (const auto& field : options->dataset_schema->fields()) { +@@ -327,6 +328,7 @@ Result FragmentToBatches( + Result> FragmentsToBatches( + FragmentGenerator fragment_gen, const std::shared_ptr& options) { + auto enumerated_fragment_gen = MakeEnumeratedGenerator(std::move(fragment_gen)); ++ // This is the call-site. + auto batch_gen_gen = + MakeMappedGenerator(std::move(enumerated_fragment_gen), + [=](const Enumerated>& fragment) { +@@ -353,8 +355,10 @@ class OneShotFragment : public Fragment { + ARROW_ASSIGN_OR_RAISE( + auto background_gen, + MakeBackgroundGenerator(std::move(batch_it_), options->io_context.executor())); +- return MakeTransferredGenerator(std::move(background_gen), +- ::arrow::internal::GetCpuThreadPool()); ++ auto cpu_executor = options->exec_context.executor() ++ ? options->exec_context.executor() ++ : ::arrow::internal::GetCpuThreadPool(); ++ return MakeTransferredGenerator(std::move(background_gen), cpu_executor); + } + std::string type_name() const override { return "one-shot"; } + +@@ -380,7 +384,7 @@ Result AsyncScanner::ScanBatches() { + [this](::arrow::internal::Executor* executor) { + return ScanBatchesAsync(executor); + }, +- scan_options_->use_threads); ++ scan_options_->use_threads, this->async_cpu_executor()); + } + + Result AsyncScanner::ScanBatchesUnordered() { +@@ -388,7 +392,7 @@ Result AsyncScanner::ScanBatchesUnordered() { + [this](::arrow::internal::Executor* executor) { + return ScanBatchesUnorderedAsync(executor); + }, +- scan_options_->use_threads); ++ scan_options_->use_threads, this->async_cpu_executor()); + } + + Result> AsyncScanner::ToTable() { +@@ -398,7 +402,7 @@ Result> AsyncScanner::ToTable() { + } + + Result AsyncScanner::ScanBatchesUnorderedAsync() { +- return ScanBatchesUnorderedAsync(::arrow::internal::GetCpuThreadPool(), ++ return ScanBatchesUnorderedAsync(this->async_cpu_executor(), + /*sequence_fragments=*/false); + } + +@@ -443,6 +447,7 @@ Result AsyncScanner::ScanBatchesUnorderedAsync( + scan_options_->projection.call()->options.get()) + ->field_names; + ++ // This is where the node is added to the plan. + RETURN_NOT_OK( + acero::Declaration::Sequence( + { +@@ -599,11 +604,12 @@ Result> AsyncScanner::Head(int64_t num_rows) { + } + + Result AsyncScanner::ScanBatchesAsync() { +- return ScanBatchesAsync(::arrow::internal::GetCpuThreadPool()); ++ return ScanBatchesAsync(this->async_cpu_executor()); + } + + Result AsyncScanner::ScanBatchesAsync( + Executor* cpu_executor) { ++ // Is this part of the code path? + ARROW_ASSIGN_OR_RAISE( + auto unordered, ScanBatchesUnorderedAsync(cpu_executor, /*sequence_fragments=*/true, + /*use_legacy_batching=*/true)); +@@ -775,7 +781,7 @@ Future AsyncScanner::CountRowsAsync(Executor* executor) { + } + + Future AsyncScanner::CountRowsAsync() { +- return CountRowsAsync(::arrow::internal::GetCpuThreadPool()); ++ return CountRowsAsync(this->async_cpu_executor()); + } + + Result AsyncScanner::CountRows() { +@@ -999,6 +1005,7 @@ Result MakeScanNode(acero::ExecPlan* plan, + ARROW_ASSIGN_OR_RAISE(auto fragments_vec, fragments_it.ToVector()); + auto fragment_gen = MakeVectorGenerator(std::move(fragments_vec)); + ++ // This is the call site. + ARROW_ASSIGN_OR_RAISE(auto batch_gen_gen, + FragmentsToBatches(std::move(fragment_gen), scan_options)); + +@@ -1168,6 +1175,7 @@ Result MakeOrderedSinkNode(acero::ExecPlan* plan, + + namespace internal { + void InitializeScanner(arrow::acero::ExecFactoryRegistry* registry) { ++ // This is where it's registered. + DCHECK_OK(registry->AddFactory("scan", MakeScanNode)); + DCHECK_OK(registry->AddFactory("ordered_sink", MakeOrderedSinkNode)); + DCHECK_OK(registry->AddFactory("augmented_project", MakeAugmentedProjectNode)); +diff --git a/cpp/src/arrow/dataset/scanner.h b/cpp/src/arrow/dataset/scanner.h +index 4479158ff2..301cdc0517 100644 +--- a/cpp/src/arrow/dataset/scanner.h ++++ b/cpp/src/arrow/dataset/scanner.h +@@ -107,6 +107,11 @@ struct ARROW_DS_EXPORT ScanOptions { + /// Note: The IOContext executor will be ignored if use_threads is set to false + io::IOContext io_context; + ++ /// ExecContext for any CPU tasks ++ /// ++ /// Note: The ExecContext executor will be ignored if use_threads is set to false ++ compute::ExecContext exec_context; ++ + /// If true the scanner will scan in parallel + /// + /// Note: If true, this will use threads from both the cpu_executor and the +@@ -437,6 +442,11 @@ class ARROW_DS_EXPORT Scanner { + TaggedRecordBatchIterator scan); + + const std::shared_ptr scan_options_; ++ ++ ::arrow::internal::Executor* async_cpu_executor() const { ++ return scan_options_->exec_context.executor() ? scan_options_->exec_context.executor() ++ : ::arrow::internal::GetCpuThreadPool(); ++ } + }; + + /// \brief ScannerBuilder is a factory class to construct a Scanner. It is used +diff --git a/cpp/src/arrow/util/thread_pool.h b/cpp/src/arrow/util/thread_pool.h +index 44b1e227b0..218edc60ca 100644 +--- a/cpp/src/arrow/util/thread_pool.h ++++ b/cpp/src/arrow/util/thread_pool.h +@@ -20,6 +20,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -591,6 +592,21 @@ typename Fut::SyncType RunSynchronously(FnOnce get_future, + } + } + ++template ++Iterator IterateSynchronously( ++ FnOnce()>>(Executor*)> get_gen, bool use_threads, ++ Executor* executor) { ++ if (use_threads) { ++ auto maybe_gen = std::move(get_gen)(executor); ++ if (!maybe_gen.ok()) { ++ return MakeErrorIterator(maybe_gen.status()); ++ } ++ return MakeGeneratorIterator(*maybe_gen); ++ } else { ++ return SerialExecutor::IterateGenerator(std::move(get_gen)); ++ } ++} ++ + /// \brief Potentially iterate an async generator serially (if use_threads is false) + /// \see IterateGenerator + /// +@@ -605,15 +621,7 @@ typename Fut::SyncType RunSynchronously(FnOnce get_future, + template + Iterator IterateSynchronously( + FnOnce()>>(Executor*)> get_gen, bool use_threads) { +- if (use_threads) { +- auto maybe_gen = std::move(get_gen)(GetCpuThreadPool()); +- if (!maybe_gen.ok()) { +- return MakeErrorIterator(maybe_gen.status()); +- } +- return MakeGeneratorIterator(*maybe_gen); +- } else { +- return SerialExecutor::IterateGenerator(std::move(get_gen)); +- } ++ return IterateSynchronously(std::move(get_gen), use_threads, GetCpuThreadPool()); + } + + } // namespace internal +diff --git a/cpp/src/parquet/arrow/reader.cc b/cpp/src/parquet/arrow/reader.cc +index d6ad7c25bc..5ade5bb747 100644 +--- a/cpp/src/parquet/arrow/reader.cc ++++ b/cpp/src/parquet/arrow/reader.cc +@@ -1153,6 +1153,7 @@ class RowGroupGenerator { + const int row_group, const std::vector& column_indices) { + // Skips bound checks/pre-buffering, since we've done that already + const int64_t batch_size = self->properties().batch_size(); ++ // This the main location. + return self->DecodeRowGroups(self, {row_group}, column_indices, cpu_executor) + .Then([batch_size](const std::shared_ptr& table) + -> ::arrow::Result { +@@ -1190,6 +1191,7 @@ FileReaderImpl::GetRecordBatchGenerator(std::shared_ptr reader, + reader_properties_.cache_options()); + END_PARQUET_CATCH_EXCEPTIONS + } ++ // This is where it's created it seems. + ::arrow::AsyncGenerator row_group_generator = + RowGroupGenerator(::arrow::internal::checked_pointer_cast(reader), + cpu_executor, row_group_indices, column_indices, +@@ -1228,6 +1230,7 @@ Status FileReaderImpl::ReadRowGroups(const std::vector& row_groups, + END_PARQUET_CATCH_EXCEPTIONS + } + ++ // This is another call site (might not be called by our use case). + auto fut = DecodeRowGroups(/*self=*/nullptr, row_groups, column_indices, + /*cpu_executor=*/nullptr); + ARROW_ASSIGN_OR_RAISE(*out, fut.MoveResult()); +@@ -1249,6 +1252,7 @@ Future> FileReaderImpl::DecodeRowGroups( + std::shared_ptr reader) + -> ::arrow::Result> { + std::shared_ptr<::arrow::ChunkedArray> column; ++ // This is the most likely place for invocation. + RETURN_NOT_OK(ReadColumn(static_cast(i), row_groups, reader.get(), &column)); + return column; + }; From 4e6efb0d984ce53f72150a864166630297e17768 Mon Sep 17 00:00:00 2001 From: Srinivas Lade Date: Mon, 29 Jul 2024 11:47:03 -0400 Subject: [PATCH 20/55] Upload to Anaconda as Well --- .scripts/upload_binary.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.scripts/upload_binary.sh b/.scripts/upload_binary.sh index 44347096e..2f0c1affe 100644 --- a/.scripts/upload_binary.sh +++ b/.scripts/upload_binary.sh @@ -13,6 +13,7 @@ for package in `ls ${FEEDSTOCK_ROOT}/build_artifacts/linux-64/*.conda`; do echo "Package Name: $package_name" curl -u${USERNAME}:${TOKEN} -T $package "https://bodo.jfrog.io/artifactory/${CHANNEL_NAME}/linux-64/$package_name" + anaconda -t $ANACONDA_TOKEN upload -u bodo.ai -c bodo.ai $package --label main --force done curl -X POST https://$USERNAME:$TOKEN@bodo.jfrog.io/artifactory/api/conda/$CHANNEL_NAME/reindex From 4c3395aea85b830d28724bfcbe70f5d6de15e023 Mon Sep 17 00:00:00 2001 From: Srinivas Lade Date: Mon, 29 Jul 2024 13:44:12 -0400 Subject: [PATCH 21/55] Modify Patch for Arrow 17 --- recipe/patches/0006-Bodo-Changes.patch | 49 -------------------------- 1 file changed, 49 deletions(-) diff --git a/recipe/patches/0006-Bodo-Changes.patch b/recipe/patches/0006-Bodo-Changes.patch index 38929da79..68a0ae8f5 100644 --- a/recipe/patches/0006-Bodo-Changes.patch +++ b/recipe/patches/0006-Bodo-Changes.patch @@ -1,52 +1,3 @@ -diff --git a/cpp/CMakePresets.json b/cpp/CMakePresets.json -index 13d1241990..cb64601b6f 100644 ---- a/cpp/CMakePresets.json -+++ b/cpp/CMakePresets.json -@@ -182,6 +182,21 @@ - "ARROW_ORC": "ON" - } - }, -+ { -+ "name": "features-python-bodo", -+ "inherits": [ -+ "features-filesystems", -+ "features-flight-sql", -+ "features-gandiva", -+ "features-main", -+ "features-python-minimal" -+ ], -+ "hidden": true, -+ "cacheVariables": { -+ "ARROW_ORC": "ON", -+ "PARQUET_REQUIRE_ENCRYPTION": "ON" -+ } -+ }, - { - "name": "features-python-maximal", - "inherits": [ -@@ -430,6 +445,15 @@ - "displayName": "Release build for PyArrow with common features (for backward compatibility)", - "cacheVariables": {} - }, -+ { -+ "name": "ninja-release-python-bodo", -+ "inherits": [ -+ "base-release", -+ "features-python-bodo" -+ ], -+ "displayName": "Release build for PyArrow with everything required for Bodo", -+ "cacheVariables": {} -+ }, - { - "name": "ninja-release-python-maximal", - "inherits": [ -@@ -491,4 +515,4 @@ - } - } - ] --} -\ No newline at end of file -+} diff --git a/cpp/src/arrow/dataset/file_parquet.cc b/cpp/src/arrow/dataset/file_parquet.cc index c17ba89be7..15bde86ba4 100644 --- a/cpp/src/arrow/dataset/file_parquet.cc From 0d42dae5c2497668820459785653e9423797d6fe Mon Sep 17 00:00:00 2001 From: Sahil Date: Mon, 12 Aug 2024 12:34:16 -0400 Subject: [PATCH 22/55] Update Bodo patch to include early casting changes in Parquet reader --- recipe/patches/0006-Bodo-Changes.patch | 194 +++++++++++++------------ 1 file changed, 101 insertions(+), 93 deletions(-) diff --git a/recipe/patches/0006-Bodo-Changes.patch b/recipe/patches/0006-Bodo-Changes.patch index 68a0ae8f5..d97e44e42 100644 --- a/recipe/patches/0006-Bodo-Changes.patch +++ b/recipe/patches/0006-Bodo-Changes.patch @@ -1,8 +1,24 @@ diff --git a/cpp/src/arrow/dataset/file_parquet.cc b/cpp/src/arrow/dataset/file_parquet.cc -index c17ba89be7..15bde86ba4 100644 +index 1f8b6cc488..5ad7a5f78b 100644 --- a/cpp/src/arrow/dataset/file_parquet.cc +++ b/cpp/src/arrow/dataset/file_parquet.cc -@@ -36,6 +36,7 @@ +@@ -26,16 +26,23 @@ + + #include "arrow/compute/cast.h" + #include "arrow/compute/exec.h" ++#include "arrow/dataset/dataset.h" + #include "arrow/dataset/dataset_internal.h" + #include "arrow/dataset/parquet_encryption_config.h" + #include "arrow/dataset/scanner.h" + #include "arrow/filesystem/path_util.h" ++#include "arrow/memory_pool.h" ++#include "arrow/record_batch.h" ++#include "arrow/result.h" + #include "arrow/table.h" ++#include "arrow/type.h" ++#include "arrow/type_fwd.h" + #include "arrow/util/checked_cast.h" + #include "arrow/util/future.h" #include "arrow/util/iterator.h" #include "arrow/util/logging.h" #include "arrow/util/range.h" @@ -10,7 +26,78 @@ index c17ba89be7..15bde86ba4 100644 #include "arrow/util/tracing_internal.h" #include "parquet/arrow/reader.h" #include "parquet/arrow/schema.h" -@@ -630,10 +631,15 @@ Result ParquetFileFormat::ScanBatchesAsync( +@@ -555,6 +562,60 @@ Future> ParquetFileFormat::GetReader + }); + } + ++struct CastingGenerator { ++ CastingGenerator(RecordBatchGenerator source, std::shared_ptr final_schema, ++ arrow::MemoryPool* pool = arrow::default_memory_pool()) ++ : source_(source), ++ final_schema_(final_schema), ++ exec_ctx(std::make_shared(pool)) {} ++ ++ Future> operator()() { ++ return this->source_().Then( ++ [this](const std::shared_ptr& next) -> std::shared_ptr { ++ if (IsIterationEnd(next)) { ++ return next; ++ } ++ std::vector> out_cols; ++ std::vector> out_schema_fields; ++ ++ bool changed = false; ++ for (const auto& field : this->final_schema_->fields()) { ++ FieldRef field_ref = FieldRef(field->name()); ++ auto column_st = field_ref.GetOneOrNone(*next); ++ std::shared_ptr column = column_st.ValueUnsafe(); ++ if (column) { ++ if (!column->type()->Equals(field->type())) { ++ // Referenced field was present but didn't have the expected type. ++ auto converted_st = ++ compute::Cast(column, field->type(), compute::CastOptions::Safe(), ++ this->exec_ctx.get()); ++ auto converted = std::move(converted_st.ValueUnsafe()); ++ column = converted.make_array(); ++ changed = true; ++ } ++ out_cols.emplace_back(std::move(column)); ++ out_schema_fields.emplace_back(field->Copy()); ++ // XXX Do we need to handle the else case? What happens when the column ++ // doesn't exist, e.g. all null or all the same value? ++ } ++ } ++ ++ if (changed) { ++ return RecordBatch::Make( ++ std::make_shared(std::move(out_schema_fields), ++ next->schema()->metadata()), ++ next->num_rows(), std::move(out_cols)); ++ } else { ++ return next; ++ } ++ }); ++ } ++ ++ RecordBatchGenerator source_; ++ std::shared_ptr final_schema_; ++ std::shared_ptr exec_ctx; ++}; ++ + struct SlicingGenerator { + SlicingGenerator(RecordBatchGenerator source, int64_t batch_size) + : state(std::make_shared(source, batch_size)) {} +@@ -617,6 +678,9 @@ Result ParquetFileFormat::ScanBatchesAsync( + [this, options, parquet_fragment, pre_filtered, + row_groups](const std::shared_ptr& reader) mutable + -> Result { ++ // Since we already do the batching through the SlicingGenerator, we don't need the ++ // reader to batch its output. ++ reader->set_batch_size(std::numeric_limits::max()); + // Ensure that parquet_fragment has FileMetaData + RETURN_NOT_OK(parquet_fragment->EnsureCompleteMetadata(reader.get())); + if (!pre_filtered) { +@@ -633,10 +697,17 @@ Result ParquetFileFormat::ScanBatchesAsync( kParquetTypeName, options.get(), default_fragment_scan_options)); int batch_readahead = options->batch_readahead; int64_t rows_to_readahead = batch_readahead * options->batch_size; @@ -27,30 +114,16 @@ index c17ba89be7..15bde86ba4 100644 + ARROW_ASSIGN_OR_RAISE(auto generator, reader->GetRecordBatchGenerator( + reader, row_groups, column_projection, + cpu_executor, rows_to_readahead)); ++ generator = ++ CastingGenerator(std::move(generator), options->dataset_schema, options->pool); RecordBatchGenerator sliced = SlicingGenerator(std::move(generator), options->batch_size); if (batch_readahead == 0) { diff --git a/cpp/src/arrow/dataset/scanner.cc b/cpp/src/arrow/dataset/scanner.cc -index 18981d1451..cdf5f586b4 100644 +index a856a792a2..5c10dfc6ac 100644 --- a/cpp/src/arrow/dataset/scanner.cc +++ b/cpp/src/arrow/dataset/scanner.cc -@@ -302,6 +302,7 @@ Result FragmentToBatches( - {"arrow.dataset.fragment.type_name", fragment.value->type_name()}, - }); - #endif -+ // This is the call site. - ARROW_ASSIGN_OR_RAISE(auto batch_gen, fragment.value->ScanBatchesAsync(options)); - ArrayVector columns; - for (const auto& field : options->dataset_schema->fields()) { -@@ -327,6 +328,7 @@ Result FragmentToBatches( - Result> FragmentsToBatches( - FragmentGenerator fragment_gen, const std::shared_ptr& options) { - auto enumerated_fragment_gen = MakeEnumeratedGenerator(std::move(fragment_gen)); -+ // This is the call-site. - auto batch_gen_gen = - MakeMappedGenerator(std::move(enumerated_fragment_gen), - [=](const Enumerated>& fragment) { -@@ -353,8 +355,10 @@ class OneShotFragment : public Fragment { +@@ -355,8 +355,10 @@ class OneShotFragment : public Fragment { ARROW_ASSIGN_OR_RAISE( auto background_gen, MakeBackgroundGenerator(std::move(batch_it_), options->io_context.executor())); @@ -63,7 +136,7 @@ index 18981d1451..cdf5f586b4 100644 } std::string type_name() const override { return "one-shot"; } -@@ -380,7 +384,7 @@ Result AsyncScanner::ScanBatches() { +@@ -382,7 +384,7 @@ Result AsyncScanner::ScanBatches() { [this](::arrow::internal::Executor* executor) { return ScanBatchesAsync(executor); }, @@ -72,7 +145,7 @@ index 18981d1451..cdf5f586b4 100644 } Result AsyncScanner::ScanBatchesUnordered() { -@@ -388,7 +392,7 @@ Result AsyncScanner::ScanBatchesUnordered() { +@@ -390,7 +392,7 @@ Result AsyncScanner::ScanBatchesUnordered() { [this](::arrow::internal::Executor* executor) { return ScanBatchesUnorderedAsync(executor); }, @@ -81,7 +154,7 @@ index 18981d1451..cdf5f586b4 100644 } Result> AsyncScanner::ToTable() { -@@ -398,7 +402,7 @@ Result> AsyncScanner::ToTable() { +@@ -400,7 +402,7 @@ Result> AsyncScanner::ToTable() { } Result AsyncScanner::ScanBatchesUnorderedAsync() { @@ -90,15 +163,7 @@ index 18981d1451..cdf5f586b4 100644 /*sequence_fragments=*/false); } -@@ -443,6 +447,7 @@ Result AsyncScanner::ScanBatchesUnorderedAsync( - scan_options_->projection.call()->options.get()) - ->field_names; - -+ // This is where the node is added to the plan. - RETURN_NOT_OK( - acero::Declaration::Sequence( - { -@@ -599,11 +604,12 @@ Result> AsyncScanner::Head(int64_t num_rows) { +@@ -601,7 +603,7 @@ Result> AsyncScanner::Head(int64_t num_rows) { } Result AsyncScanner::ScanBatchesAsync() { @@ -107,12 +172,7 @@ index 18981d1451..cdf5f586b4 100644 } Result AsyncScanner::ScanBatchesAsync( - Executor* cpu_executor) { -+ // Is this part of the code path? - ARROW_ASSIGN_OR_RAISE( - auto unordered, ScanBatchesUnorderedAsync(cpu_executor, /*sequence_fragments=*/true, - /*use_legacy_batching=*/true)); -@@ -775,7 +781,7 @@ Future AsyncScanner::CountRowsAsync(Executor* executor) { +@@ -778,7 +780,7 @@ Future AsyncScanner::CountRowsAsync(Executor* executor) { } Future AsyncScanner::CountRowsAsync() { @@ -121,24 +181,8 @@ index 18981d1451..cdf5f586b4 100644 } Result AsyncScanner::CountRows() { -@@ -999,6 +1005,7 @@ Result MakeScanNode(acero::ExecPlan* plan, - ARROW_ASSIGN_OR_RAISE(auto fragments_vec, fragments_it.ToVector()); - auto fragment_gen = MakeVectorGenerator(std::move(fragments_vec)); - -+ // This is the call site. - ARROW_ASSIGN_OR_RAISE(auto batch_gen_gen, - FragmentsToBatches(std::move(fragment_gen), scan_options)); - -@@ -1168,6 +1175,7 @@ Result MakeOrderedSinkNode(acero::ExecPlan* plan, - - namespace internal { - void InitializeScanner(arrow::acero::ExecFactoryRegistry* registry) { -+ // This is where it's registered. - DCHECK_OK(registry->AddFactory("scan", MakeScanNode)); - DCHECK_OK(registry->AddFactory("ordered_sink", MakeOrderedSinkNode)); - DCHECK_OK(registry->AddFactory("augmented_project", MakeAugmentedProjectNode)); diff --git a/cpp/src/arrow/dataset/scanner.h b/cpp/src/arrow/dataset/scanner.h -index 4479158ff2..301cdc0517 100644 +index d2de267897..1c605c1bf2 100644 --- a/cpp/src/arrow/dataset/scanner.h +++ b/cpp/src/arrow/dataset/scanner.h @@ -107,6 +107,11 @@ struct ARROW_DS_EXPORT ScanOptions { @@ -153,7 +197,7 @@ index 4479158ff2..301cdc0517 100644 /// If true the scanner will scan in parallel /// /// Note: If true, this will use threads from both the cpu_executor and the -@@ -437,6 +442,11 @@ class ARROW_DS_EXPORT Scanner { +@@ -442,6 +447,11 @@ class ARROW_DS_EXPORT Scanner { TaggedRecordBatchIterator scan); const std::shared_ptr scan_options_; @@ -216,39 +260,3 @@ index 44b1e227b0..218edc60ca 100644 } } // namespace internal -diff --git a/cpp/src/parquet/arrow/reader.cc b/cpp/src/parquet/arrow/reader.cc -index d6ad7c25bc..5ade5bb747 100644 ---- a/cpp/src/parquet/arrow/reader.cc -+++ b/cpp/src/parquet/arrow/reader.cc -@@ -1153,6 +1153,7 @@ class RowGroupGenerator { - const int row_group, const std::vector& column_indices) { - // Skips bound checks/pre-buffering, since we've done that already - const int64_t batch_size = self->properties().batch_size(); -+ // This the main location. - return self->DecodeRowGroups(self, {row_group}, column_indices, cpu_executor) - .Then([batch_size](const std::shared_ptr
& table) - -> ::arrow::Result { -@@ -1190,6 +1191,7 @@ FileReaderImpl::GetRecordBatchGenerator(std::shared_ptr reader, - reader_properties_.cache_options()); - END_PARQUET_CATCH_EXCEPTIONS - } -+ // This is where it's created it seems. - ::arrow::AsyncGenerator row_group_generator = - RowGroupGenerator(::arrow::internal::checked_pointer_cast(reader), - cpu_executor, row_group_indices, column_indices, -@@ -1228,6 +1230,7 @@ Status FileReaderImpl::ReadRowGroups(const std::vector& row_groups, - END_PARQUET_CATCH_EXCEPTIONS - } - -+ // This is another call site (might not be called by our use case). - auto fut = DecodeRowGroups(/*self=*/nullptr, row_groups, column_indices, - /*cpu_executor=*/nullptr); - ARROW_ASSIGN_OR_RAISE(*out, fut.MoveResult()); -@@ -1249,6 +1252,7 @@ Future> FileReaderImpl::DecodeRowGroups( - std::shared_ptr reader) - -> ::arrow::Result> { - std::shared_ptr<::arrow::ChunkedArray> column; -+ // This is the most likely place for invocation. - RETURN_NOT_OK(ReadColumn(static_cast(i), row_groups, reader.get(), &column)); - return column; - }; From 143cd8d813711e349d0334b36b17190140a6a9bc Mon Sep 17 00:00:00 2001 From: Sahil Date: Mon, 12 Aug 2024 13:25:38 -0400 Subject: [PATCH 23/55] add trigger: none to the pipeline definition --- azure-pipelines.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index bb0a82330..2ed88ae42 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -2,6 +2,8 @@ # update the conda-forge.yml and/or the recipe/meta.yaml. # -*- mode: yaml -*- +trigger: none +pr: none stages: - stage: Check jobs: From 7d0a695097d3db64b6106a57f73069aa3d70e1d5 Mon Sep 17 00:00:00 2001 From: Sahil Date: Mon, 12 Aug 2024 19:03:35 -0400 Subject: [PATCH 24/55] Add proper error handling to CastingGenerator --- recipe/patches/0006-Bodo-Changes.patch | 86 +++++++++++++------------- 1 file changed, 44 insertions(+), 42 deletions(-) diff --git a/recipe/patches/0006-Bodo-Changes.patch b/recipe/patches/0006-Bodo-Changes.patch index d97e44e42..79b16be67 100644 --- a/recipe/patches/0006-Bodo-Changes.patch +++ b/recipe/patches/0006-Bodo-Changes.patch @@ -1,5 +1,5 @@ diff --git a/cpp/src/arrow/dataset/file_parquet.cc b/cpp/src/arrow/dataset/file_parquet.cc -index 1f8b6cc488..5ad7a5f78b 100644 +index 1f8b6cc488..322d50e598 100644 --- a/cpp/src/arrow/dataset/file_parquet.cc +++ b/cpp/src/arrow/dataset/file_parquet.cc @@ -26,16 +26,23 @@ @@ -26,7 +26,7 @@ index 1f8b6cc488..5ad7a5f78b 100644 #include "arrow/util/tracing_internal.h" #include "parquet/arrow/reader.h" #include "parquet/arrow/schema.h" -@@ -555,6 +562,60 @@ Future> ParquetFileFormat::GetReader +@@ -555,6 +562,59 @@ Future> ParquetFileFormat::GetReader }); } @@ -38,45 +38,44 @@ index 1f8b6cc488..5ad7a5f78b 100644 + exec_ctx(std::make_shared(pool)) {} + + Future> operator()() { -+ return this->source_().Then( -+ [this](const std::shared_ptr& next) -> std::shared_ptr { -+ if (IsIterationEnd(next)) { -+ return next; -+ } -+ std::vector> out_cols; -+ std::vector> out_schema_fields; ++ return this->source_().Then([this](const std::shared_ptr& next) ++ -> Result> { ++ if (IsIterationEnd(next) || this->final_schema_.get() == nullptr) { ++ return next; ++ } ++ std::vector> out_cols; ++ std::vector> out_schema_fields; + -+ bool changed = false; -+ for (const auto& field : this->final_schema_->fields()) { -+ FieldRef field_ref = FieldRef(field->name()); -+ auto column_st = field_ref.GetOneOrNone(*next); -+ std::shared_ptr column = column_st.ValueUnsafe(); -+ if (column) { -+ if (!column->type()->Equals(field->type())) { -+ // Referenced field was present but didn't have the expected type. -+ auto converted_st = -+ compute::Cast(column, field->type(), compute::CastOptions::Safe(), -+ this->exec_ctx.get()); -+ auto converted = std::move(converted_st.ValueUnsafe()); -+ column = converted.make_array(); -+ changed = true; -+ } -+ out_cols.emplace_back(std::move(column)); -+ out_schema_fields.emplace_back(field->Copy()); -+ // XXX Do we need to handle the else case? What happens when the column -+ // doesn't exist, e.g. all null or all the same value? -+ } ++ bool changed = false; ++ for (const auto& field : this->final_schema_->fields()) { ++ FieldRef field_ref = FieldRef(field->name()); ++ ARROW_ASSIGN_OR_RAISE(std::shared_ptr column, ++ field_ref.GetOneOrNone(*next)); ++ if (column) { ++ if (!column->type()->Equals(field->type())) { ++ // Referenced field was present but didn't have the expected type. ++ ARROW_ASSIGN_OR_RAISE( ++ auto converted, ++ compute::Cast(column, field->type(), compute::CastOptions::Safe(), ++ this->exec_ctx.get())); ++ column = converted.make_array(); ++ changed = true; + } ++ out_cols.emplace_back(std::move(column)); ++ out_schema_fields.emplace_back(field->Copy()); ++ // XXX Do we need to handle the else case? What happens when the column ++ // doesn't exist, e.g. all null or all the same value? ++ } ++ } + -+ if (changed) { -+ return RecordBatch::Make( -+ std::make_shared(std::move(out_schema_fields), -+ next->schema()->metadata()), -+ next->num_rows(), std::move(out_cols)); -+ } else { -+ return next; -+ } -+ }); ++ if (changed) { ++ return RecordBatch::Make(std::make_shared(std::move(out_schema_fields), ++ next->schema()->metadata()), ++ next->num_rows(), std::move(out_cols)); ++ } else { ++ return next; ++ } ++ }); + } + + RecordBatchGenerator source_; @@ -87,7 +86,7 @@ index 1f8b6cc488..5ad7a5f78b 100644 struct SlicingGenerator { SlicingGenerator(RecordBatchGenerator source, int64_t batch_size) : state(std::make_shared(source, batch_size)) {} -@@ -617,6 +678,9 @@ Result ParquetFileFormat::ScanBatchesAsync( +@@ -617,6 +677,9 @@ Result ParquetFileFormat::ScanBatchesAsync( [this, options, parquet_fragment, pre_filtered, row_groups](const std::shared_ptr& reader) mutable -> Result { @@ -97,7 +96,7 @@ index 1f8b6cc488..5ad7a5f78b 100644 // Ensure that parquet_fragment has FileMetaData RETURN_NOT_OK(parquet_fragment->EnsureCompleteMetadata(reader.get())); if (!pre_filtered) { -@@ -633,10 +697,17 @@ Result ParquetFileFormat::ScanBatchesAsync( +@@ -633,12 +696,19 @@ Result ParquetFileFormat::ScanBatchesAsync( kParquetTypeName, options.get(), default_fragment_scan_options)); int batch_readahead = options->batch_readahead; int64_t rows_to_readahead = batch_readahead * options->batch_size; @@ -114,11 +113,14 @@ index 1f8b6cc488..5ad7a5f78b 100644 + ARROW_ASSIGN_OR_RAISE(auto generator, reader->GetRecordBatchGenerator( + reader, row_groups, column_projection, + cpu_executor, rows_to_readahead)); -+ generator = ++ RecordBatchGenerator casted = + CastingGenerator(std::move(generator), options->dataset_schema, options->pool); RecordBatchGenerator sliced = - SlicingGenerator(std::move(generator), options->batch_size); +- SlicingGenerator(std::move(generator), options->batch_size); ++ SlicingGenerator(std::move(casted), options->batch_size); if (batch_readahead == 0) { + return sliced; + } diff --git a/cpp/src/arrow/dataset/scanner.cc b/cpp/src/arrow/dataset/scanner.cc index a856a792a2..5c10dfc6ac 100644 --- a/cpp/src/arrow/dataset/scanner.cc From dd4e36389e1d6ce79415105f4bbe25702585f543 Mon Sep 17 00:00:00 2001 From: Sahil Date: Tue, 13 Aug 2024 10:01:14 -0400 Subject: [PATCH 25/55] Skip casting of dict-encoded columns in CastingGenerator --- recipe/patches/0006-Bodo-Changes.patch | 34 ++++++++++++++++++-------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/recipe/patches/0006-Bodo-Changes.patch b/recipe/patches/0006-Bodo-Changes.patch index 79b16be67..325c775f7 100644 --- a/recipe/patches/0006-Bodo-Changes.patch +++ b/recipe/patches/0006-Bodo-Changes.patch @@ -1,5 +1,5 @@ diff --git a/cpp/src/arrow/dataset/file_parquet.cc b/cpp/src/arrow/dataset/file_parquet.cc -index 1f8b6cc488..322d50e598 100644 +index 1f8b6cc488..586a5122a5 100644 --- a/cpp/src/arrow/dataset/file_parquet.cc +++ b/cpp/src/arrow/dataset/file_parquet.cc @@ -26,16 +26,23 @@ @@ -26,25 +26,27 @@ index 1f8b6cc488..322d50e598 100644 #include "arrow/util/tracing_internal.h" #include "parquet/arrow/reader.h" #include "parquet/arrow/schema.h" -@@ -555,6 +562,59 @@ Future> ParquetFileFormat::GetReader +@@ -555,6 +562,68 @@ Future> ParquetFileFormat::GetReader }); } +struct CastingGenerator { + CastingGenerator(RecordBatchGenerator source, std::shared_ptr final_schema, -+ arrow::MemoryPool* pool = arrow::default_memory_pool()) ++ const std::unordered_set& cols_to_skip, ++ MemoryPool* pool = default_memory_pool()) + : source_(source), + final_schema_(final_schema), ++ cols_to_skip_(cols_to_skip), + exec_ctx(std::make_shared(pool)) {} + + Future> operator()() { + return this->source_().Then([this](const std::shared_ptr& next) + -> Result> { -+ if (IsIterationEnd(next) || this->final_schema_.get() == nullptr) { ++ if (IsIterationEnd(next) || this->final_schema_ == nullptr) { + return next; + } -+ std::vector> out_cols; -+ std::vector> out_schema_fields; ++ std::vector> out_cols; ++ std::vector> out_schema_fields; + + bool changed = false; + for (const auto& field : this->final_schema_->fields()) { @@ -52,6 +54,12 @@ index 1f8b6cc488..322d50e598 100644 + ARROW_ASSIGN_OR_RAISE(std::shared_ptr column, + field_ref.GetOneOrNone(*next)); + if (column) { ++ if (this->cols_to_skip_.count(field->name())) { ++ out_cols.emplace_back(std::move(column)); ++ // Maintain the original input type. ++ out_schema_fields.emplace_back(field->WithType(column->type())); ++ continue; ++ } + if (!column->type()->Equals(field->type())) { + // Referenced field was present but didn't have the expected type. + ARROW_ASSIGN_OR_RAISE( @@ -80,13 +88,14 @@ index 1f8b6cc488..322d50e598 100644 + + RecordBatchGenerator source_; + std::shared_ptr final_schema_; ++ const std::unordered_set& cols_to_skip_; + std::shared_ptr exec_ctx; +}; + struct SlicingGenerator { SlicingGenerator(RecordBatchGenerator source, int64_t batch_size) : state(std::make_shared(source, batch_size)) {} -@@ -617,6 +677,9 @@ Result ParquetFileFormat::ScanBatchesAsync( +@@ -617,6 +686,9 @@ Result ParquetFileFormat::ScanBatchesAsync( [this, options, parquet_fragment, pre_filtered, row_groups](const std::shared_ptr& reader) mutable -> Result { @@ -96,7 +105,7 @@ index 1f8b6cc488..322d50e598 100644 // Ensure that parquet_fragment has FileMetaData RETURN_NOT_OK(parquet_fragment->EnsureCompleteMetadata(reader.get())); if (!pre_filtered) { -@@ -633,12 +696,19 @@ Result ParquetFileFormat::ScanBatchesAsync( +@@ -633,12 +705,24 @@ Result ParquetFileFormat::ScanBatchesAsync( kParquetTypeName, options.get(), default_fragment_scan_options)); int batch_readahead = options->batch_readahead; int64_t rows_to_readahead = batch_readahead * options->batch_size; @@ -113,8 +122,13 @@ index 1f8b6cc488..322d50e598 100644 + ARROW_ASSIGN_OR_RAISE(auto generator, reader->GetRecordBatchGenerator( + reader, row_groups, column_projection, + cpu_executor, rows_to_readahead)); -+ RecordBatchGenerator casted = -+ CastingGenerator(std::move(generator), options->dataset_schema, options->pool); ++ // We need to skip casting the dictionary columns since the dataset_schema doesn't ++ // have the dictionary-encoding information. Parquet reader will return them with the ++ // dictionary type, which is what we eventually want. ++ const std::unordered_set& dict_cols = ++ parquet_fragment->parquet_format_.reader_options.dict_columns; ++ RecordBatchGenerator casted = CastingGenerator( ++ std::move(generator), options->dataset_schema, dict_cols, options->pool); RecordBatchGenerator sliced = - SlicingGenerator(std::move(generator), options->batch_size); + SlicingGenerator(std::move(casted), options->batch_size); From 2d7e4c2d618be7ee2a08502d6173cb76c86e10b5 Mon Sep 17 00:00:00 2001 From: Sahil Date: Tue, 13 Aug 2024 12:26:27 -0400 Subject: [PATCH 26/55] Fix a bug in CastingGenerator for skipped cols Fix typo again Fix file name --- recipe/patches/0006-Bodo-Changes.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/patches/0006-Bodo-Changes.patch b/recipe/patches/0006-Bodo-Changes.patch index 325c775f7..f23b64c6b 100644 --- a/recipe/patches/0006-Bodo-Changes.patch +++ b/recipe/patches/0006-Bodo-Changes.patch @@ -1,5 +1,5 @@ diff --git a/cpp/src/arrow/dataset/file_parquet.cc b/cpp/src/arrow/dataset/file_parquet.cc -index 1f8b6cc488..586a5122a5 100644 +index 1f8b6cc488..6ac6642fdb 100644 --- a/cpp/src/arrow/dataset/file_parquet.cc +++ b/cpp/src/arrow/dataset/file_parquet.cc @@ -26,16 +26,23 @@ @@ -55,9 +55,9 @@ index 1f8b6cc488..586a5122a5 100644 + field_ref.GetOneOrNone(*next)); + if (column) { + if (this->cols_to_skip_.count(field->name())) { -+ out_cols.emplace_back(std::move(column)); + // Maintain the original input type. + out_schema_fields.emplace_back(field->WithType(column->type())); ++ out_cols.emplace_back(std::move(column)); + continue; + } + if (!column->type()->Equals(field->type())) { @@ -69,8 +69,8 @@ index 1f8b6cc488..586a5122a5 100644 + column = converted.make_array(); + changed = true; + } -+ out_cols.emplace_back(std::move(column)); + out_schema_fields.emplace_back(field->Copy()); ++ out_cols.emplace_back(std::move(column)); + // XXX Do we need to handle the else case? What happens when the column + // doesn't exist, e.g. all null or all the same value? + } From 372700843e396ba96301bc616e0a14b69bbbe414 Mon Sep 17 00:00:00 2001 From: Srinivas Lade Date: Tue, 11 Feb 2025 13:26:37 -0500 Subject: [PATCH 27/55] constraint aws-sdk-cpp --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 4d3536492..2f673aaee 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -39,7 +39,7 @@ source: folder: cpp/submodules/parquet-testing build: - number: 16 + number: 0 # 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)] @@ -76,7 +76,7 @@ requirements: - clangdev {{ llvm_version }} - llvmdev {{ llvm_version }} - aws-crt-cpp - - aws-sdk-cpp + - aws-sdk-cpp <=1.11.485 # azure filesystem dependencies, currently broken on windows, see # https://github.com/apache/arrow/issues/41990 - azure-core-cpp # [unix] @@ -227,7 +227,7 @@ outputs: - {{ compiler("cuda") }} # [cuda_compiler_version != "None"] host: - aws-crt-cpp - - aws-sdk-cpp + - aws-sdk-cpp <=1.11.485 - azure-core-cpp # [unix] - azure-identity-cpp # [unix] - azure-storage-blobs-cpp # [unix] From 8f621f286a4a7b2d20f7f03deb085e415955200a Mon Sep 17 00:00:00 2001 From: Scott Routledge Date: Mon, 7 Jul 2025 13:36:43 -0400 Subject: [PATCH 28/55] unconstrain aws-sdk --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 2f673aaee..43300f8d3 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -76,7 +76,7 @@ requirements: - clangdev {{ llvm_version }} - llvmdev {{ llvm_version }} - aws-crt-cpp - - aws-sdk-cpp <=1.11.485 + - aws-sdk-cpp # azure filesystem dependencies, currently broken on windows, see # https://github.com/apache/arrow/issues/41990 - azure-core-cpp # [unix] @@ -227,7 +227,7 @@ outputs: - {{ compiler("cuda") }} # [cuda_compiler_version != "None"] host: - aws-crt-cpp - - aws-sdk-cpp <=1.11.485 + - aws-sdk-cpp - azure-core-cpp # [unix] - azure-identity-cpp # [unix] - azure-storage-blobs-cpp # [unix] From 6d65f0cf55c425db0839d8cb1da1302eeef3a53a Mon Sep 17 00:00:00 2001 From: Scott Routledge Date: Mon, 7 Jul 2025 13:58:46 -0400 Subject: [PATCH 29/55] fix typo --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 43300f8d3..7aa80e7ae 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -28,7 +28,7 @@ source: - patches/0004-GH-45225-C-Upgrade-ORC-to-2.1.0-45226.patch # backport https://github.com/apache/arrow/pull/45859 - patches/0005-MINOR-C-Fix-OTel-1.19-compat-after-silent-breaking-c.patch - - pathces/0006-Bodo-Changes.patch + - patches/0006-Bodo-Changes.patch # testing-submodules not part of release tarball - git_url: https://github.com/apache/arrow-testing.git From 50b124a4016e92962694b0581e32ef8d11eac12c Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 9 Jul 2025 09:55:15 +1100 Subject: [PATCH 30/55] bump llvm_version --- recipe/conda_build_config.yaml | 8 ++------ recipe/meta.yaml | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 499d9fbb1..7cdfa120a 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -6,10 +6,6 @@ libarrow_all: # on osx, keep this in sync with llvm_version in meta.yaml. c_compiler_version: # [osx] - - 18 # [osx] + - 19 # [osx] cxx_compiler_version: # [osx] - - 18 # [osx] -c_compiler: # [win] - - vs2022 # [win] -cxx_compiler: # [win] - - vs2022 # [win] + - 19 # [osx] diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b42ac6dd6..5152a340a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -3,7 +3,7 @@ {% set build_ext_version = "5.0.0" %} {% set build_ext = "cuda" if cuda_enabled else "cpu" %} {% set proc_build_number = "0" %} -{% set llvm_version = "18" %} +{% set llvm_version = "19" %} # see https://github.com/apache/arrow/blob/apache-arrow-10.0.1/cpp/CMakeLists.txt#L88-L90 {% set so_version = (version.split(".")[0] | int * 100 + version.split(".")[1] | int) ~ "." ~ version.split(".")[2] ~ ".0" %} From 904c12e8e5dd163975336a8e47749a78b2009251 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 9 Jul 2025 10:54:16 +1100 Subject: [PATCH 31/55] MNT: Re-rendered with conda-build 25.5.0, conda-smithy 3.51.0, and conda-forge-pinning 2025.07.08.23.16.59 --- .azure-pipelines/azure-pipelines-linux.yml | 14 +++++++------- .azure-pipelines/azure-pipelines-osx.yml | 2 +- .azure-pipelines/azure-pipelines-win.yml | 2 +- ...ompiler_versionNonecxx_compiler_version14.yaml} | 4 ++-- ...ompiler_versionNonecxx_compiler_version14.yaml} | 4 ++-- ...ompiler_versionNonecxx_compiler_version14.yaml} | 4 ++-- .ci_support/osx_64_.yaml | 4 ++-- .ci_support/osx_arm64_.yaml | 4 ++-- .scripts/build_steps.sh | 2 +- .scripts/run_docker_build.sh | 2 +- .scripts/run_osx_build.sh | 2 +- .scripts/run_win_build.bat | 2 +- README.md | 12 ++++++------ 13 files changed, 29 insertions(+), 29 deletions(-) rename .ci_support/{linux_64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml => linux_64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml} (98%) rename .ci_support/{linux_aarch64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml => linux_aarch64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml} (98%) rename .ci_support/{linux_ppc64le_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml => linux_ppc64le_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml} (98%) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 8bf9ccf17..3eed8c52f 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -12,24 +12,24 @@ jobs: CONFIG: linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64-cuda11.8:ubi8 - linux_64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13: - CONFIG: linux_64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13 + linux_64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14: + CONFIG: linux_64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11: CONFIG: linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64-cuda11.8:ubi8 - linux_aarch64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13: - CONFIG: linux_aarch64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13 + linux_aarch64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14: + CONFIG: linux_aarch64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11: CONFIG: linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64-cuda11.8:ubi8 - linux_ppc64le_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13: - CONFIG: linux_ppc64le_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13 + linux_ppc64le_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14: + CONFIG: linux_ppc64le_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 timeoutInMinutes: 360 @@ -82,4 +82,4 @@ jobs: env: BINSTAR_TOKEN: $(BINSTAR_TOKEN) FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) - STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) \ No newline at end of file + STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index ac0bf384e..cde770028 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -37,4 +37,4 @@ jobs: env: BINSTAR_TOKEN: $(BINSTAR_TOKEN) FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) - STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) \ No newline at end of file + STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 89dcdd379..4396042b1 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -38,4 +38,4 @@ jobs: UPLOAD_TEMP: $(UPLOAD_TEMP) BINSTAR_TOKEN: $(BINSTAR_TOKEN) FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) - STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) \ No newline at end of file + STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml b/.ci_support/linux_64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml similarity index 98% rename from .ci_support/linux_64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml rename to .ci_support/linux_64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml index d269d7f46..729aa8d6c 100644 --- a/.ci_support/linux_64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml +++ b/.ci_support/linux_64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml @@ -15,7 +15,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '13' +- '14' c_stdlib: - sysroot c_stdlib_version: @@ -35,7 +35,7 @@ cuda_compiler_version_min: cxx_compiler: - gxx cxx_compiler_version: -- '13' +- '14' docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma9 gflags: diff --git a/.ci_support/linux_aarch64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml b/.ci_support/linux_aarch64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml similarity index 98% rename from .ci_support/linux_aarch64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml rename to .ci_support/linux_aarch64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml index 30d547cff..889471271 100644 --- a/.ci_support/linux_aarch64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml @@ -15,7 +15,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '13' +- '14' c_stdlib: - sysroot c_stdlib_version: @@ -35,7 +35,7 @@ cuda_compiler_version_min: cxx_compiler: - gxx cxx_compiler_version: -- '13' +- '14' docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma9 gflags: diff --git a/.ci_support/linux_ppc64le_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml b/.ci_support/linux_ppc64le_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml similarity index 98% rename from .ci_support/linux_ppc64le_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml rename to .ci_support/linux_ppc64le_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml index 471c6b6b1..61c7ec797 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml @@ -15,7 +15,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '13' +- '14' c_stdlib: - sysroot c_stdlib_version: @@ -35,7 +35,7 @@ cuda_compiler_version_min: cxx_compiler: - gxx cxx_compiler_version: -- '13' +- '14' docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma9 gflags: diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index b5d2e2613..e2dc797eb 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -19,7 +19,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '18' +- '19' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -33,7 +33,7 @@ cuda_compiler_version: cxx_compiler: - clangxx cxx_compiler_version: -- '18' +- '19' gflags: - '2.2' glog: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 3323fa46f..3f51a3dbe 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -19,7 +19,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '18' +- '19' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -33,7 +33,7 @@ cuda_compiler_version: cxx_compiler: - clangxx cxx_compiler_version: -- '18' +- '19' gflags: - '2.2' glog: diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 827a29fbc..780a358ff 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -97,4 +97,4 @@ fi ( startgroup "Final checks" ) 2> /dev/null -touch "${FEEDSTOCK_ROOT}/build_artifacts/conda-forge-build-done-${CONFIG}" \ No newline at end of file +touch "${FEEDSTOCK_ROOT}/build_artifacts/conda-forge-build-done-${CONFIG}" diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index 6ee04aa12..b63b5a05a 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -111,4 +111,4 @@ docker run ${DOCKER_RUN_ARGS} \ test -f "$DONE_CANARY" # This closes the last group opened in `build_steps.sh` -( endgroup "Final checks" ) 2> /dev/null \ No newline at end of file +( endgroup "Final checks" ) 2> /dev/null diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 0e3c39422..361edeb2c 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -117,4 +117,4 @@ else fi ( endgroup "Uploading packages" ) 2> /dev/null -fi \ No newline at end of file +fi diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 297498b12..27c552b1a 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -148,4 +148,4 @@ if /i "%CI%" == "azure" ( echo ##[endgroup] exit /b ) -exit /b \ No newline at end of file +exit /b diff --git a/README.md b/README.md index cd877eb9b..eb8968448 100644 --- a/README.md +++ b/README.md @@ -137,10 +137,10 @@ Current build status - + @@ -151,10 +151,10 @@ Current build status - + @@ -165,10 +165,10 @@ Current build status - + From c56aad7cb53cd73cba78c6401ce9cabda5de4c26 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Tue, 8 Jul 2025 21:35:05 +0000 Subject: [PATCH 32/55] Rebuild for azure_core_cpp 1.15.0 and latest storage packages --- .../migrations/azure_core_cpp_1150.yaml | 21 +++++++++++++++++++ recipe/meta.yaml | 2 +- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/azure_core_cpp_1150.yaml diff --git a/.ci_support/migrations/azure_core_cpp_1150.yaml b/.ci_support/migrations/azure_core_cpp_1150.yaml new file mode 100644 index 000000000..3624cf0a0 --- /dev/null +++ b/.ci_support/migrations/azure_core_cpp_1150.yaml @@ -0,0 +1,21 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for azure_core_cpp 1.15.0 and latest storage packages + kind: version + migration_number: 1 + exclude_pinned_pkgs: false +azure_core_cpp: +- 1.15.0 +azure_storage_common_cpp: +- 12.10.0 +azure_storage_blobs_cpp: +- 12.13.0 +azure_storage_files_datalake_cpp: +- 12.12.0 +azure_storage_files_shares_cpp: +- 12.13.0 +azure_storage_queues_cpp: +- 12.4.0 +azure_identity_cpp: +- 1.11.0 +migrator_ts: 1751899047000 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 5152a340a..b5f1c6f21 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -40,7 +40,7 @@ source: folder: cpp/submodules/parquet-testing build: - number: 17 + number: 18 # 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)] From d658192d1661bc46e681332deaecc7e5d5cef068 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 9 Jul 2025 13:50:58 +1100 Subject: [PATCH 33/55] MNT: Re-rendered with conda-build 25.5.0, conda-smithy 3.51.0, and conda-forge-pinning 2025.07.08.23.16.59 --- ...sion11cuda_compiler_version11.8cxx_compiler_version11.yaml | 4 ++-- ...sion14cuda_compiler_versionNonecxx_compiler_version14.yaml | 4 ++-- ...sion11cuda_compiler_version11.8cxx_compiler_version11.yaml | 4 ++-- ...sion14cuda_compiler_versionNonecxx_compiler_version14.yaml | 4 ++-- ...sion11cuda_compiler_version11.8cxx_compiler_version11.yaml | 4 ++-- ...sion14cuda_compiler_versionNonecxx_compiler_version14.yaml | 4 ++-- .ci_support/osx_64_.yaml | 4 ++-- .ci_support/osx_arm64_.yaml | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml index 245a81ba9..b1392fd06 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml @@ -3,9 +3,9 @@ aws_crt_cpp: aws_sdk_cpp: - 1.11.510 azure_core_cpp: -- 1.14.0 +- 1.15.0 azure_identity_cpp: -- 1.10.0 +- 1.11.0 azure_storage_blobs_cpp: - 12.13.0 azure_storage_files_datalake_cpp: diff --git a/.ci_support/linux_64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml b/.ci_support/linux_64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml index 729aa8d6c..c4d05fd45 100644 --- a/.ci_support/linux_64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml +++ b/.ci_support/linux_64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml @@ -3,9 +3,9 @@ aws_crt_cpp: aws_sdk_cpp: - 1.11.510 azure_core_cpp: -- 1.14.0 +- 1.15.0 azure_identity_cpp: -- 1.10.0 +- 1.11.0 azure_storage_blobs_cpp: - 12.13.0 azure_storage_files_datalake_cpp: diff --git a/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml index 13be37a71..4763dd111 100644 --- a/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml @@ -3,9 +3,9 @@ aws_crt_cpp: aws_sdk_cpp: - 1.11.510 azure_core_cpp: -- 1.14.0 +- 1.15.0 azure_identity_cpp: -- 1.10.0 +- 1.11.0 azure_storage_blobs_cpp: - 12.13.0 azure_storage_files_datalake_cpp: diff --git a/.ci_support/linux_aarch64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml b/.ci_support/linux_aarch64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml index 889471271..197ffcafb 100644 --- a/.ci_support/linux_aarch64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml @@ -3,9 +3,9 @@ aws_crt_cpp: aws_sdk_cpp: - 1.11.510 azure_core_cpp: -- 1.14.0 +- 1.15.0 azure_identity_cpp: -- 1.10.0 +- 1.11.0 azure_storage_blobs_cpp: - 12.13.0 azure_storage_files_datalake_cpp: diff --git a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml index cadd38940..e223a1e96 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml @@ -3,9 +3,9 @@ aws_crt_cpp: aws_sdk_cpp: - 1.11.510 azure_core_cpp: -- 1.14.0 +- 1.15.0 azure_identity_cpp: -- 1.10.0 +- 1.11.0 azure_storage_blobs_cpp: - 12.13.0 azure_storage_files_datalake_cpp: diff --git a/.ci_support/linux_ppc64le_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml b/.ci_support/linux_ppc64le_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml index 61c7ec797..02c752660 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml @@ -3,9 +3,9 @@ aws_crt_cpp: aws_sdk_cpp: - 1.11.510 azure_core_cpp: -- 1.14.0 +- 1.15.0 azure_identity_cpp: -- 1.10.0 +- 1.11.0 azure_storage_blobs_cpp: - 12.13.0 azure_storage_files_datalake_cpp: diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index e2dc797eb..e07c1a118 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -7,9 +7,9 @@ aws_crt_cpp: aws_sdk_cpp: - 1.11.510 azure_core_cpp: -- 1.14.0 +- 1.15.0 azure_identity_cpp: -- 1.10.0 +- 1.11.0 azure_storage_blobs_cpp: - 12.13.0 azure_storage_files_datalake_cpp: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 3f51a3dbe..19910ff6e 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -7,9 +7,9 @@ aws_crt_cpp: aws_sdk_cpp: - 1.11.510 azure_core_cpp: -- 1.14.0 +- 1.15.0 azure_identity_cpp: -- 1.10.0 +- 1.11.0 azure_storage_blobs_cpp: - 12.13.0 azure_storage_files_datalake_cpp: From 7ae305b6a9645d38748507c3b4956e3374db0aa3 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 10 Jul 2025 04:03:08 +0000 Subject: [PATCH 34/55] Rebuild for orc 2.1.3 --- .ci_support/migrations/orc213.yaml | 8 ++++++++ recipe/meta.yaml | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/orc213.yaml diff --git a/.ci_support/migrations/orc213.yaml b/.ci_support/migrations/orc213.yaml new file mode 100644 index 000000000..1e925bdef --- /dev/null +++ b/.ci_support/migrations/orc213.yaml @@ -0,0 +1,8 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for orc 2.1.3 + kind: version + migration_number: 1 +migrator_ts: 1752100652.7858899 +orc: +- 2.1.3 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b5f1c6f21..b0aeb37df 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -40,7 +40,7 @@ source: folder: cpp/submodules/parquet-testing build: - number: 18 + number: 19 # 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)] From 99cf8302dd620a1c06bf05631d1483d71ee89a53 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 10 Jul 2025 04:06:57 +0000 Subject: [PATCH 35/55] MNT: Re-rendered with conda-build 25.5.0, conda-smithy 3.51.0, and conda-forge-pinning 2025.07.09.22.57.40 --- ...ler_version11.8cxx_compiler_version11.yaml | 2 +- ...ler_versionNonecxx_compiler_version14.yaml | 2 +- ...ler_version11.8cxx_compiler_version11.yaml | 2 +- ...ler_versionNonecxx_compiler_version14.yaml | 2 +- ...ler_version11.8cxx_compiler_version11.yaml | 2 +- ...ler_versionNonecxx_compiler_version14.yaml | 2 +- .../migrations/azure_core_cpp_1150.yaml | 21 ------------------- .ci_support/osx_64_.yaml | 2 +- .ci_support/osx_arm64_.yaml | 2 +- .../win_64_cuda_compiler_version11.8.yaml | 2 +- .../win_64_cuda_compiler_versionNone.yaml | 2 +- 11 files changed, 10 insertions(+), 31 deletions(-) delete mode 100644 .ci_support/migrations/azure_core_cpp_1150.yaml diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml index b1392fd06..24fff44a3 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml @@ -65,7 +65,7 @@ lz4_c: openssl: - '3' orc: -- 2.1.2 +- 2.1.3 re2: - 2024.07.02 snappy: diff --git a/.ci_support/linux_64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml b/.ci_support/linux_64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml index c4d05fd45..10f8475fd 100644 --- a/.ci_support/linux_64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml +++ b/.ci_support/linux_64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml @@ -65,7 +65,7 @@ lz4_c: openssl: - '3' orc: -- 2.1.2 +- 2.1.3 re2: - 2024.07.02 snappy: diff --git a/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml index 4763dd111..ccc4d81bf 100644 --- a/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml @@ -65,7 +65,7 @@ lz4_c: openssl: - '3' orc: -- 2.1.2 +- 2.1.3 re2: - 2024.07.02 snappy: diff --git a/.ci_support/linux_aarch64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml b/.ci_support/linux_aarch64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml index 197ffcafb..b733a80cb 100644 --- a/.ci_support/linux_aarch64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml @@ -65,7 +65,7 @@ lz4_c: openssl: - '3' orc: -- 2.1.2 +- 2.1.3 re2: - 2024.07.02 snappy: diff --git a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml index e223a1e96..b9c3eda65 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml @@ -65,7 +65,7 @@ lz4_c: openssl: - '3' orc: -- 2.1.2 +- 2.1.3 re2: - 2024.07.02 snappy: diff --git a/.ci_support/linux_ppc64le_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml b/.ci_support/linux_ppc64le_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml index 02c752660..5f1ec2ab4 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml @@ -65,7 +65,7 @@ lz4_c: openssl: - '3' orc: -- 2.1.2 +- 2.1.3 re2: - 2024.07.02 snappy: diff --git a/.ci_support/migrations/azure_core_cpp_1150.yaml b/.ci_support/migrations/azure_core_cpp_1150.yaml deleted file mode 100644 index 3624cf0a0..000000000 --- a/.ci_support/migrations/azure_core_cpp_1150.yaml +++ /dev/null @@ -1,21 +0,0 @@ -__migrator: - build_number: 1 - commit_message: Rebuild for azure_core_cpp 1.15.0 and latest storage packages - kind: version - migration_number: 1 - exclude_pinned_pkgs: false -azure_core_cpp: -- 1.15.0 -azure_storage_common_cpp: -- 12.10.0 -azure_storage_blobs_cpp: -- 12.13.0 -azure_storage_files_datalake_cpp: -- 12.12.0 -azure_storage_files_shares_cpp: -- 12.13.0 -azure_storage_queues_cpp: -- 12.4.0 -azure_identity_cpp: -- 1.11.0 -migrator_ts: 1751899047000 diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index e07c1a118..ab46b1fd9 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -63,7 +63,7 @@ macos_machine: openssl: - '3' orc: -- 2.1.2 +- 2.1.3 re2: - 2024.07.02 snappy: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 19910ff6e..b62e68178 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -63,7 +63,7 @@ macos_machine: openssl: - '3' orc: -- 2.1.2 +- 2.1.3 re2: - 2024.07.02 snappy: diff --git a/.ci_support/win_64_cuda_compiler_version11.8.yaml b/.ci_support/win_64_cuda_compiler_version11.8.yaml index 6f3d40f35..3ba6589c7 100644 --- a/.ci_support/win_64_cuda_compiler_version11.8.yaml +++ b/.ci_support/win_64_cuda_compiler_version11.8.yaml @@ -49,7 +49,7 @@ lz4_c: openssl: - '3' orc: -- 2.1.2 +- 2.1.3 re2: - 2024.07.02 snappy: diff --git a/.ci_support/win_64_cuda_compiler_versionNone.yaml b/.ci_support/win_64_cuda_compiler_versionNone.yaml index b3deaf5e9..ef92e32fc 100644 --- a/.ci_support/win_64_cuda_compiler_versionNone.yaml +++ b/.ci_support/win_64_cuda_compiler_versionNone.yaml @@ -49,7 +49,7 @@ lz4_c: openssl: - '3' orc: -- 2.1.2 +- 2.1.3 re2: - 2024.07.02 snappy: From 101057dfa25a701a09cf9156e4d630d3ccb978e3 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 11 Jul 2025 01:57:05 +0000 Subject: [PATCH 36/55] Rebuild for libgoogle_cloud 2.39 --- .../migrations/libgoogle_cloud239.yaml | 46 +++++++++++++++++++ recipe/meta.yaml | 2 +- 2 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/libgoogle_cloud239.yaml diff --git a/.ci_support/migrations/libgoogle_cloud239.yaml b/.ci_support/migrations/libgoogle_cloud239.yaml new file mode 100644 index 000000000..3d7782b3f --- /dev/null +++ b/.ci_support/migrations/libgoogle_cloud239.yaml @@ -0,0 +1,46 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for libgoogle_cloud 2.39 + kind: version + migration_number: 1 +google_cloud_cpp: +- '2.39' +libgoogle_cloud: +- '2.39' +libgoogle_cloud_aiplatform_devel: +- '2.39' +libgoogle_cloud_all_devel: +- '2.39' +libgoogle_cloud_automl_devel: +- '2.39' +libgoogle_cloud_bigquery_devel: +- '2.39' +libgoogle_cloud_bigtable_devel: +- '2.39' +libgoogle_cloud_compute_devel: +- '2.39' +libgoogle_cloud_devel: +- '2.39' +libgoogle_cloud_dialogflow_cx_devel: +- '2.39' +libgoogle_cloud_dialogflow_es_devel: +- '2.39' +libgoogle_cloud_discoveryengine_devel: +- '2.39' +libgoogle_cloud_dlp_devel: +- '2.39' +libgoogle_cloud_iam_devel: +- '2.39' +libgoogle_cloud_oauth2_devel: +- '2.39' +libgoogle_cloud_policytroubleshooter_devel: +- '2.39' +libgoogle_cloud_pubsub_devel: +- '2.39' +libgoogle_cloud_spanner_devel: +- '2.39' +libgoogle_cloud_speech_devel: +- '2.39' +libgoogle_cloud_storage_devel: +- '2.39' +migrator_ts: 1752051093.261047 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b0aeb37df..1d6de1f33 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -40,7 +40,7 @@ source: folder: cpp/submodules/parquet-testing build: - number: 19 + number: 20 # 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)] From c19f432875a04da88357c4bb295154cdb43cb2eb Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 11 Jul 2025 02:01:07 +0000 Subject: [PATCH 37/55] MNT: Re-rendered with conda-build 25.5.0, conda-smithy 3.51.0, and conda-forge-pinning 2025.07.10.23.06.25 --- ...11cuda_compiler_version11.8cxx_compiler_version11.yaml | 4 ++-- ...14cuda_compiler_versionNonecxx_compiler_version14.yaml | 4 ++-- ...11cuda_compiler_version11.8cxx_compiler_version11.yaml | 4 ++-- ...14cuda_compiler_versionNonecxx_compiler_version14.yaml | 4 ++-- ...11cuda_compiler_version11.8cxx_compiler_version11.yaml | 4 ++-- ...14cuda_compiler_versionNonecxx_compiler_version14.yaml | 4 ++-- .ci_support/migrations/orc213.yaml | 8 -------- .ci_support/osx_64_.yaml | 4 ++-- .ci_support/osx_arm64_.yaml | 4 ++-- .ci_support/win_64_cuda_compiler_version11.8.yaml | 4 ++-- .ci_support/win_64_cuda_compiler_versionNone.yaml | 4 ++-- 11 files changed, 20 insertions(+), 28 deletions(-) delete mode 100644 .ci_support/migrations/orc213.yaml diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml index 24fff44a3..34916c864 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml @@ -49,9 +49,9 @@ libarrow: libboost_devel: - '1.86' libgoogle_cloud_devel: -- '2.36' +- '2.39' libgoogle_cloud_storage_devel: -- '2.36' +- '2.39' libgrpc: - '1.73' libopentelemetry_cpp: diff --git a/.ci_support/linux_64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml b/.ci_support/linux_64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml index 10f8475fd..9d707b636 100644 --- a/.ci_support/linux_64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml +++ b/.ci_support/linux_64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml @@ -49,9 +49,9 @@ libarrow: libboost_devel: - '1.86' libgoogle_cloud_devel: -- '2.36' +- '2.39' libgoogle_cloud_storage_devel: -- '2.36' +- '2.39' libgrpc: - '1.73' libopentelemetry_cpp: diff --git a/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml index ccc4d81bf..27d405f60 100644 --- a/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml @@ -49,9 +49,9 @@ libarrow: libboost_devel: - '1.86' libgoogle_cloud_devel: -- '2.36' +- '2.39' libgoogle_cloud_storage_devel: -- '2.36' +- '2.39' libgrpc: - '1.73' libopentelemetry_cpp: diff --git a/.ci_support/linux_aarch64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml b/.ci_support/linux_aarch64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml index b733a80cb..997f734fa 100644 --- a/.ci_support/linux_aarch64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml @@ -49,9 +49,9 @@ libarrow: libboost_devel: - '1.86' libgoogle_cloud_devel: -- '2.36' +- '2.39' libgoogle_cloud_storage_devel: -- '2.36' +- '2.39' libgrpc: - '1.73' libopentelemetry_cpp: diff --git a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml index b9c3eda65..fd9de91dc 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml @@ -49,9 +49,9 @@ libarrow: libboost_devel: - '1.86' libgoogle_cloud_devel: -- '2.36' +- '2.39' libgoogle_cloud_storage_devel: -- '2.36' +- '2.39' libgrpc: - '1.73' libopentelemetry_cpp: diff --git a/.ci_support/linux_ppc64le_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml b/.ci_support/linux_ppc64le_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml index 5f1ec2ab4..2054808c9 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml @@ -49,9 +49,9 @@ libarrow: libboost_devel: - '1.86' libgoogle_cloud_devel: -- '2.36' +- '2.39' libgoogle_cloud_storage_devel: -- '2.36' +- '2.39' libgrpc: - '1.73' libopentelemetry_cpp: diff --git a/.ci_support/migrations/orc213.yaml b/.ci_support/migrations/orc213.yaml deleted file mode 100644 index 1e925bdef..000000000 --- a/.ci_support/migrations/orc213.yaml +++ /dev/null @@ -1,8 +0,0 @@ -__migrator: - build_number: 1 - commit_message: Rebuild for orc 2.1.3 - kind: version - migration_number: 1 -migrator_ts: 1752100652.7858899 -orc: -- 2.1.3 diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index ab46b1fd9..7a9135238 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -45,9 +45,9 @@ libarrow: libboost_devel: - '1.86' libgoogle_cloud_devel: -- '2.36' +- '2.39' libgoogle_cloud_storage_devel: -- '2.36' +- '2.39' libgrpc: - '1.73' libopentelemetry_cpp: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index b62e68178..dcfe75a3f 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -45,9 +45,9 @@ libarrow: libboost_devel: - '1.86' libgoogle_cloud_devel: -- '2.36' +- '2.39' libgoogle_cloud_storage_devel: -- '2.36' +- '2.39' libgrpc: - '1.73' libopentelemetry_cpp: diff --git a/.ci_support/win_64_cuda_compiler_version11.8.yaml b/.ci_support/win_64_cuda_compiler_version11.8.yaml index 3ba6589c7..69f0f009c 100644 --- a/.ci_support/win_64_cuda_compiler_version11.8.yaml +++ b/.ci_support/win_64_cuda_compiler_version11.8.yaml @@ -35,9 +35,9 @@ libcrc32c: libcurl: - '8' libgoogle_cloud_devel: -- '2.36' +- '2.39' libgoogle_cloud_storage_devel: -- '2.36' +- '2.39' libgrpc: - '1.73' libprotobuf: diff --git a/.ci_support/win_64_cuda_compiler_versionNone.yaml b/.ci_support/win_64_cuda_compiler_versionNone.yaml index ef92e32fc..617b805ae 100644 --- a/.ci_support/win_64_cuda_compiler_versionNone.yaml +++ b/.ci_support/win_64_cuda_compiler_versionNone.yaml @@ -35,9 +35,9 @@ libcrc32c: libcurl: - '8' libgoogle_cloud_devel: -- '2.36' +- '2.39' libgoogle_cloud_storage_devel: -- '2.36' +- '2.39' libgrpc: - '1.73' libprotobuf: From 77b8afb018a57f9c2d75e44b1d4cd6e5b10c4372 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 11 Jul 2025 23:13:55 +0000 Subject: [PATCH 38/55] Rebuild for libthrift 0.22.0 --- .ci_support/migrations/libthrift0220.yaml | 10 ++++++++++ recipe/meta.yaml | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/libthrift0220.yaml diff --git a/.ci_support/migrations/libthrift0220.yaml b/.ci_support/migrations/libthrift0220.yaml new file mode 100644 index 000000000..f551de94b --- /dev/null +++ b/.ci_support/migrations/libthrift0220.yaml @@ -0,0 +1,10 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for libthrift 0.22.0 + kind: version + migration_number: 1 +libthrift: +- 0.22.0 +migrator_ts: 1752260967.5811167 +thrift_cpp: +- 0.22.0 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 1d6de1f33..ee0774f7a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -40,7 +40,7 @@ source: folder: cpp/submodules/parquet-testing build: - number: 20 + number: 21 # 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)] From 7cc1b1072a72a3fd266a6304a89e0c7626e7a9ba Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 11 Jul 2025 23:17:40 +0000 Subject: [PATCH 39/55] MNT: Re-rendered with conda-build 25.5.0, conda-smithy 3.51.0, and conda-forge-pinning 2025.07.11.19.45.21 --- ...ler_version11.8cxx_compiler_version11.yaml | 2 +- ...ler_versionNonecxx_compiler_version14.yaml | 2 +- ...ler_version11.8cxx_compiler_version11.yaml | 2 +- ...ler_versionNonecxx_compiler_version14.yaml | 2 +- ...ler_version11.8cxx_compiler_version11.yaml | 2 +- ...ler_versionNonecxx_compiler_version14.yaml | 2 +- .../migrations/libgoogle_cloud239.yaml | 46 ------------------- .ci_support/osx_64_.yaml | 2 +- .ci_support/osx_arm64_.yaml | 2 +- .../win_64_cuda_compiler_version11.8.yaml | 2 +- .../win_64_cuda_compiler_versionNone.yaml | 2 +- 11 files changed, 10 insertions(+), 56 deletions(-) delete mode 100644 .ci_support/migrations/libgoogle_cloud239.yaml diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml index 34916c864..26162af22 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml @@ -73,7 +73,7 @@ snappy: target_platform: - linux-64 thrift_cpp: -- 0.21.0 +- 0.22.0 zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/linux_64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml b/.ci_support/linux_64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml index 9d707b636..dcee8bf72 100644 --- a/.ci_support/linux_64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml +++ b/.ci_support/linux_64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml @@ -73,7 +73,7 @@ snappy: target_platform: - linux-64 thrift_cpp: -- 0.21.0 +- 0.22.0 zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml index 27d405f60..9809e5a0c 100644 --- a/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml @@ -73,7 +73,7 @@ snappy: target_platform: - linux-aarch64 thrift_cpp: -- 0.21.0 +- 0.22.0 zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/linux_aarch64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml b/.ci_support/linux_aarch64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml index 997f734fa..f4c8407b0 100644 --- a/.ci_support/linux_aarch64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml @@ -73,7 +73,7 @@ snappy: target_platform: - linux-aarch64 thrift_cpp: -- 0.21.0 +- 0.22.0 zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml index fd9de91dc..f7370dab1 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml @@ -73,7 +73,7 @@ snappy: target_platform: - linux-ppc64le thrift_cpp: -- 0.21.0 +- 0.22.0 zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/linux_ppc64le_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml b/.ci_support/linux_ppc64le_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml index 2054808c9..48c1b6422 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml @@ -73,7 +73,7 @@ snappy: target_platform: - linux-ppc64le thrift_cpp: -- 0.21.0 +- 0.22.0 zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/migrations/libgoogle_cloud239.yaml b/.ci_support/migrations/libgoogle_cloud239.yaml deleted file mode 100644 index 3d7782b3f..000000000 --- a/.ci_support/migrations/libgoogle_cloud239.yaml +++ /dev/null @@ -1,46 +0,0 @@ -__migrator: - build_number: 1 - commit_message: Rebuild for libgoogle_cloud 2.39 - kind: version - migration_number: 1 -google_cloud_cpp: -- '2.39' -libgoogle_cloud: -- '2.39' -libgoogle_cloud_aiplatform_devel: -- '2.39' -libgoogle_cloud_all_devel: -- '2.39' -libgoogle_cloud_automl_devel: -- '2.39' -libgoogle_cloud_bigquery_devel: -- '2.39' -libgoogle_cloud_bigtable_devel: -- '2.39' -libgoogle_cloud_compute_devel: -- '2.39' -libgoogle_cloud_devel: -- '2.39' -libgoogle_cloud_dialogflow_cx_devel: -- '2.39' -libgoogle_cloud_dialogflow_es_devel: -- '2.39' -libgoogle_cloud_discoveryengine_devel: -- '2.39' -libgoogle_cloud_dlp_devel: -- '2.39' -libgoogle_cloud_iam_devel: -- '2.39' -libgoogle_cloud_oauth2_devel: -- '2.39' -libgoogle_cloud_policytroubleshooter_devel: -- '2.39' -libgoogle_cloud_pubsub_devel: -- '2.39' -libgoogle_cloud_spanner_devel: -- '2.39' -libgoogle_cloud_speech_devel: -- '2.39' -libgoogle_cloud_storage_devel: -- '2.39' -migrator_ts: 1752051093.261047 diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 7a9135238..e8885c7b7 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -71,7 +71,7 @@ snappy: target_platform: - osx-64 thrift_cpp: -- 0.21.0 +- 0.22.0 zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index dcfe75a3f..f4a85b5f5 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -71,7 +71,7 @@ snappy: target_platform: - osx-arm64 thrift_cpp: -- 0.21.0 +- 0.22.0 zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/win_64_cuda_compiler_version11.8.yaml b/.ci_support/win_64_cuda_compiler_version11.8.yaml index 69f0f009c..6d29c2382 100644 --- a/.ci_support/win_64_cuda_compiler_version11.8.yaml +++ b/.ci_support/win_64_cuda_compiler_version11.8.yaml @@ -57,7 +57,7 @@ snappy: target_platform: - win-64 thrift_cpp: -- 0.21.0 +- 0.22.0 zip_keys: - - cuda_compiler_version - cuda_compiler diff --git a/.ci_support/win_64_cuda_compiler_versionNone.yaml b/.ci_support/win_64_cuda_compiler_versionNone.yaml index 617b805ae..0b66444a1 100644 --- a/.ci_support/win_64_cuda_compiler_versionNone.yaml +++ b/.ci_support/win_64_cuda_compiler_versionNone.yaml @@ -57,7 +57,7 @@ snappy: target_platform: - win-64 thrift_cpp: -- 0.21.0 +- 0.22.0 zip_keys: - - cuda_compiler_version - cuda_compiler From 9b5396cc8c4df44a1e8f9722c233a171446df08e Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sat, 12 Jul 2025 13:05:43 +0000 Subject: [PATCH 40/55] Rebuild for aws_crt_cpp 0.33.0 --- .ci_support/migrations/aws_crt_cpp0330.yaml | 8 ++++++++ recipe/meta.yaml | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/aws_crt_cpp0330.yaml diff --git a/.ci_support/migrations/aws_crt_cpp0330.yaml b/.ci_support/migrations/aws_crt_cpp0330.yaml new file mode 100644 index 000000000..3e8094dec --- /dev/null +++ b/.ci_support/migrations/aws_crt_cpp0330.yaml @@ -0,0 +1,8 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for aws_crt_cpp 0.33.0 + kind: version + migration_number: 1 +aws_crt_cpp: +- 0.33.0 +migrator_ts: 1752303120.1698182 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index ee0774f7a..c0ac5f377 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -40,7 +40,7 @@ source: folder: cpp/submodules/parquet-testing build: - number: 21 + number: 22 # 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)] From b2b1456a7ddf42c1f885352bdd42fa8db7ef57d6 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sat, 12 Jul 2025 13:09:35 +0000 Subject: [PATCH 41/55] MNT: Re-rendered with conda-build 25.5.0, conda-smithy 3.51.0, and conda-forge-pinning 2025.07.12.07.09.39 --- ...ersion11cuda_compiler_version11.8cxx_compiler_version11.yaml | 2 +- ...ersion14cuda_compiler_versionNonecxx_compiler_version14.yaml | 2 +- ...ersion11cuda_compiler_version11.8cxx_compiler_version11.yaml | 2 +- ...ersion14cuda_compiler_versionNonecxx_compiler_version14.yaml | 2 +- ...ersion11cuda_compiler_version11.8cxx_compiler_version11.yaml | 2 +- ...ersion14cuda_compiler_versionNonecxx_compiler_version14.yaml | 2 +- .ci_support/osx_64_.yaml | 2 +- .ci_support/osx_arm64_.yaml | 2 +- .ci_support/win_64_cuda_compiler_version11.8.yaml | 2 +- .ci_support/win_64_cuda_compiler_versionNone.yaml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml index 26162af22..fe456df4e 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml @@ -1,5 +1,5 @@ aws_crt_cpp: -- 0.32.10 +- 0.33.0 aws_sdk_cpp: - 1.11.510 azure_core_cpp: diff --git a/.ci_support/linux_64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml b/.ci_support/linux_64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml index dcee8bf72..b217e93d8 100644 --- a/.ci_support/linux_64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml +++ b/.ci_support/linux_64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml @@ -1,5 +1,5 @@ aws_crt_cpp: -- 0.32.10 +- 0.33.0 aws_sdk_cpp: - 1.11.510 azure_core_cpp: diff --git a/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml index 9809e5a0c..c98daa19c 100644 --- a/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml @@ -1,5 +1,5 @@ aws_crt_cpp: -- 0.32.10 +- 0.33.0 aws_sdk_cpp: - 1.11.510 azure_core_cpp: diff --git a/.ci_support/linux_aarch64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml b/.ci_support/linux_aarch64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml index f4c8407b0..c5f201eed 100644 --- a/.ci_support/linux_aarch64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml @@ -1,5 +1,5 @@ aws_crt_cpp: -- 0.32.10 +- 0.33.0 aws_sdk_cpp: - 1.11.510 azure_core_cpp: diff --git a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml index f7370dab1..6a9077956 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml @@ -1,5 +1,5 @@ aws_crt_cpp: -- 0.32.10 +- 0.33.0 aws_sdk_cpp: - 1.11.510 azure_core_cpp: diff --git a/.ci_support/linux_ppc64le_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml b/.ci_support/linux_ppc64le_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml index 48c1b6422..5d74751f8 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml @@ -1,5 +1,5 @@ aws_crt_cpp: -- 0.32.10 +- 0.33.0 aws_sdk_cpp: - 1.11.510 azure_core_cpp: diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index e8885c7b7..f34a3ab9a 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: MACOSX_SDK_VERSION: - '11.0' aws_crt_cpp: -- 0.32.10 +- 0.33.0 aws_sdk_cpp: - 1.11.510 azure_core_cpp: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index f4a85b5f5..d34765489 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: MACOSX_SDK_VERSION: - '11.0' aws_crt_cpp: -- 0.32.10 +- 0.33.0 aws_sdk_cpp: - 1.11.510 azure_core_cpp: diff --git a/.ci_support/win_64_cuda_compiler_version11.8.yaml b/.ci_support/win_64_cuda_compiler_version11.8.yaml index 6d29c2382..c130daf3a 100644 --- a/.ci_support/win_64_cuda_compiler_version11.8.yaml +++ b/.ci_support/win_64_cuda_compiler_version11.8.yaml @@ -1,5 +1,5 @@ aws_crt_cpp: -- 0.32.10 +- 0.33.0 aws_sdk_cpp: - 1.11.510 bzip2: diff --git a/.ci_support/win_64_cuda_compiler_versionNone.yaml b/.ci_support/win_64_cuda_compiler_versionNone.yaml index 0b66444a1..c76c0739a 100644 --- a/.ci_support/win_64_cuda_compiler_versionNone.yaml +++ b/.ci_support/win_64_cuda_compiler_versionNone.yaml @@ -1,5 +1,5 @@ aws_crt_cpp: -- 0.32.10 +- 0.33.0 aws_sdk_cpp: - 1.11.510 bzip2: From 9f388de8dd4b51f4acd6bb17fb6b153a80b084f8 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 18 Jul 2025 13:23:48 +0000 Subject: [PATCH 42/55] Rebuild for aws_sdk_cpp 1.11.606 --- .ci_support/migrations/aws_sdk_cpp111606.yaml | 8 ++++++++ recipe/meta.yaml | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/aws_sdk_cpp111606.yaml diff --git a/.ci_support/migrations/aws_sdk_cpp111606.yaml b/.ci_support/migrations/aws_sdk_cpp111606.yaml new file mode 100644 index 000000000..49df9a2de --- /dev/null +++ b/.ci_support/migrations/aws_sdk_cpp111606.yaml @@ -0,0 +1,8 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for aws_sdk_cpp 1.11.606 + kind: version + migration_number: 1 +aws_sdk_cpp: +- 1.11.606 +migrator_ts: 1752782891.0647976 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c0ac5f377..abf1205cf 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -40,7 +40,7 @@ source: folder: cpp/submodules/parquet-testing build: - number: 22 + number: 23 # 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)] From 6eab3edf50320670920b67e081113ff54774925d Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 18 Jul 2025 13:27:16 +0000 Subject: [PATCH 43/55] MNT: Re-rendered with conda-build 25.5.0, conda-smithy 3.51.1, and conda-forge-pinning 2025.07.18.07.41.21 --- ...uda_compiler_version11.8cxx_compiler_version11.yaml | 2 +- ...uda_compiler_versionNonecxx_compiler_version14.yaml | 2 +- ...uda_compiler_version11.8cxx_compiler_version11.yaml | 2 +- ...uda_compiler_versionNonecxx_compiler_version14.yaml | 2 +- ...uda_compiler_version11.8cxx_compiler_version11.yaml | 2 +- ...uda_compiler_versionNonecxx_compiler_version14.yaml | 2 +- .ci_support/migrations/aws_crt_cpp0330.yaml | 8 -------- .ci_support/migrations/libthrift0220.yaml | 10 ---------- .ci_support/osx_64_.yaml | 2 +- .ci_support/osx_arm64_.yaml | 2 +- .ci_support/win_64_cuda_compiler_version11.8.yaml | 2 +- .ci_support/win_64_cuda_compiler_versionNone.yaml | 2 +- .gitattributes | 1 + 13 files changed, 11 insertions(+), 28 deletions(-) delete mode 100644 .ci_support/migrations/aws_crt_cpp0330.yaml delete mode 100644 .ci_support/migrations/libthrift0220.yaml diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml index fe456df4e..b1b454f76 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml @@ -1,7 +1,7 @@ aws_crt_cpp: - 0.33.0 aws_sdk_cpp: -- 1.11.510 +- 1.11.606 azure_core_cpp: - 1.15.0 azure_identity_cpp: diff --git a/.ci_support/linux_64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml b/.ci_support/linux_64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml index b217e93d8..584267bac 100644 --- a/.ci_support/linux_64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml +++ b/.ci_support/linux_64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml @@ -1,7 +1,7 @@ aws_crt_cpp: - 0.33.0 aws_sdk_cpp: -- 1.11.510 +- 1.11.606 azure_core_cpp: - 1.15.0 azure_identity_cpp: diff --git a/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml index c98daa19c..8bc450e9a 100644 --- a/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml @@ -1,7 +1,7 @@ aws_crt_cpp: - 0.33.0 aws_sdk_cpp: -- 1.11.510 +- 1.11.606 azure_core_cpp: - 1.15.0 azure_identity_cpp: diff --git a/.ci_support/linux_aarch64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml b/.ci_support/linux_aarch64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml index c5f201eed..df9bc9aa5 100644 --- a/.ci_support/linux_aarch64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml @@ -1,7 +1,7 @@ aws_crt_cpp: - 0.33.0 aws_sdk_cpp: -- 1.11.510 +- 1.11.606 azure_core_cpp: - 1.15.0 azure_identity_cpp: diff --git a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml index 6a9077956..d0875e9cd 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml @@ -1,7 +1,7 @@ aws_crt_cpp: - 0.33.0 aws_sdk_cpp: -- 1.11.510 +- 1.11.606 azure_core_cpp: - 1.15.0 azure_identity_cpp: diff --git a/.ci_support/linux_ppc64le_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml b/.ci_support/linux_ppc64le_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml index 5d74751f8..126c0c516 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml @@ -1,7 +1,7 @@ aws_crt_cpp: - 0.33.0 aws_sdk_cpp: -- 1.11.510 +- 1.11.606 azure_core_cpp: - 1.15.0 azure_identity_cpp: diff --git a/.ci_support/migrations/aws_crt_cpp0330.yaml b/.ci_support/migrations/aws_crt_cpp0330.yaml deleted file mode 100644 index 3e8094dec..000000000 --- a/.ci_support/migrations/aws_crt_cpp0330.yaml +++ /dev/null @@ -1,8 +0,0 @@ -__migrator: - build_number: 1 - commit_message: Rebuild for aws_crt_cpp 0.33.0 - kind: version - migration_number: 1 -aws_crt_cpp: -- 0.33.0 -migrator_ts: 1752303120.1698182 diff --git a/.ci_support/migrations/libthrift0220.yaml b/.ci_support/migrations/libthrift0220.yaml deleted file mode 100644 index f551de94b..000000000 --- a/.ci_support/migrations/libthrift0220.yaml +++ /dev/null @@ -1,10 +0,0 @@ -__migrator: - build_number: 1 - commit_message: Rebuild for libthrift 0.22.0 - kind: version - migration_number: 1 -libthrift: -- 0.22.0 -migrator_ts: 1752260967.5811167 -thrift_cpp: -- 0.22.0 diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index f34a3ab9a..71c667a5c 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: aws_crt_cpp: - 0.33.0 aws_sdk_cpp: -- 1.11.510 +- 1.11.606 azure_core_cpp: - 1.15.0 azure_identity_cpp: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index d34765489..fcb4c0d38 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: aws_crt_cpp: - 0.33.0 aws_sdk_cpp: -- 1.11.510 +- 1.11.606 azure_core_cpp: - 1.15.0 azure_identity_cpp: diff --git a/.ci_support/win_64_cuda_compiler_version11.8.yaml b/.ci_support/win_64_cuda_compiler_version11.8.yaml index c130daf3a..952f8c5a3 100644 --- a/.ci_support/win_64_cuda_compiler_version11.8.yaml +++ b/.ci_support/win_64_cuda_compiler_version11.8.yaml @@ -1,7 +1,7 @@ aws_crt_cpp: - 0.33.0 aws_sdk_cpp: -- 1.11.510 +- 1.11.606 bzip2: - '1' c_compiler: diff --git a/.ci_support/win_64_cuda_compiler_versionNone.yaml b/.ci_support/win_64_cuda_compiler_versionNone.yaml index c76c0739a..ef01c1995 100644 --- a/.ci_support/win_64_cuda_compiler_versionNone.yaml +++ b/.ci_support/win_64_cuda_compiler_versionNone.yaml @@ -1,7 +1,7 @@ aws_crt_cpp: - 0.33.0 aws_sdk_cpp: -- 1.11.510 +- 1.11.606 bzip2: - '1' c_compiler: diff --git a/.gitattributes b/.gitattributes index 18f114a1f..85ccb8f4f 100644 --- a/.gitattributes +++ b/.gitattributes @@ -24,4 +24,5 @@ bld.bat text eol=crlf /README.md linguist-generated=true azure-pipelines.yml linguist-generated=true build-locally.py linguist-generated=true +pixi.toml linguist-generated=true shippable.yml linguist-generated=true From cabf3fb45d8e293b36a3c471bcc0892a2a1dd796 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sat, 19 Jul 2025 05:34:44 +0000 Subject: [PATCH 44/55] Rebuild for aws_crt_cpp 0.33.1 --- .ci_support/migrations/aws_crt_cpp0331.yaml | 8 ++++++++ recipe/meta.yaml | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/aws_crt_cpp0331.yaml diff --git a/.ci_support/migrations/aws_crt_cpp0331.yaml b/.ci_support/migrations/aws_crt_cpp0331.yaml new file mode 100644 index 000000000..7eabf5cfd --- /dev/null +++ b/.ci_support/migrations/aws_crt_cpp0331.yaml @@ -0,0 +1,8 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for aws_crt_cpp 0.33.1 + kind: version + migration_number: 1 +aws_crt_cpp: +- 0.33.1 +migrator_ts: 1752852095.1498294 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index abf1205cf..f7f6be92a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -40,7 +40,7 @@ source: folder: cpp/submodules/parquet-testing build: - number: 23 + number: 24 # 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)] From fb0fa504a7bdca962b580e3c0dff245e9eb010d6 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sat, 19 Jul 2025 05:38:19 +0000 Subject: [PATCH 45/55] MNT: Re-rendered with conda-build 25.5.0, conda-smithy 3.51.1, and conda-forge-pinning 2025.07.18.21.26.56 --- ...11cuda_compiler_version11.8cxx_compiler_version11.yaml | 2 +- ...14cuda_compiler_versionNonecxx_compiler_version14.yaml | 2 +- ...11cuda_compiler_version11.8cxx_compiler_version11.yaml | 2 +- ...14cuda_compiler_versionNonecxx_compiler_version14.yaml | 2 +- ...11cuda_compiler_version11.8cxx_compiler_version11.yaml | 2 +- ...14cuda_compiler_versionNonecxx_compiler_version14.yaml | 2 +- .ci_support/migrations/aws_sdk_cpp111606.yaml | 8 -------- .ci_support/osx_64_.yaml | 2 +- .ci_support/osx_arm64_.yaml | 2 +- .ci_support/win_64_cuda_compiler_version11.8.yaml | 2 +- .ci_support/win_64_cuda_compiler_versionNone.yaml | 2 +- 11 files changed, 10 insertions(+), 18 deletions(-) delete mode 100644 .ci_support/migrations/aws_sdk_cpp111606.yaml diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml index b1b454f76..71a4abf7d 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml @@ -1,5 +1,5 @@ aws_crt_cpp: -- 0.33.0 +- 0.33.1 aws_sdk_cpp: - 1.11.606 azure_core_cpp: diff --git a/.ci_support/linux_64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml b/.ci_support/linux_64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml index 584267bac..2e604e342 100644 --- a/.ci_support/linux_64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml +++ b/.ci_support/linux_64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml @@ -1,5 +1,5 @@ aws_crt_cpp: -- 0.33.0 +- 0.33.1 aws_sdk_cpp: - 1.11.606 azure_core_cpp: diff --git a/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml index 8bc450e9a..d5d067578 100644 --- a/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml @@ -1,5 +1,5 @@ aws_crt_cpp: -- 0.33.0 +- 0.33.1 aws_sdk_cpp: - 1.11.606 azure_core_cpp: diff --git a/.ci_support/linux_aarch64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml b/.ci_support/linux_aarch64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml index df9bc9aa5..0247ee06c 100644 --- a/.ci_support/linux_aarch64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml @@ -1,5 +1,5 @@ aws_crt_cpp: -- 0.33.0 +- 0.33.1 aws_sdk_cpp: - 1.11.606 azure_core_cpp: diff --git a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml index d0875e9cd..ae25fb009 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml @@ -1,5 +1,5 @@ aws_crt_cpp: -- 0.33.0 +- 0.33.1 aws_sdk_cpp: - 1.11.606 azure_core_cpp: diff --git a/.ci_support/linux_ppc64le_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml b/.ci_support/linux_ppc64le_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml index 126c0c516..ae7d9dad9 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml @@ -1,5 +1,5 @@ aws_crt_cpp: -- 0.33.0 +- 0.33.1 aws_sdk_cpp: - 1.11.606 azure_core_cpp: diff --git a/.ci_support/migrations/aws_sdk_cpp111606.yaml b/.ci_support/migrations/aws_sdk_cpp111606.yaml deleted file mode 100644 index 49df9a2de..000000000 --- a/.ci_support/migrations/aws_sdk_cpp111606.yaml +++ /dev/null @@ -1,8 +0,0 @@ -__migrator: - build_number: 1 - commit_message: Rebuild for aws_sdk_cpp 1.11.606 - kind: version - migration_number: 1 -aws_sdk_cpp: -- 1.11.606 -migrator_ts: 1752782891.0647976 diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 71c667a5c..624c96b6a 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: MACOSX_SDK_VERSION: - '11.0' aws_crt_cpp: -- 0.33.0 +- 0.33.1 aws_sdk_cpp: - 1.11.606 azure_core_cpp: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index fcb4c0d38..183c8ca32 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: MACOSX_SDK_VERSION: - '11.0' aws_crt_cpp: -- 0.33.0 +- 0.33.1 aws_sdk_cpp: - 1.11.606 azure_core_cpp: diff --git a/.ci_support/win_64_cuda_compiler_version11.8.yaml b/.ci_support/win_64_cuda_compiler_version11.8.yaml index 952f8c5a3..743e8667d 100644 --- a/.ci_support/win_64_cuda_compiler_version11.8.yaml +++ b/.ci_support/win_64_cuda_compiler_version11.8.yaml @@ -1,5 +1,5 @@ aws_crt_cpp: -- 0.33.0 +- 0.33.1 aws_sdk_cpp: - 1.11.606 bzip2: diff --git a/.ci_support/win_64_cuda_compiler_versionNone.yaml b/.ci_support/win_64_cuda_compiler_versionNone.yaml index ef01c1995..a3df1dfdb 100644 --- a/.ci_support/win_64_cuda_compiler_versionNone.yaml +++ b/.ci_support/win_64_cuda_compiler_versionNone.yaml @@ -1,5 +1,5 @@ aws_crt_cpp: -- 0.33.0 +- 0.33.1 aws_sdk_cpp: - 1.11.606 bzip2: From 8fbb0a2b1aab621eca61c543d2a3614170815cd0 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Wed, 23 Jul 2025 00:54:01 +0000 Subject: [PATCH 46/55] Rebuild for azure_core_cpp 1.16.0 and latest storage packages --- .../migrations/azure_core_cpp1160.yaml | 21 +++++++++++++++++++ recipe/meta.yaml | 2 +- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/azure_core_cpp1160.yaml diff --git a/.ci_support/migrations/azure_core_cpp1160.yaml b/.ci_support/migrations/azure_core_cpp1160.yaml new file mode 100644 index 000000000..1ff8f5007 --- /dev/null +++ b/.ci_support/migrations/azure_core_cpp1160.yaml @@ -0,0 +1,21 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for azure_core_cpp 1.16.0 and latest storage packages + kind: version + migration_number: 1 + exclude_pinned_pkgs: false +azure_core_cpp: +- 1.16.0 +azure_storage_common_cpp: +- 12.10.0 +azure_storage_blobs_cpp: +- 12.14.0 +azure_storage_files_datalake_cpp: +- 12.12.0 +azure_storage_files_shares_cpp: +- 12.14.0 +azure_storage_queues_cpp: +- 12.4.0 +azure_identity_cpp: +- 1.12.0 +migrator_ts: 1752518680.5378659 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index f7f6be92a..57609eb49 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -40,7 +40,7 @@ source: folder: cpp/submodules/parquet-testing build: - number: 24 + number: 25 # 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)] From 37161d9640ecf3dd4b05ca283fc965a80b261197 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Wed, 23 Jul 2025 00:57:30 +0000 Subject: [PATCH 47/55] MNT: Re-rendered with conda-build 25.5.0, conda-smithy 3.51.1, and conda-forge-pinning 2025.07.22.16.20.36 --- ...11cuda_compiler_version11.8cxx_compiler_version11.yaml | 6 +++--- ...14cuda_compiler_versionNonecxx_compiler_version14.yaml | 6 +++--- ...11cuda_compiler_version11.8cxx_compiler_version11.yaml | 6 +++--- ...14cuda_compiler_versionNonecxx_compiler_version14.yaml | 6 +++--- ...11cuda_compiler_version11.8cxx_compiler_version11.yaml | 6 +++--- ...14cuda_compiler_versionNonecxx_compiler_version14.yaml | 6 +++--- .ci_support/migrations/aws_crt_cpp0331.yaml | 8 -------- .ci_support/osx_64_.yaml | 6 +++--- .ci_support/osx_arm64_.yaml | 6 +++--- 9 files changed, 24 insertions(+), 32 deletions(-) delete mode 100644 .ci_support/migrations/aws_crt_cpp0331.yaml diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml index 71a4abf7d..a83b00df9 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml @@ -3,11 +3,11 @@ aws_crt_cpp: aws_sdk_cpp: - 1.11.606 azure_core_cpp: -- 1.15.0 +- 1.16.0 azure_identity_cpp: -- 1.11.0 +- 1.12.0 azure_storage_blobs_cpp: -- 12.13.0 +- 12.14.0 azure_storage_files_datalake_cpp: - 12.12.0 bzip2: diff --git a/.ci_support/linux_64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml b/.ci_support/linux_64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml index 2e604e342..e66b7d1a9 100644 --- a/.ci_support/linux_64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml +++ b/.ci_support/linux_64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml @@ -3,11 +3,11 @@ aws_crt_cpp: aws_sdk_cpp: - 1.11.606 azure_core_cpp: -- 1.15.0 +- 1.16.0 azure_identity_cpp: -- 1.11.0 +- 1.12.0 azure_storage_blobs_cpp: -- 12.13.0 +- 12.14.0 azure_storage_files_datalake_cpp: - 12.12.0 bzip2: diff --git a/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml index d5d067578..48e1d0dd0 100644 --- a/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml @@ -3,11 +3,11 @@ aws_crt_cpp: aws_sdk_cpp: - 1.11.606 azure_core_cpp: -- 1.15.0 +- 1.16.0 azure_identity_cpp: -- 1.11.0 +- 1.12.0 azure_storage_blobs_cpp: -- 12.13.0 +- 12.14.0 azure_storage_files_datalake_cpp: - 12.12.0 bzip2: diff --git a/.ci_support/linux_aarch64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml b/.ci_support/linux_aarch64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml index 0247ee06c..02097d171 100644 --- a/.ci_support/linux_aarch64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml @@ -3,11 +3,11 @@ aws_crt_cpp: aws_sdk_cpp: - 1.11.606 azure_core_cpp: -- 1.15.0 +- 1.16.0 azure_identity_cpp: -- 1.11.0 +- 1.12.0 azure_storage_blobs_cpp: -- 12.13.0 +- 12.14.0 azure_storage_files_datalake_cpp: - 12.12.0 bzip2: diff --git a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml index ae25fb009..a519b650c 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml @@ -3,11 +3,11 @@ aws_crt_cpp: aws_sdk_cpp: - 1.11.606 azure_core_cpp: -- 1.15.0 +- 1.16.0 azure_identity_cpp: -- 1.11.0 +- 1.12.0 azure_storage_blobs_cpp: -- 12.13.0 +- 12.14.0 azure_storage_files_datalake_cpp: - 12.12.0 bzip2: diff --git a/.ci_support/linux_ppc64le_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml b/.ci_support/linux_ppc64le_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml index ae7d9dad9..822eb61f0 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml @@ -3,11 +3,11 @@ aws_crt_cpp: aws_sdk_cpp: - 1.11.606 azure_core_cpp: -- 1.15.0 +- 1.16.0 azure_identity_cpp: -- 1.11.0 +- 1.12.0 azure_storage_blobs_cpp: -- 12.13.0 +- 12.14.0 azure_storage_files_datalake_cpp: - 12.12.0 bzip2: diff --git a/.ci_support/migrations/aws_crt_cpp0331.yaml b/.ci_support/migrations/aws_crt_cpp0331.yaml deleted file mode 100644 index 7eabf5cfd..000000000 --- a/.ci_support/migrations/aws_crt_cpp0331.yaml +++ /dev/null @@ -1,8 +0,0 @@ -__migrator: - build_number: 1 - commit_message: Rebuild for aws_crt_cpp 0.33.1 - kind: version - migration_number: 1 -aws_crt_cpp: -- 0.33.1 -migrator_ts: 1752852095.1498294 diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 624c96b6a..a5e519472 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -7,11 +7,11 @@ aws_crt_cpp: aws_sdk_cpp: - 1.11.606 azure_core_cpp: -- 1.15.0 +- 1.16.0 azure_identity_cpp: -- 1.11.0 +- 1.12.0 azure_storage_blobs_cpp: -- 12.13.0 +- 12.14.0 azure_storage_files_datalake_cpp: - 12.12.0 bzip2: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 183c8ca32..190230fa2 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -7,11 +7,11 @@ aws_crt_cpp: aws_sdk_cpp: - 1.11.606 azure_core_cpp: -- 1.15.0 +- 1.16.0 azure_identity_cpp: -- 1.11.0 +- 1.12.0 azure_storage_blobs_cpp: -- 12.13.0 +- 12.14.0 azure_storage_files_datalake_cpp: - 12.12.0 bzip2: From 8f3938087e0449bbbf6cd326c6c21f9c15522123 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Wed, 23 Jul 2025 15:10:45 +0000 Subject: [PATCH 48/55] Rebuild for libboost 1.88 --- .ci_support/migrations/libboost188.yaml | 12 ++++++++++++ recipe/meta.yaml | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/libboost188.yaml diff --git a/.ci_support/migrations/libboost188.yaml b/.ci_support/migrations/libboost188.yaml new file mode 100644 index 000000000..6eca3fb6a --- /dev/null +++ b/.ci_support/migrations/libboost188.yaml @@ -0,0 +1,12 @@ +__migrator: + build_number: 1 + kind: version + commit_message: "Rebuild for libboost 1.88" + migration_number: 1 +libboost_devel: +- "1.88" +libboost_headers: +- "1.88" +libboost_python_devel: +- "1.88" +migrator_ts: 1753251695.3315456 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 57609eb49..04d9778a0 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -40,7 +40,7 @@ source: folder: cpp/submodules/parquet-testing build: - number: 25 + number: 26 # 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)] From b7253ff5913a7c3c15540060277669ea5537a184 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Wed, 23 Jul 2025 15:14:12 +0000 Subject: [PATCH 49/55] MNT: Re-rendered with conda-build 25.5.0, conda-smithy 3.51.1, and conda-forge-pinning 2025.07.23.14.28.47 --- ...ler_version11.8cxx_compiler_version11.yaml | 2 +- ...ler_versionNonecxx_compiler_version14.yaml | 2 +- ...ler_version11.8cxx_compiler_version11.yaml | 2 +- ...ler_versionNonecxx_compiler_version14.yaml | 2 +- ...ler_version11.8cxx_compiler_version11.yaml | 2 +- ...ler_versionNonecxx_compiler_version14.yaml | 2 +- .../migrations/azure_core_cpp1160.yaml | 21 ------------------- .ci_support/osx_64_.yaml | 2 +- .ci_support/osx_arm64_.yaml | 2 +- .../win_64_cuda_compiler_version11.8.yaml | 2 +- .../win_64_cuda_compiler_versionNone.yaml | 2 +- 11 files changed, 10 insertions(+), 31 deletions(-) delete mode 100644 .ci_support/migrations/azure_core_cpp1160.yaml diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml index a83b00df9..249a21b56 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml @@ -47,7 +47,7 @@ libabseil: libarrow: - '*' libboost_devel: -- '1.86' +- '1.88' libgoogle_cloud_devel: - '2.39' libgoogle_cloud_storage_devel: diff --git a/.ci_support/linux_64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml b/.ci_support/linux_64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml index e66b7d1a9..7a7447f28 100644 --- a/.ci_support/linux_64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml +++ b/.ci_support/linux_64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml @@ -47,7 +47,7 @@ libabseil: libarrow: - '*' libboost_devel: -- '1.86' +- '1.88' libgoogle_cloud_devel: - '2.39' libgoogle_cloud_storage_devel: diff --git a/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml index 48e1d0dd0..e19e10a67 100644 --- a/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml @@ -47,7 +47,7 @@ libabseil: libarrow: - '*' libboost_devel: -- '1.86' +- '1.88' libgoogle_cloud_devel: - '2.39' libgoogle_cloud_storage_devel: diff --git a/.ci_support/linux_aarch64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml b/.ci_support/linux_aarch64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml index 02097d171..9cd402a45 100644 --- a/.ci_support/linux_aarch64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml @@ -47,7 +47,7 @@ libabseil: libarrow: - '*' libboost_devel: -- '1.86' +- '1.88' libgoogle_cloud_devel: - '2.39' libgoogle_cloud_storage_devel: diff --git a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml index a519b650c..043bfa846 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml @@ -47,7 +47,7 @@ libabseil: libarrow: - '*' libboost_devel: -- '1.86' +- '1.88' libgoogle_cloud_devel: - '2.39' libgoogle_cloud_storage_devel: diff --git a/.ci_support/linux_ppc64le_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml b/.ci_support/linux_ppc64le_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml index 822eb61f0..36d4dfcd2 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml @@ -47,7 +47,7 @@ libabseil: libarrow: - '*' libboost_devel: -- '1.86' +- '1.88' libgoogle_cloud_devel: - '2.39' libgoogle_cloud_storage_devel: diff --git a/.ci_support/migrations/azure_core_cpp1160.yaml b/.ci_support/migrations/azure_core_cpp1160.yaml deleted file mode 100644 index 1ff8f5007..000000000 --- a/.ci_support/migrations/azure_core_cpp1160.yaml +++ /dev/null @@ -1,21 +0,0 @@ -__migrator: - build_number: 1 - commit_message: Rebuild for azure_core_cpp 1.16.0 and latest storage packages - kind: version - migration_number: 1 - exclude_pinned_pkgs: false -azure_core_cpp: -- 1.16.0 -azure_storage_common_cpp: -- 12.10.0 -azure_storage_blobs_cpp: -- 12.14.0 -azure_storage_files_datalake_cpp: -- 12.12.0 -azure_storage_files_shares_cpp: -- 12.14.0 -azure_storage_queues_cpp: -- 12.4.0 -azure_identity_cpp: -- 1.12.0 -migrator_ts: 1752518680.5378659 diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index a5e519472..0ebcdc217 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -43,7 +43,7 @@ libabseil: libarrow: - '*' libboost_devel: -- '1.86' +- '1.88' libgoogle_cloud_devel: - '2.39' libgoogle_cloud_storage_devel: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 190230fa2..c6e171cb7 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -43,7 +43,7 @@ libabseil: libarrow: - '*' libboost_devel: -- '1.86' +- '1.88' libgoogle_cloud_devel: - '2.39' libgoogle_cloud_storage_devel: diff --git a/.ci_support/win_64_cuda_compiler_version11.8.yaml b/.ci_support/win_64_cuda_compiler_version11.8.yaml index 743e8667d..c3d2cd845 100644 --- a/.ci_support/win_64_cuda_compiler_version11.8.yaml +++ b/.ci_support/win_64_cuda_compiler_version11.8.yaml @@ -29,7 +29,7 @@ libabseil: libarrow: - '*' libboost_devel: -- '1.86' +- '1.88' libcrc32c: - '1.1' libcurl: diff --git a/.ci_support/win_64_cuda_compiler_versionNone.yaml b/.ci_support/win_64_cuda_compiler_versionNone.yaml index a3df1dfdb..7d53d5957 100644 --- a/.ci_support/win_64_cuda_compiler_versionNone.yaml +++ b/.ci_support/win_64_cuda_compiler_versionNone.yaml @@ -29,7 +29,7 @@ libabseil: libarrow: - '*' libboost_devel: -- '1.86' +- '1.88' libcrc32c: - '1.1' libcurl: From 618c798e8f5095329c7a0f31ee995599bdb0e70b Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 24 Jul 2025 08:02:12 +1100 Subject: [PATCH 50/55] backport fixes for boost 1.88 compatibility --- recipe/meta.yaml | 4 ++ recipe/patches/0001-disable-gcsfs_test.patch | 2 +- ...2-skip-NonExistentBucket-test-on-osx.patch | 2 +- ...ude-in-cpp-src-parquet-size_statisti.patch | 2 +- ...H-45225-C-Upgrade-ORC-to-2.1.0-45226.patch | 2 +- ...-1.19-compat-after-silent-breaking-c.patch | 2 +- ...plicit-conversion-of-possible-absl-s.patch | 2 +- ...1-C-CI-Fix-boost-1.88-on-MinGW-46113.patch | 61 ++++++++++++++++++ ...op-using-possibly-missing-boost-proc.patch | 64 +++++++++++++++++++ 9 files changed, 135 insertions(+), 6 deletions(-) create mode 100644 recipe/patches/0007-GH-46111-C-CI-Fix-boost-1.88-on-MinGW-46113.patch create mode 100644 recipe/patches/0008-GH-46159-CI-C-Stop-using-possibly-missing-boost-proc.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 04d9778a0..12abeeafd 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -30,6 +30,10 @@ source: - patches/0005-MINOR-C-Fix-OTel-1.19-compat-after-silent-breaking-c.patch # backport https://github.com/apache/arrow/pull/46136 - patches/0006-GH-46134-CI-C-Explicit-conversion-of-possible-absl-s.patch + # backport https://github.com/apache/arrow/pull/46113 + - patches/0007-GH-46111-C-CI-Fix-boost-1.88-on-MinGW-46113.patch + # backport https://github.com/apache/arrow/pull/46160 + - patches/0008-GH-46159-CI-C-Stop-using-possibly-missing-boost-proc.patch # testing-submodules not part of release tarball - git_url: https://github.com/apache/arrow-testing.git diff --git a/recipe/patches/0001-disable-gcsfs_test.patch b/recipe/patches/0001-disable-gcsfs_test.patch index a08af3092..76bf99f3e 100644 --- a/recipe/patches/0001-disable-gcsfs_test.patch +++ b/recipe/patches/0001-disable-gcsfs_test.patch @@ -1,7 +1,7 @@ From e35ee3c6edc44b9bc3bd998afc4b3ad3227b6a56 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sat, 2 Nov 2024 15:41:34 +1100 -Subject: [PATCH 1/6] disable gcsfs_test +Subject: [PATCH 1/8] disable gcsfs_test it cannot work unless we package https://github.com/googleapis/storage-testbench, which however has extremely tight dependencies on protobuf etc., making it very diff --git a/recipe/patches/0002-skip-NonExistentBucket-test-on-osx.patch b/recipe/patches/0002-skip-NonExistentBucket-test-on-osx.patch index ca713c67d..ae729bb71 100644 --- a/recipe/patches/0002-skip-NonExistentBucket-test-on-osx.patch +++ b/recipe/patches/0002-skip-NonExistentBucket-test-on-osx.patch @@ -1,7 +1,7 @@ From f9e6ab1ac71c1bc69905adc397302d14bf0e92f1 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 24 Nov 2024 20:22:35 +1100 -Subject: [PATCH 2/6] skip NonExistentBucket test on osx +Subject: [PATCH 2/8] skip NonExistentBucket test on osx --- cpp/src/arrow/filesystem/s3fs_test.cc | 4 ++++ diff --git a/recipe/patches/0003-add-missing-include-in-cpp-src-parquet-size_statisti.patch b/recipe/patches/0003-add-missing-include-in-cpp-src-parquet-size_statisti.patch index 1e6e797db..04dab0b06 100644 --- a/recipe/patches/0003-add-missing-include-in-cpp-src-parquet-size_statisti.patch +++ b/recipe/patches/0003-add-missing-include-in-cpp-src-parquet-size_statisti.patch @@ -1,7 +1,7 @@ From cf86fabb1dda76ba45b97e84d0566540e3bcc242 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Mon, 17 Feb 2025 11:56:43 +1100 -Subject: [PATCH 3/6] add missing include in cpp/src/parquet/size_statistics.cc +Subject: [PATCH 3/8] add missing include in cpp/src/parquet/size_statistics.cc Suggested-By: Bryce Mecum --- diff --git a/recipe/patches/0004-GH-45225-C-Upgrade-ORC-to-2.1.0-45226.patch b/recipe/patches/0004-GH-45225-C-Upgrade-ORC-to-2.1.0-45226.patch index c70213de7..f3b412e3a 100644 --- a/recipe/patches/0004-GH-45225-C-Upgrade-ORC-to-2.1.0-45226.patch +++ b/recipe/patches/0004-GH-45225-C-Upgrade-ORC-to-2.1.0-45226.patch @@ -1,7 +1,7 @@ From c403b19c68babb050b98a0a5203153dd36ab1db3 Mon Sep 17 00:00:00 2001 From: Gang Wu Date: Tue, 14 Jan 2025 10:25:08 +0800 -Subject: [PATCH 4/6] GH-45225: [C++] Upgrade ORC to 2.1.0 (#45226) +Subject: [PATCH 4/8] GH-45225: [C++] Upgrade ORC to 2.1.0 (#45226) ### Rationale for this change diff --git a/recipe/patches/0005-MINOR-C-Fix-OTel-1.19-compat-after-silent-breaking-c.patch b/recipe/patches/0005-MINOR-C-Fix-OTel-1.19-compat-after-silent-breaking-c.patch index de5f2da7d..1f75d1377 100644 --- a/recipe/patches/0005-MINOR-C-Fix-OTel-1.19-compat-after-silent-breaking-c.patch +++ b/recipe/patches/0005-MINOR-C-Fix-OTel-1.19-compat-after-silent-breaking-c.patch @@ -1,7 +1,7 @@ From 4d2513bec967c2a671f96039fbc1e91a627a36fa Mon Sep 17 00:00:00 2001 From: David Li Date: Wed, 19 Mar 2025 09:34:50 +0900 -Subject: [PATCH 5/6] MINOR: [C++] Fix OTel 1.19 compat after silent breaking +Subject: [PATCH 5/8] MINOR: [C++] Fix OTel 1.19 compat after silent breaking change --- diff --git a/recipe/patches/0006-GH-46134-CI-C-Explicit-conversion-of-possible-absl-s.patch b/recipe/patches/0006-GH-46134-CI-C-Explicit-conversion-of-possible-absl-s.patch index 4bbf66724..616990e9e 100644 --- a/recipe/patches/0006-GH-46134-CI-C-Explicit-conversion-of-possible-absl-s.patch +++ b/recipe/patches/0006-GH-46134-CI-C-Explicit-conversion-of-possible-absl-s.patch @@ -1,7 +1,7 @@ From 78e297360e6a335904fabed75ec0b2dd0cf7ade4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= Date: Mon, 14 Apr 2025 23:46:23 +0200 -Subject: [PATCH 6/6] GH-46134: [CI][C++] Explicit conversion of possible +Subject: [PATCH 6/8] GH-46134: [CI][C++] Explicit conversion of possible `absl::string_view` on protobuf methods to `std::string` (#46136) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 diff --git a/recipe/patches/0007-GH-46111-C-CI-Fix-boost-1.88-on-MinGW-46113.patch b/recipe/patches/0007-GH-46111-C-CI-Fix-boost-1.88-on-MinGW-46113.patch new file mode 100644 index 000000000..d25f734a8 --- /dev/null +++ b/recipe/patches/0007-GH-46111-C-CI-Fix-boost-1.88-on-MinGW-46113.patch @@ -0,0 +1,61 @@ +From ff5a5f41d654b840670835b4f28d6ee630b2d12e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= +Date: Mon, 14 Apr 2025 15:04:44 +0200 +Subject: [PATCH 7/8] GH-46111: [C++][CI] Fix boost 1.88 on MinGW (#46113) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +### Rationale for this change + +Boost has remove their `include/boost/process/v1.hpp` + +### What changes are included in this PR? + +Instead of using their old include file (which was a wrapper for the different includes) add the individual includes. + +### Are these changes tested? + +Via CI. + +### Are there any user-facing changes? + +No +* GitHub Issue: #46111 + +Authored-by: Raúl Cumplido +Signed-off-by: Raúl Cumplido +--- + cpp/src/arrow/testing/process.cc | 19 ++++++++++++++++++- + 1 file changed, 18 insertions(+), 1 deletion(-) + +diff --git a/cpp/src/arrow/testing/process.cc b/cpp/src/arrow/testing/process.cc +index 5f04b31aa1..b1c4fa5550 100644 +--- a/cpp/src/arrow/testing/process.cc ++++ b/cpp/src/arrow/testing/process.cc +@@ -57,7 +57,24 @@ + # define BOOST_USE_WINDOWS_H = 1 + # endif + # ifdef BOOST_PROCESS_HAVE_V1 +-# include ++# include ++# include ++# include ++# include ++# include ++# include ++# include ++# include ++# include ++# include ++# include ++# include ++# include ++# include ++# include ++# include ++# include ++# include + # else + # include + # endif diff --git a/recipe/patches/0008-GH-46159-CI-C-Stop-using-possibly-missing-boost-proc.patch b/recipe/patches/0008-GH-46159-CI-C-Stop-using-possibly-missing-boost-proc.patch new file mode 100644 index 000000000..7d29e887d --- /dev/null +++ b/recipe/patches/0008-GH-46159-CI-C-Stop-using-possibly-missing-boost-proc.patch @@ -0,0 +1,64 @@ +From c36208c83c5b1f8513e8cad7ecd0fb7a32ea414c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= +Date: Thu, 17 Apr 2025 12:06:54 +0200 +Subject: [PATCH 8/8] GH-46159: [CI][C++] Stop using possibly missing + boost/process/v2.hpp on boost 1.88 and use individual includes (#46160) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +### Rationale for this change + +Similar to https://github.com/apache/arrow/pull/46113 but for boost v2. +The files `v1.hpp` and `v2.hpp` have been removed from `include/boost/process` on `1.88`: +https://github.com/boostorg/process/tree/develop/include/boost/process +but were available on `1.87`: +https://github.com/boostorg/process/blob/boost-1.87.0/include/boost/process/v1.hpp +https://github.com/boostorg/process/blob/boost-1.87.0/include/boost/process/v2.hpp + +### What changes are included in this PR? + +Stop using include for possible missing file and add individual includes + +### Are these changes tested? + +Via CI + +### Are there any user-facing changes? + +No + +* GitHub Issue: #46159 + +Authored-by: Raúl Cumplido +Signed-off-by: Jacob Wujciak-Jens +--- + cpp/src/arrow/testing/process.cc | 13 ++++++++++--- + 1 file changed, 10 insertions(+), 3 deletions(-) + +diff --git a/cpp/src/arrow/testing/process.cc b/cpp/src/arrow/testing/process.cc +index b1c4fa5550..45b92af0dd 100644 +--- a/cpp/src/arrow/testing/process.cc ++++ b/cpp/src/arrow/testing/process.cc +@@ -39,11 +39,18 @@ + # ifdef __APPLE__ + # include + # endif +-# include + # include +-# else +-# include + # endif ++# include ++# include ++# include ++# include ++# include ++# include ++# include ++# include ++# include ++# include + # include + # else + // We need BOOST_USE_WINDOWS_H definition with MinGW when we use From 4db6be278bb146a50f076f192ad0b14d37e8d865 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 24 Jul 2025 09:30:00 +1100 Subject: [PATCH 51/55] add some dependencies to clean up link check --- recipe/meta.yaml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 12abeeafd..776fe7ec0 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -334,6 +334,9 @@ outputs: - {{ compiler("cxx") }} host: - {{ pin_subpackage("libarrow", exact=True) }} + - libabseil # [osx] + - libprotobuf # [osx] + - libopentelemetry-cpp # [osx] run: - {{ pin_subpackage("libarrow", exact=True) }} # run-constraints handled by libarrow, since we depend on it with exact=True @@ -381,6 +384,9 @@ outputs: - {{ pin_subpackage("libarrow", exact=True) }} - {{ pin_subpackage("libarrow-acero", exact=True) }} - {{ pin_subpackage("libparquet", exact=True) }} + - libabseil # [osx] + - libprotobuf # [osx] + - libopentelemetry-cpp # [osx] run: - {{ pin_subpackage("libarrow", exact=True) }} - {{ pin_subpackage("libarrow-acero", exact=True) }} @@ -434,6 +440,7 @@ outputs: - libabseil - libgrpc - libprotobuf + - libopentelemetry-cpp # [osx] run: - {{ pin_subpackage("libarrow", exact=True) }} # run-constraints handled by libarrow, since we depend on it with exact=True @@ -485,6 +492,8 @@ outputs: - {{ pin_subpackage("libarrow-flight", exact=True) }} - libabseil - libprotobuf + - libgrpc # [osx] + - libopentelemetry-cpp # [osx] run: - {{ pin_subpackage("libarrow", exact=True) }} - {{ pin_subpackage("libarrow-flight", exact=True) }} @@ -638,6 +647,9 @@ outputs: - {{ pin_subpackage("libarrow", exact=True) }} - openssl - thrift-cpp + - libabseil # [osx] + - libprotobuf # [osx] + - libopentelemetry-cpp # [osx] run: - {{ pin_subpackage("libarrow", exact=True) }} # run-constraints handled by libarrow, since we depend on it with exact=True @@ -680,8 +692,10 @@ outputs: - {{ compiler("c") }} - {{ compiler("cxx") }} host: + - {{ pin_subpackage("libarrow", exact=True) }} - {{ pin_subpackage("libparquet", exact=True) }} run: + - {{ pin_subpackage("libarrow", exact=True) }} - {{ pin_subpackage("libparquet", exact=True) }} test: From 5a528d154949620c7ecb2e9e5dffe97be1fb6d78 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Mon, 4 Aug 2025 05:23:58 +0000 Subject: [PATCH 52/55] Rebuild for orc 2.2.0 --- .ci_support/migrations/orc220.yaml | 8 ++++++++ recipe/meta.yaml | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/orc220.yaml diff --git a/.ci_support/migrations/orc220.yaml b/.ci_support/migrations/orc220.yaml new file mode 100644 index 000000000..5840d7bcc --- /dev/null +++ b/.ci_support/migrations/orc220.yaml @@ -0,0 +1,8 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for orc 2.2.0 + kind: version + migration_number: 1 +migrator_ts: 1754220388.1938324 +orc: +- 2.2.0 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 776fe7ec0..3d6055498 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -44,7 +44,7 @@ source: folder: cpp/submodules/parquet-testing build: - number: 26 + number: 27 # 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)] From 74881ba930d0610ed7830e920b3939fc8f2eb7d5 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Mon, 4 Aug 2025 05:27:29 +0000 Subject: [PATCH 53/55] MNT: Re-rendered with conda-build 25.5.0, conda-smithy 3.51.1, and conda-forge-pinning 2025.08.04.01.43.22 --- ...ersion11cuda_compiler_version11.8cxx_compiler_version11.yaml | 2 +- ...ersion14cuda_compiler_versionNonecxx_compiler_version14.yaml | 2 +- ...ersion11cuda_compiler_version11.8cxx_compiler_version11.yaml | 2 +- ...ersion14cuda_compiler_versionNonecxx_compiler_version14.yaml | 2 +- ...ersion11cuda_compiler_version11.8cxx_compiler_version11.yaml | 2 +- ...ersion14cuda_compiler_versionNonecxx_compiler_version14.yaml | 2 +- .ci_support/osx_64_.yaml | 2 +- .ci_support/osx_arm64_.yaml | 2 +- .ci_support/win_64_cuda_compiler_version11.8.yaml | 2 +- .ci_support/win_64_cuda_compiler_versionNone.yaml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml index 249a21b56..f0eb8a338 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml @@ -65,7 +65,7 @@ lz4_c: openssl: - '3' orc: -- 2.1.3 +- 2.2.0 re2: - 2024.07.02 snappy: diff --git a/.ci_support/linux_64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml b/.ci_support/linux_64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml index 7a7447f28..2979cc495 100644 --- a/.ci_support/linux_64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml +++ b/.ci_support/linux_64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml @@ -65,7 +65,7 @@ lz4_c: openssl: - '3' orc: -- 2.1.3 +- 2.2.0 re2: - 2024.07.02 snappy: diff --git a/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml index e19e10a67..274b2f0bf 100644 --- a/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml @@ -65,7 +65,7 @@ lz4_c: openssl: - '3' orc: -- 2.1.3 +- 2.2.0 re2: - 2024.07.02 snappy: diff --git a/.ci_support/linux_aarch64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml b/.ci_support/linux_aarch64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml index 9cd402a45..0c4a053ee 100644 --- a/.ci_support/linux_aarch64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml @@ -65,7 +65,7 @@ lz4_c: openssl: - '3' orc: -- 2.1.3 +- 2.2.0 re2: - 2024.07.02 snappy: diff --git a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml index 043bfa846..6d83d88c2 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml @@ -65,7 +65,7 @@ lz4_c: openssl: - '3' orc: -- 2.1.3 +- 2.2.0 re2: - 2024.07.02 snappy: diff --git a/.ci_support/linux_ppc64le_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml b/.ci_support/linux_ppc64le_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml index 36d4dfcd2..55969feee 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml @@ -65,7 +65,7 @@ lz4_c: openssl: - '3' orc: -- 2.1.3 +- 2.2.0 re2: - 2024.07.02 snappy: diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 0ebcdc217..eff3dc103 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -63,7 +63,7 @@ macos_machine: openssl: - '3' orc: -- 2.1.3 +- 2.2.0 re2: - 2024.07.02 snappy: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index c6e171cb7..c5f62e1e1 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -63,7 +63,7 @@ macos_machine: openssl: - '3' orc: -- 2.1.3 +- 2.2.0 re2: - 2024.07.02 snappy: diff --git a/.ci_support/win_64_cuda_compiler_version11.8.yaml b/.ci_support/win_64_cuda_compiler_version11.8.yaml index c3d2cd845..84244884e 100644 --- a/.ci_support/win_64_cuda_compiler_version11.8.yaml +++ b/.ci_support/win_64_cuda_compiler_version11.8.yaml @@ -49,7 +49,7 @@ lz4_c: openssl: - '3' orc: -- 2.1.3 +- 2.2.0 re2: - 2024.07.02 snappy: diff --git a/.ci_support/win_64_cuda_compiler_versionNone.yaml b/.ci_support/win_64_cuda_compiler_versionNone.yaml index 7d53d5957..017061e76 100644 --- a/.ci_support/win_64_cuda_compiler_versionNone.yaml +++ b/.ci_support/win_64_cuda_compiler_versionNone.yaml @@ -49,7 +49,7 @@ lz4_c: openssl: - '3' orc: -- 2.1.3 +- 2.2.0 re2: - 2024.07.02 snappy: From ca97428fab41af404a448420201694b058a5d165 Mon Sep 17 00:00:00 2001 From: Isaac <42949629+IsaacWarren@users.noreply.github.com> Date: Mon, 11 Aug 2025 11:32:06 -0500 Subject: [PATCH 54/55] Update compiler version --- .azure-pipelines/azure-pipelines-linux.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 5a8d26061..274cbd3c1 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,8 +8,8 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13: - CONFIG: linux_64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13 + linux_64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14: + CONFIG: linux_64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 timeoutInMinutes: 360 From 265e31141e08dee19e826baa319b3b50ab814b09 Mon Sep 17 00:00:00 2001 From: Isaac <42949629+IsaacWarren@users.noreply.github.com> Date: Mon, 11 Aug 2025 11:45:00 -0500 Subject: [PATCH 55/55] Rename patchfile --- .../patches/{0006-Bodo-Changes.patch => 0009-Bodo-Changes.patch} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename recipe/patches/{0006-Bodo-Changes.patch => 0009-Bodo-Changes.patch} (100%) diff --git a/recipe/patches/0006-Bodo-Changes.patch b/recipe/patches/0009-Bodo-Changes.patch similarity index 100% rename from recipe/patches/0006-Bodo-Changes.patch rename to recipe/patches/0009-Bodo-Changes.patch
linux_64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13linux_64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14 - variant + variant
linux_aarch64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13linux_aarch64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14 - variant + variant
linux_ppc64le_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13linux_ppc64le_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14 - variant + variant