diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 7c2d21106..f34d3022c 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_compiler_version11.8: - CONFIG: win_64_cuda_compiler_version11.8 + win_64_cuda_compilerNonecuda_compiler_versionNone: + CONFIG: win_64_cuda_compilerNonecuda_compiler_versionNone UPLOAD_PACKAGES: 'True' - win_64_cuda_compiler_versionNone: - CONFIG: win_64_cuda_compiler_versionNone + win_64_cuda_compilernvcccuda_compiler_version11.8: + CONFIG: win_64_cuda_compilernvcccuda_compiler_version11.8 UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: diff --git a/.ci_support/linux_64_c_compiler_version11c_stdlib_version2.17cuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_64_c_compiler_version11c_stdlib_version2.17cuda_compiler_version11.8cxx_compiler_version11.yaml index 3e8b7eb14..c2e509c03 100644 --- a/.ci_support/linux_64_c_compiler_version11c_stdlib_version2.17cuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_64_c_compiler_version11c_stdlib_version2.17cuda_compiler_version11.8cxx_compiler_version11.yaml @@ -2,6 +2,14 @@ aws_crt_cpp: - 0.26.12 aws_sdk_cpp: - 1.11.329 +azure_core_cpp: +- 1.12.0 +azure_identity_cpp: +- 1.8.0 +azure_storage_blobs_cpp: +- 12.11.0 +azure_storage_files_datalake_cpp: +- 12.10.0 bzip2: - '1' c_compiler: diff --git a/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12.yaml b/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12.yaml index 7030dba25..416c8f329 100644 --- a/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12.yaml +++ b/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12.yaml @@ -2,6 +2,14 @@ aws_crt_cpp: - 0.26.12 aws_sdk_cpp: - 1.11.329 +azure_core_cpp: +- 1.12.0 +azure_identity_cpp: +- 1.8.0 +azure_storage_blobs_cpp: +- 12.11.0 +azure_storage_files_datalake_cpp: +- 12.10.0 bzip2: - '1' c_compiler: diff --git a/.ci_support/linux_aarch64_c_compiler_version10cuda_compiler_version11.8cxx_compiler_version10.yaml b/.ci_support/linux_aarch64_c_compiler_version10cuda_compiler_version11.8cxx_compiler_version10.yaml index f3047c762..f83f6cdc6 100644 --- a/.ci_support/linux_aarch64_c_compiler_version10cuda_compiler_version11.8cxx_compiler_version10.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version10cuda_compiler_version11.8cxx_compiler_version10.yaml @@ -4,6 +4,14 @@ aws_crt_cpp: - 0.26.12 aws_sdk_cpp: - 1.11.329 +azure_core_cpp: +- 1.12.0 +azure_identity_cpp: +- 1.8.0 +azure_storage_blobs_cpp: +- 12.11.0 +azure_storage_files_datalake_cpp: +- 12.10.0 bzip2: - '1' c_compiler: 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 9c5ad18e2..050c2e69f 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 @@ -4,6 +4,14 @@ aws_crt_cpp: - 0.26.12 aws_sdk_cpp: - 1.11.329 +azure_core_cpp: +- 1.12.0 +azure_identity_cpp: +- 1.8.0 +azure_storage_blobs_cpp: +- 12.11.0 +azure_storage_files_datalake_cpp: +- 12.10.0 bzip2: - '1' c_compiler: diff --git a/.ci_support/linux_ppc64le_c_compiler_version10cuda_compiler_version11.8cxx_compiler_version10.yaml b/.ci_support/linux_ppc64le_c_compiler_version10cuda_compiler_version11.8cxx_compiler_version10.yaml index 96ce969d6..6241263e2 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version10cuda_compiler_version11.8cxx_compiler_version10.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version10cuda_compiler_version11.8cxx_compiler_version10.yaml @@ -2,6 +2,14 @@ aws_crt_cpp: - 0.26.12 aws_sdk_cpp: - 1.11.329 +azure_core_cpp: +- 1.12.0 +azure_identity_cpp: +- 1.8.0 +azure_storage_blobs_cpp: +- 12.11.0 +azure_storage_files_datalake_cpp: +- 12.10.0 bzip2: - '1' c_compiler: 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 e9d1545f4..ef15484d3 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 @@ -2,6 +2,14 @@ aws_crt_cpp: - 0.26.12 aws_sdk_cpp: - 1.11.329 +azure_core_cpp: +- 1.12.0 +azure_identity_cpp: +- 1.8.0 +azure_storage_blobs_cpp: +- 12.11.0 +azure_storage_files_datalake_cpp: +- 12.10.0 bzip2: - '1' c_compiler: diff --git a/.ci_support/migrations/azure_core_cpp1120.yaml b/.ci_support/migrations/azure_core_cpp1120.yaml new file mode 100644 index 000000000..2eff4f9b7 --- /dev/null +++ b/.ci_support/migrations/azure_core_cpp1120.yaml @@ -0,0 +1,21 @@ +migrator_ts: 1718824596 +__migrator: + kind: version + migration_number: 1 + bump_number: 1 + commit_message: Pin azure-core-cpp 1.12.0 + +azure_core_cpp: + - 1.12.0 +azure_identity_cpp: + - 1.8.0 +azure_storage_blobs_cpp: + - 12.11.0 +azure_storage_common_cpp: + - 12.6.0 +azure_storage_files_datalake_cpp: + - 12.10.0 +azure_storage_files_shares_cpp: + - 12.9.0 +azure_storage_queues_cpp: + - 12.2.0 diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index e8723e2f5..c952e98b1 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -6,6 +6,14 @@ aws_crt_cpp: - 0.26.12 aws_sdk_cpp: - 1.11.329 +azure_core_cpp: +- 1.12.0 +azure_identity_cpp: +- 1.8.0 +azure_storage_blobs_cpp: +- 12.11.0 +azure_storage_files_datalake_cpp: +- 12.10.0 bzip2: - '1' c_compiler: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 5d82c12f7..ff73555a2 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -6,6 +6,14 @@ aws_crt_cpp: - 0.26.12 aws_sdk_cpp: - 1.11.329 +azure_core_cpp: +- 1.12.0 +azure_identity_cpp: +- 1.8.0 +azure_storage_blobs_cpp: +- 12.11.0 +azure_storage_files_datalake_cpp: +- 12.10.0 bzip2: - '1' c_compiler: diff --git a/.ci_support/win_64_cuda_compiler_versionNone.yaml b/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNone.yaml similarity index 100% rename from .ci_support/win_64_cuda_compiler_versionNone.yaml rename to .ci_support/win_64_cuda_compilerNonecuda_compiler_versionNone.yaml diff --git a/.ci_support/win_64_cuda_compiler_version11.8.yaml b/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8.yaml similarity index 100% rename from .ci_support/win_64_cuda_compiler_version11.8.yaml rename to .ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8.yaml diff --git a/README.md b/README.md index 1cb7aa653..506716e84 100644 --- a/README.md +++ b/README.md @@ -168,17 +168,17 @@ Current build status - win_64_cuda_compiler_version11.8 + win_64_cuda_compilerNonecuda_compiler_versionNone - variant + variant - win_64_cuda_compiler_versionNone + win_64_cuda_compilernvcccuda_compiler_version11.8 - variant + variant diff --git a/recipe/bld.bat b/recipe/bld.bat index 6c896f89e..eee239ec3 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -10,13 +10,14 @@ if "%cuda_compiler_version%"=="None" ( set "EXTRA_CMAKE_ARGS=-DARROW_CUDA=ON" ) -:: # reusable variable for dependencies we cannot yet unvendor +:: # reusable variable for dependencies we cannot yet enable set "READ_RECIPE_META_YAML_WHY_NOT=OFF" :: for available switches see :: https://github.com/apache/arrow/blame/apache-arrow-12.0.0/cpp/cmake_modules/DefineOptions.cmake cmake -G "Ninja" ^ -DARROW_ACERO=ON ^ + -DARROW_AZURE=%READ_RECIPE_META_YAML_WHY_NOT% ^ -DARROW_BOOST_USE_SHARED:BOOL=ON ^ -DARROW_BUILD_STATIC:BOOL=OFF ^ -DARROW_BUILD_TESTS:BOOL=OFF ^ diff --git a/recipe/build.sh b/recipe/build.sh index bd8cf59cb..a615f6c6b 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -58,6 +58,7 @@ export READ_RECIPE_META_YAML_WHY_NOT=OFF # placeholder in ARROW_GDB_INSTALL_DIR must match _la_placeholder in activate.sh cmake -GNinja \ -DARROW_ACERO=ON \ + -DARROW_AZURE=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 67d520894..8574e13b5 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -27,7 +27,7 @@ source: folder: 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)] @@ -58,6 +58,12 @@ requirements: - llvmdev {{ llvm_version }} - aws-crt-cpp - aws-sdk-cpp + # azure filesystem dependencies, currently broken on windows, see + # https://github.com/apache/arrow/issues/41990 + - azure-core-cpp # [unix] + - azure-identity-cpp # [unix] + - azure-storage-blobs-cpp # [unix] + - azure-storage-files-datalake-cpp # [unix] - brotli - bzip2 # not yet: https://github.com/conda-forge/cpp-opentelemetry-sdk-feedstock/issues/38 @@ -186,6 +192,10 @@ outputs: host: - aws-crt-cpp - aws-sdk-cpp + - azure-core-cpp # [unix] + - azure-identity-cpp # [unix] + - azure-storage-blobs-cpp # [unix] + - azure-storage-files-datalake-cpp # [unix] - brotli - bzip2 # not yet: https://github.com/conda-forge/cpp-opentelemetry-sdk-feedstock/issues/38