diff --git a/.ci_support/linux_64_cuda_compiler_version10.2.yaml b/.ci_support/linux_64_cuda_compiler_version10.2.yaml index e542cef3c..703d58acb 100644 --- a/.ci_support/linux_64_cuda_compiler_version10.2.yaml +++ b/.ci_support/linux_64_cuda_compiler_version10.2.yaml @@ -75,6 +75,7 @@ ucx: zip_keys: - - c_compiler_version - cxx_compiler_version + - cuda_compiler - cuda_compiler_version - cdt_name - docker_image diff --git a/.ci_support/linux_64_cuda_compiler_versionNone.yaml b/.ci_support/linux_64_cuda_compiler_versionNone.yaml index cb4290661..88b39bd8f 100644 --- a/.ci_support/linux_64_cuda_compiler_versionNone.yaml +++ b/.ci_support/linux_64_cuda_compiler_versionNone.yaml @@ -17,7 +17,7 @@ channel_sources: channel_targets: - conda-forge main cuda_compiler: -- nvcc +- None cuda_compiler_version: - None cuda_compiler_version_min: @@ -75,6 +75,7 @@ ucx: zip_keys: - - c_compiler_version - cxx_compiler_version + - cuda_compiler - cuda_compiler_version - cdt_name - docker_image diff --git a/.ci_support/linux_aarch64_cuda_compiler_version11.2.yaml b/.ci_support/linux_aarch64_cuda_compiler_version11.2.yaml index 2f4e57a0f..86ef2f5c5 100644 --- a/.ci_support/linux_aarch64_cuda_compiler_version11.2.yaml +++ b/.ci_support/linux_aarch64_cuda_compiler_version11.2.yaml @@ -79,6 +79,7 @@ ucx: zip_keys: - - c_compiler_version - cxx_compiler_version + - cuda_compiler - cuda_compiler_version - cdt_name - docker_image diff --git a/.ci_support/linux_aarch64_cuda_compiler_versionNone.yaml b/.ci_support/linux_aarch64_cuda_compiler_versionNone.yaml index 6d3a8216e..297e505da 100644 --- a/.ci_support/linux_aarch64_cuda_compiler_versionNone.yaml +++ b/.ci_support/linux_aarch64_cuda_compiler_versionNone.yaml @@ -21,7 +21,7 @@ channel_sources: channel_targets: - conda-forge main cuda_compiler: -- nvcc +- None cuda_compiler_version: - None cuda_compiler_version_min: @@ -79,6 +79,7 @@ ucx: zip_keys: - - c_compiler_version - cxx_compiler_version + - cuda_compiler - cuda_compiler_version - cdt_name - docker_image diff --git a/.ci_support/linux_ppc64le_cuda_compiler_version11.2.yaml b/.ci_support/linux_ppc64le_cuda_compiler_version11.2.yaml index dbf994f1e..85b631258 100644 --- a/.ci_support/linux_ppc64le_cuda_compiler_version11.2.yaml +++ b/.ci_support/linux_ppc64le_cuda_compiler_version11.2.yaml @@ -75,6 +75,7 @@ ucx: zip_keys: - - c_compiler_version - cxx_compiler_version + - cuda_compiler - cuda_compiler_version - cdt_name - docker_image diff --git a/.ci_support/linux_ppc64le_cuda_compiler_versionNone.yaml b/.ci_support/linux_ppc64le_cuda_compiler_versionNone.yaml index 8ec685b17..6f2f3e5e1 100644 --- a/.ci_support/linux_ppc64le_cuda_compiler_versionNone.yaml +++ b/.ci_support/linux_ppc64le_cuda_compiler_versionNone.yaml @@ -17,7 +17,7 @@ channel_sources: channel_targets: - conda-forge main cuda_compiler: -- nvcc +- None cuda_compiler_version: - None cuda_compiler_version_min: @@ -75,6 +75,7 @@ ucx: zip_keys: - - c_compiler_version - cxx_compiler_version + - cuda_compiler - cuda_compiler_version - cdt_name - docker_image diff --git a/.ci_support/migrations/aws_sdk_cpp19375.yaml b/.ci_support/migrations/aws_sdk_cpp19375.yaml deleted file mode 100644 index 40cb1b3bb..000000000 --- a/.ci_support/migrations/aws_sdk_cpp19375.yaml +++ /dev/null @@ -1,8 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 - use_local: true -aws_sdk_cpp: -- 1.9.379 -migrator_ts: 1667321224.1701944 diff --git a/.ci_support/migrations/cuda_112_ppc64le_aarch64.yaml b/.ci_support/migrations/cuda_112_ppc64le_aarch64.yaml index 5d024931a..00c5437d2 100644 --- a/.ci_support/migrations/cuda_112_ppc64le_aarch64.yaml +++ b/.ci_support/migrations/cuda_112_ppc64le_aarch64.yaml @@ -15,7 +15,6 @@ __migrator: wait_for_migrators: - aarch64 and ppc64le addition exclude_pinned_pkgs: False - use_local: true commit_message: "Rebuild for cuda for ppc64le and aarch64" arm_variant_type: # [aarch64] diff --git a/.ci_support/migrations/ucx1410.yaml b/.ci_support/migrations/ucx1410.yaml deleted file mode 100644 index 482626f97..000000000 --- a/.ci_support/migrations/ucx1410.yaml +++ /dev/null @@ -1,8 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 - use_local: true -ucx: -- '1.14.0' -migrator_ts: 1679152574.207815 diff --git a/.ci_support/win_64_cuda_compiler_version10.2.yaml b/.ci_support/win_64_cuda_compiler_version10.2.yaml index 64a335666..edd532a49 100644 --- a/.ci_support/win_64_cuda_compiler_version10.2.yaml +++ b/.ci_support/win_64_cuda_compiler_version10.2.yaml @@ -65,6 +65,8 @@ target_platform: thrift_cpp: - 0.18.1 zip_keys: +- - cuda_compiler + - cuda_compiler_version - - python - numpy zlib: diff --git a/.ci_support/win_64_cuda_compiler_versionNone.yaml b/.ci_support/win_64_cuda_compiler_versionNone.yaml index b38f2ad16..bc5543fe5 100644 --- a/.ci_support/win_64_cuda_compiler_versionNone.yaml +++ b/.ci_support/win_64_cuda_compiler_versionNone.yaml @@ -11,7 +11,7 @@ channel_sources: channel_targets: - conda-forge main cuda_compiler: -- nvcc +- None cuda_compiler_version: - None cuda_compiler_version_min: @@ -65,6 +65,8 @@ target_platform: thrift_cpp: - 0.18.1 zip_keys: +- - cuda_compiler + - cuda_compiler_version - - python - numpy zlib: diff --git a/recipe/bld-arrow.bat b/recipe/bld-arrow.bat index 60c81be74..50f39dc30 100644 --- a/recipe/bld-arrow.bat +++ b/recipe/bld-arrow.bat @@ -18,8 +18,9 @@ if "%cuda_compiler_version%"=="None" ( set "READ_RECIPE_META_YAML_WHY_NOT=OFF" :: for available switches see -:: https://github.com/apache/arrow/blame/apache-arrow-11.0.0/cpp/cmake_modules/DefineOptions.cmake +:: https://github.com/apache/arrow/blame/apache-arrow-12.0.0/cpp/cmake_modules/DefineOptions.cmake cmake -G "Ninja" ^ + -DARROW_ACERO=ON ^ -DARROW_BOOST_USE_SHARED:BOOL=ON ^ -DARROW_BUILD_STATIC:BOOL=OFF ^ -DARROW_BUILD_TESTS:BOOL=OFF ^ diff --git a/recipe/build-arrow.sh b/recipe/build-arrow.sh index ea98d3a60..5630ba789 100644 --- a/recipe/build-arrow.sh +++ b/recipe/build-arrow.sh @@ -74,9 +74,10 @@ fi export READ_RECIPE_META_YAML_WHY_NOT=OFF # for available switches see -# https://github.com/apache/arrow/blame/apache-arrow-11.0.0/cpp/cmake_modules/DefineOptions.cmake +# https://github.com/apache/arrow/blame/apache-arrow-12.0.0/cpp/cmake_modules/DefineOptions.cmake # placeholder in ARROW_GDB_INSTALL_DIR must match what's used for replacement in activate.sh cmake -GNinja \ + -DARROW_ACERO=ON \ -DARROW_BOOST_USE_SHARED=ON \ -DARROW_BUILD_BENCHMARKS=OFF \ -DARROW_BUILD_STATIC=OFF \ diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 83630e918..07953d529 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -139,8 +139,8 @@ outputs: test: commands: {% set headers = [ - "arrow/api.h", "arrow/flight/types.h", "arrow/flight/sql/api.h", - "gandiva/engine.h", "parquet/api/reader.h" + "arrow/api.h", "arrow/acero/groupby.h", "arrow/flight/types.h", + "arrow/flight/sql/api.h", "gandiva/engine.h", "parquet/api/reader.h" ] %} {% for each_header in headers %} # headers @@ -149,8 +149,8 @@ outputs: {% endfor %} {% set libs = (cuda_compiler_version != "None") * ["arrow_cuda"] + [ - "arrow", "arrow_dataset", "arrow_flight", "arrow_flight_sql", - "arrow_substrait", "gandiva", "parquet" + "arrow", "arrow_acero", "arrow_dataset", "arrow_flight", + "arrow_flight_sql", "arrow_substrait", "gandiva", "parquet" ] %} {% for each_lib in libs %} # shared