diff --git a/dev/tasks/conda-recipes/.ci_support/linux_cuda_compiler_version9.2python3.6.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/linux_64_cuda_compiler_version10.2numpy1.17python3.6.____cpython.yaml similarity index 76% rename from dev/tasks/conda-recipes/.ci_support/linux_cuda_compiler_version9.2python3.6.____cpython.yaml rename to dev/tasks/conda-recipes/.ci_support/linux_64_cuda_compiler_version10.2numpy1.17python3.6.____cpython.yaml index 4c5061d6ff2..dd4c04197c9 100644 --- a/dev/tasks/conda-recipes/.ci_support/linux_cuda_compiler_version9.2python3.6.____cpython.yaml +++ b/dev/tasks/conda-recipes/.ci_support/linux_64_cuda_compiler_version10.2numpy1.17python3.6.____cpython.yaml @@ -1,13 +1,13 @@ aws_sdk_cpp: -- 1.8.63 -boost_cpp: -- 1.74.0 +- 1.8.151 bzip2: - '1' c_compiler: - gcc c_compiler_version: -- '7' +- '9' +cdt_name: +- cos6 channel_sources: - conda-forge,defaults channel_targets: @@ -15,30 +15,28 @@ channel_targets: cuda_compiler: - nvcc cuda_compiler_version: -- '9.2' +- '10.2' cxx_compiler: - gxx cxx_compiler_version: -- '7' +- '9' docker_image: -- condaforge/linux-anvil-cuda:9.2 +- quay.io/condaforge/linux-anvil-cuda:10.2 gflags: - '2.2' glog: - 0.4.0 grpc_cpp: -- '1.32' +- '1.36' libprotobuf: -- '3.13' +- '3.15' lz4_c: -- 1.9.2 +- 1.9.3 numpy: -- '1.16' +- '1.17' orc: -- 1.6.5 +- 1.6.7 pin_run_as_build: - boost-cpp: - max_pin: x.x.x bzip2: max_pin: x lz4-c: @@ -51,18 +49,21 @@ pin_run_as_build: python: - 3.6.* *_cpython re2: -- 2020.10.01 +- 2021.04.01 snappy: - '1' target_platform: - linux-64 +thrift_cpp: +- 0.14.1 zip_keys: - - c_compiler_version - cxx_compiler_version - - cuda_compiler_version + - cdt_name - docker_image -- - numpy - - python +- - python + - numpy zlib: - '1.2' zstd: diff --git a/dev/tasks/conda-recipes/.ci_support/linux_cuda_compiler_version9.2python3.7.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/linux_64_cuda_compiler_version10.2numpy1.17python3.7.____cpython.yaml similarity index 76% rename from dev/tasks/conda-recipes/.ci_support/linux_cuda_compiler_version9.2python3.7.____cpython.yaml rename to dev/tasks/conda-recipes/.ci_support/linux_64_cuda_compiler_version10.2numpy1.17python3.7.____cpython.yaml index db820f3ff26..f0c43929b56 100644 --- a/dev/tasks/conda-recipes/.ci_support/linux_cuda_compiler_version9.2python3.7.____cpython.yaml +++ b/dev/tasks/conda-recipes/.ci_support/linux_64_cuda_compiler_version10.2numpy1.17python3.7.____cpython.yaml @@ -1,13 +1,13 @@ aws_sdk_cpp: -- 1.8.63 -boost_cpp: -- 1.74.0 +- 1.8.151 bzip2: - '1' c_compiler: - gcc c_compiler_version: -- '7' +- '9' +cdt_name: +- cos6 channel_sources: - conda-forge,defaults channel_targets: @@ -15,30 +15,28 @@ channel_targets: cuda_compiler: - nvcc cuda_compiler_version: -- '9.2' +- '10.2' cxx_compiler: - gxx cxx_compiler_version: -- '7' +- '9' docker_image: -- condaforge/linux-anvil-cuda:9.2 +- quay.io/condaforge/linux-anvil-cuda:10.2 gflags: - '2.2' glog: - 0.4.0 grpc_cpp: -- '1.32' +- '1.36' libprotobuf: -- '3.13' +- '3.15' lz4_c: -- 1.9.2 +- 1.9.3 numpy: -- '1.16' +- '1.17' orc: -- 1.6.5 +- 1.6.7 pin_run_as_build: - boost-cpp: - max_pin: x.x.x bzip2: max_pin: x lz4-c: @@ -51,18 +49,21 @@ pin_run_as_build: python: - 3.7.* *_cpython re2: -- 2020.10.01 +- 2021.04.01 snappy: - '1' target_platform: - linux-64 +thrift_cpp: +- 0.14.1 zip_keys: - - c_compiler_version - cxx_compiler_version - - cuda_compiler_version + - cdt_name - docker_image -- - numpy - - python +- - python + - numpy zlib: - '1.2' zstd: diff --git a/dev/tasks/conda-recipes/.ci_support/linux_cuda_compiler_version9.2python3.8.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/linux_64_cuda_compiler_version10.2numpy1.17python3.8.____cpython.yaml similarity index 76% rename from dev/tasks/conda-recipes/.ci_support/linux_cuda_compiler_version9.2python3.8.____cpython.yaml rename to dev/tasks/conda-recipes/.ci_support/linux_64_cuda_compiler_version10.2numpy1.17python3.8.____cpython.yaml index 24810f3c0f1..149e70f438b 100644 --- a/dev/tasks/conda-recipes/.ci_support/linux_cuda_compiler_version9.2python3.8.____cpython.yaml +++ b/dev/tasks/conda-recipes/.ci_support/linux_64_cuda_compiler_version10.2numpy1.17python3.8.____cpython.yaml @@ -1,13 +1,13 @@ aws_sdk_cpp: -- 1.8.63 -boost_cpp: -- 1.74.0 +- 1.8.151 bzip2: - '1' c_compiler: - gcc c_compiler_version: -- '7' +- '9' +cdt_name: +- cos6 channel_sources: - conda-forge,defaults channel_targets: @@ -15,30 +15,28 @@ channel_targets: cuda_compiler: - nvcc cuda_compiler_version: -- '9.2' +- '10.2' cxx_compiler: - gxx cxx_compiler_version: -- '7' +- '9' docker_image: -- condaforge/linux-anvil-cuda:9.2 +- quay.io/condaforge/linux-anvil-cuda:10.2 gflags: - '2.2' glog: - 0.4.0 grpc_cpp: -- '1.32' +- '1.36' libprotobuf: -- '3.13' +- '3.15' lz4_c: -- 1.9.2 +- 1.9.3 numpy: -- '1.16' +- '1.17' orc: -- 1.6.5 +- 1.6.7 pin_run_as_build: - boost-cpp: - max_pin: x.x.x bzip2: max_pin: x lz4-c: @@ -51,18 +49,21 @@ pin_run_as_build: python: - 3.8.* *_cpython re2: -- 2020.10.01 +- 2021.04.01 snappy: - '1' target_platform: - linux-64 +thrift_cpp: +- 0.14.1 zip_keys: - - c_compiler_version - cxx_compiler_version - - cuda_compiler_version + - cdt_name - docker_image -- - numpy - - python +- - python + - numpy zlib: - '1.2' zstd: diff --git a/dev/tasks/conda-recipes/.ci_support/linux_cuda_compiler_version9.2python3.9.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/linux_64_cuda_compiler_version10.2numpy1.19python3.9.____cpython.yaml similarity index 77% rename from dev/tasks/conda-recipes/.ci_support/linux_cuda_compiler_version9.2python3.9.____cpython.yaml rename to dev/tasks/conda-recipes/.ci_support/linux_64_cuda_compiler_version10.2numpy1.19python3.9.____cpython.yaml index ebe422be367..fb15d4e7156 100644 --- a/dev/tasks/conda-recipes/.ci_support/linux_cuda_compiler_version9.2python3.9.____cpython.yaml +++ b/dev/tasks/conda-recipes/.ci_support/linux_64_cuda_compiler_version10.2numpy1.19python3.9.____cpython.yaml @@ -1,13 +1,13 @@ aws_sdk_cpp: -- 1.8.63 -boost_cpp: -- 1.74.0 +- 1.8.151 bzip2: - '1' c_compiler: - gcc c_compiler_version: -- '7' +- '9' +cdt_name: +- cos6 channel_sources: - conda-forge,defaults channel_targets: @@ -15,30 +15,28 @@ channel_targets: cuda_compiler: - nvcc cuda_compiler_version: -- '9.2' +- '10.2' cxx_compiler: - gxx cxx_compiler_version: -- '7' +- '9' docker_image: -- condaforge/linux-anvil-cuda:9.2 +- quay.io/condaforge/linux-anvil-cuda:10.2 gflags: - '2.2' glog: - 0.4.0 grpc_cpp: -- '1.32' +- '1.36' libprotobuf: -- '3.13' +- '3.15' lz4_c: -- 1.9.2 +- 1.9.3 numpy: - '1.19' orc: -- 1.6.5 +- 1.6.7 pin_run_as_build: - boost-cpp: - max_pin: x.x.x bzip2: max_pin: x lz4-c: @@ -51,18 +49,21 @@ pin_run_as_build: python: - 3.9.* *_cpython re2: -- 2020.10.01 +- 2021.04.01 snappy: - '1' target_platform: - linux-64 +thrift_cpp: +- 0.14.1 zip_keys: - - c_compiler_version - cxx_compiler_version - - cuda_compiler_version + - cdt_name - docker_image -- - numpy - - python +- - python + - numpy zlib: - '1.2' zstd: diff --git a/dev/tasks/conda-recipes/.ci_support/linux_cuda_compiler_versionNonepython3.6.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/linux_64_cuda_compiler_versionNonenumpy1.17python3.6.____cpython.yaml similarity index 77% rename from dev/tasks/conda-recipes/.ci_support/linux_cuda_compiler_versionNonepython3.6.____cpython.yaml rename to dev/tasks/conda-recipes/.ci_support/linux_64_cuda_compiler_versionNonenumpy1.17python3.6.____cpython.yaml index 358814fb0da..d977f9e5779 100644 --- a/dev/tasks/conda-recipes/.ci_support/linux_cuda_compiler_versionNonepython3.6.____cpython.yaml +++ b/dev/tasks/conda-recipes/.ci_support/linux_64_cuda_compiler_versionNonenumpy1.17python3.6.____cpython.yaml @@ -1,13 +1,13 @@ aws_sdk_cpp: -- 1.8.63 -boost_cpp: -- 1.74.0 +- 1.8.151 bzip2: - '1' c_compiler: - gcc c_compiler_version: -- '7' +- '9' +cdt_name: +- cos6 channel_sources: - conda-forge,defaults channel_targets: @@ -19,26 +19,24 @@ cuda_compiler_version: cxx_compiler: - gxx cxx_compiler_version: -- '7' +- '9' docker_image: -- condaforge/linux-anvil-comp7 +- quay.io/condaforge/linux-anvil-comp7 gflags: - '2.2' glog: - 0.4.0 grpc_cpp: -- '1.32' +- '1.36' libprotobuf: -- '3.13' +- '3.15' lz4_c: -- 1.9.2 +- 1.9.3 numpy: -- '1.16' +- '1.17' orc: -- 1.6.5 +- 1.6.7 pin_run_as_build: - boost-cpp: - max_pin: x.x.x bzip2: max_pin: x lz4-c: @@ -51,18 +49,21 @@ pin_run_as_build: python: - 3.6.* *_cpython re2: -- 2020.10.01 +- 2021.04.01 snappy: - '1' target_platform: - linux-64 +thrift_cpp: +- 0.14.1 zip_keys: - - c_compiler_version - cxx_compiler_version - - cuda_compiler_version + - cdt_name - docker_image -- - numpy - - python +- - python + - numpy zlib: - '1.2' zstd: diff --git a/dev/tasks/conda-recipes/.ci_support/linux_cuda_compiler_versionNonepython3.7.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/linux_64_cuda_compiler_versionNonenumpy1.17python3.7.____cpython.yaml similarity index 77% rename from dev/tasks/conda-recipes/.ci_support/linux_cuda_compiler_versionNonepython3.7.____cpython.yaml rename to dev/tasks/conda-recipes/.ci_support/linux_64_cuda_compiler_versionNonenumpy1.17python3.7.____cpython.yaml index 054a730ee50..6ffa87a5eb9 100644 --- a/dev/tasks/conda-recipes/.ci_support/linux_cuda_compiler_versionNonepython3.7.____cpython.yaml +++ b/dev/tasks/conda-recipes/.ci_support/linux_64_cuda_compiler_versionNonenumpy1.17python3.7.____cpython.yaml @@ -1,13 +1,13 @@ aws_sdk_cpp: -- 1.8.63 -boost_cpp: -- 1.74.0 +- 1.8.151 bzip2: - '1' c_compiler: - gcc c_compiler_version: -- '7' +- '9' +cdt_name: +- cos6 channel_sources: - conda-forge,defaults channel_targets: @@ -19,26 +19,24 @@ cuda_compiler_version: cxx_compiler: - gxx cxx_compiler_version: -- '7' +- '9' docker_image: -- condaforge/linux-anvil-comp7 +- quay.io/condaforge/linux-anvil-comp7 gflags: - '2.2' glog: - 0.4.0 grpc_cpp: -- '1.32' +- '1.36' libprotobuf: -- '3.13' +- '3.15' lz4_c: -- 1.9.2 +- 1.9.3 numpy: -- '1.16' +- '1.17' orc: -- 1.6.5 +- 1.6.7 pin_run_as_build: - boost-cpp: - max_pin: x.x.x bzip2: max_pin: x lz4-c: @@ -51,18 +49,21 @@ pin_run_as_build: python: - 3.7.* *_cpython re2: -- 2020.10.01 +- 2021.04.01 snappy: - '1' target_platform: - linux-64 +thrift_cpp: +- 0.14.1 zip_keys: - - c_compiler_version - cxx_compiler_version - - cuda_compiler_version + - cdt_name - docker_image -- - numpy - - python +- - python + - numpy zlib: - '1.2' zstd: diff --git a/dev/tasks/conda-recipes/.ci_support/linux_cuda_compiler_versionNonepython3.8.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/linux_64_cuda_compiler_versionNonenumpy1.17python3.8.____cpython.yaml similarity index 77% rename from dev/tasks/conda-recipes/.ci_support/linux_cuda_compiler_versionNonepython3.8.____cpython.yaml rename to dev/tasks/conda-recipes/.ci_support/linux_64_cuda_compiler_versionNonenumpy1.17python3.8.____cpython.yaml index a3bfc58ea8f..7105f634953 100644 --- a/dev/tasks/conda-recipes/.ci_support/linux_cuda_compiler_versionNonepython3.8.____cpython.yaml +++ b/dev/tasks/conda-recipes/.ci_support/linux_64_cuda_compiler_versionNonenumpy1.17python3.8.____cpython.yaml @@ -1,13 +1,13 @@ aws_sdk_cpp: -- 1.8.63 -boost_cpp: -- 1.74.0 +- 1.8.151 bzip2: - '1' c_compiler: - gcc c_compiler_version: -- '7' +- '9' +cdt_name: +- cos6 channel_sources: - conda-forge,defaults channel_targets: @@ -19,26 +19,24 @@ cuda_compiler_version: cxx_compiler: - gxx cxx_compiler_version: -- '7' +- '9' docker_image: -- condaforge/linux-anvil-comp7 +- quay.io/condaforge/linux-anvil-comp7 gflags: - '2.2' glog: - 0.4.0 grpc_cpp: -- '1.32' +- '1.36' libprotobuf: -- '3.13' +- '3.15' lz4_c: -- 1.9.2 +- 1.9.3 numpy: -- '1.16' +- '1.17' orc: -- 1.6.5 +- 1.6.7 pin_run_as_build: - boost-cpp: - max_pin: x.x.x bzip2: max_pin: x lz4-c: @@ -51,18 +49,21 @@ pin_run_as_build: python: - 3.8.* *_cpython re2: -- 2020.10.01 +- 2021.04.01 snappy: - '1' target_platform: - linux-64 +thrift_cpp: +- 0.14.1 zip_keys: - - c_compiler_version - cxx_compiler_version - - cuda_compiler_version + - cdt_name - docker_image -- - numpy - - python +- - python + - numpy zlib: - '1.2' zstd: diff --git a/dev/tasks/conda-recipes/.ci_support/linux_cuda_compiler_versionNonepython3.9.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/linux_64_cuda_compiler_versionNonenumpy1.19python3.9.____cpython.yaml similarity index 78% rename from dev/tasks/conda-recipes/.ci_support/linux_cuda_compiler_versionNonepython3.9.____cpython.yaml rename to dev/tasks/conda-recipes/.ci_support/linux_64_cuda_compiler_versionNonenumpy1.19python3.9.____cpython.yaml index 88541395052..efe0148cc81 100644 --- a/dev/tasks/conda-recipes/.ci_support/linux_cuda_compiler_versionNonepython3.9.____cpython.yaml +++ b/dev/tasks/conda-recipes/.ci_support/linux_64_cuda_compiler_versionNonenumpy1.19python3.9.____cpython.yaml @@ -1,13 +1,13 @@ aws_sdk_cpp: -- 1.8.63 -boost_cpp: -- 1.74.0 +- 1.8.151 bzip2: - '1' c_compiler: - gcc c_compiler_version: -- '7' +- '9' +cdt_name: +- cos6 channel_sources: - conda-forge,defaults channel_targets: @@ -19,26 +19,24 @@ cuda_compiler_version: cxx_compiler: - gxx cxx_compiler_version: -- '7' +- '9' docker_image: -- condaforge/linux-anvil-comp7 +- quay.io/condaforge/linux-anvil-comp7 gflags: - '2.2' glog: - 0.4.0 grpc_cpp: -- '1.32' +- '1.36' libprotobuf: -- '3.13' +- '3.15' lz4_c: -- 1.9.2 +- 1.9.3 numpy: - '1.19' orc: -- 1.6.5 +- 1.6.7 pin_run_as_build: - boost-cpp: - max_pin: x.x.x bzip2: max_pin: x lz4-c: @@ -51,18 +49,21 @@ pin_run_as_build: python: - 3.9.* *_cpython re2: -- 2020.10.01 +- 2021.04.01 snappy: - '1' target_platform: - linux-64 +thrift_cpp: +- 0.14.1 zip_keys: - - c_compiler_version - cxx_compiler_version - - cuda_compiler_version + - cdt_name - docker_image -- - numpy - - python +- - python + - numpy zlib: - '1.2' zstd: diff --git a/dev/tasks/conda-recipes/.ci_support/osx_python3.6.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/osx_64_numpy1.17python3.6.____cpython.yaml similarity index 81% rename from dev/tasks/conda-recipes/.ci_support/osx_python3.6.____cpython.yaml rename to dev/tasks/conda-recipes/.ci_support/osx_64_numpy1.17python3.6.____cpython.yaml index c019508dce4..7b2dbb34d76 100644 --- a/dev/tasks/conda-recipes/.ci_support/osx_python3.6.____cpython.yaml +++ b/dev/tasks/conda-recipes/.ci_support/osx_64_numpy1.17python3.6.____cpython.yaml @@ -1,15 +1,13 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' aws_sdk_cpp: -- 1.8.63 -boost_cpp: -- 1.74.0 +- 1.8.151 bzip2: - '1' c_compiler: - clang c_compiler_version: -- '10' +- '11' channel_sources: - conda-forge,defaults channel_targets: @@ -19,26 +17,24 @@ cuda_compiler_version: cxx_compiler: - clangxx cxx_compiler_version: -- '10' +- '11' gflags: - '2.2' glog: - 0.4.0 grpc_cpp: -- '1.32' +- '1.36' libprotobuf: -- '3.13' +- '3.15' lz4_c: -- 1.9.2 +- 1.9.3 macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.16' +- '1.17' orc: -- 1.6.5 +- 1.6.7 pin_run_as_build: - boost-cpp: - max_pin: x.x.x bzip2: max_pin: x lz4-c: @@ -51,16 +47,18 @@ pin_run_as_build: python: - 3.6.* *_cpython re2: -- 2020.10.01 +- 2021.04.01 snappy: - '1' target_platform: - osx-64 +thrift_cpp: +- 0.14.1 zip_keys: - - c_compiler_version - cxx_compiler_version -- - numpy - - python +- - python + - numpy zlib: - '1.2' zstd: diff --git a/dev/tasks/conda-recipes/.ci_support/osx_python3.7.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/osx_64_numpy1.17python3.7.____cpython.yaml similarity index 81% rename from dev/tasks/conda-recipes/.ci_support/osx_python3.7.____cpython.yaml rename to dev/tasks/conda-recipes/.ci_support/osx_64_numpy1.17python3.7.____cpython.yaml index 888071766a5..8e3e828ab8a 100644 --- a/dev/tasks/conda-recipes/.ci_support/osx_python3.7.____cpython.yaml +++ b/dev/tasks/conda-recipes/.ci_support/osx_64_numpy1.17python3.7.____cpython.yaml @@ -1,15 +1,13 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' aws_sdk_cpp: -- 1.8.63 -boost_cpp: -- 1.74.0 +- 1.8.151 bzip2: - '1' c_compiler: - clang c_compiler_version: -- '10' +- '11' channel_sources: - conda-forge,defaults channel_targets: @@ -19,26 +17,24 @@ cuda_compiler_version: cxx_compiler: - clangxx cxx_compiler_version: -- '10' +- '11' gflags: - '2.2' glog: - 0.4.0 grpc_cpp: -- '1.32' +- '1.36' libprotobuf: -- '3.13' +- '3.15' lz4_c: -- 1.9.2 +- 1.9.3 macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.16' +- '1.17' orc: -- 1.6.5 +- 1.6.7 pin_run_as_build: - boost-cpp: - max_pin: x.x.x bzip2: max_pin: x lz4-c: @@ -51,16 +47,18 @@ pin_run_as_build: python: - 3.7.* *_cpython re2: -- 2020.10.01 +- 2021.04.01 snappy: - '1' target_platform: - osx-64 +thrift_cpp: +- 0.14.1 zip_keys: - - c_compiler_version - cxx_compiler_version -- - numpy - - python +- - python + - numpy zlib: - '1.2' zstd: diff --git a/dev/tasks/conda-recipes/.ci_support/osx_python3.8.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/osx_64_numpy1.17python3.8.____cpython.yaml similarity index 77% rename from dev/tasks/conda-recipes/.ci_support/osx_python3.8.____cpython.yaml rename to dev/tasks/conda-recipes/.ci_support/osx_64_numpy1.17python3.8.____cpython.yaml index ad449921253..cdd53c6006e 100644 --- a/dev/tasks/conda-recipes/.ci_support/osx_python3.8.____cpython.yaml +++ b/dev/tasks/conda-recipes/.ci_support/osx_64_numpy1.17python3.8.____cpython.yaml @@ -1,15 +1,13 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' aws_sdk_cpp: -- 1.8.54 -boost_cpp: -- 1.74.0 +- 1.8.151 bzip2: - '1' c_compiler: - clang c_compiler_version: -- '10' +- '11' channel_sources: - conda-forge,defaults channel_targets: @@ -19,26 +17,24 @@ cuda_compiler_version: cxx_compiler: - clangxx cxx_compiler_version: -- '10' +- '11' gflags: - '2.2' glog: - 0.4.0 grpc_cpp: -- '1.30' +- '1.36' libprotobuf: -- '3.13' +- '3.15' lz4_c: -- 1.9.2 +- 1.9.3 macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.17.3' +- '1.17' orc: -- 1.6.4 +- 1.6.7 pin_run_as_build: - boost-cpp: - max_pin: x.x.x bzip2: max_pin: x lz4-c: @@ -51,11 +47,18 @@ pin_run_as_build: python: - 3.8.* *_cpython re2: -- 2020.08.01 +- 2021.04.01 snappy: - '1' target_platform: - osx-64 +thrift_cpp: +- 0.14.1 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy zlib: - '1.2' zstd: diff --git a/dev/tasks/conda-recipes/.ci_support/osx_python3.9.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/osx_64_numpy1.19python3.9.____cpython.yaml similarity index 82% rename from dev/tasks/conda-recipes/.ci_support/osx_python3.9.____cpython.yaml rename to dev/tasks/conda-recipes/.ci_support/osx_64_numpy1.19python3.9.____cpython.yaml index c630217d111..37df6a9ec53 100644 --- a/dev/tasks/conda-recipes/.ci_support/osx_python3.9.____cpython.yaml +++ b/dev/tasks/conda-recipes/.ci_support/osx_64_numpy1.19python3.9.____cpython.yaml @@ -1,15 +1,13 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' aws_sdk_cpp: -- 1.8.63 -boost_cpp: -- 1.74.0 +- 1.8.151 bzip2: - '1' c_compiler: - clang c_compiler_version: -- '10' +- '11' channel_sources: - conda-forge,defaults channel_targets: @@ -19,26 +17,24 @@ cuda_compiler_version: cxx_compiler: - clangxx cxx_compiler_version: -- '10' +- '11' gflags: - '2.2' glog: - 0.4.0 grpc_cpp: -- '1.32' +- '1.36' libprotobuf: -- '3.13' +- '3.15' lz4_c: -- 1.9.2 +- 1.9.3 macos_machine: - x86_64-apple-darwin13.4.0 numpy: - '1.19' orc: -- 1.6.5 +- 1.6.7 pin_run_as_build: - boost-cpp: - max_pin: x.x.x bzip2: max_pin: x lz4-c: @@ -51,16 +47,18 @@ pin_run_as_build: python: - 3.9.* *_cpython re2: -- 2020.10.01 +- 2021.04.01 snappy: - '1' target_platform: - osx-64 +thrift_cpp: +- 0.14.1 zip_keys: - - c_compiler_version - cxx_compiler_version -- - numpy - - python +- - python + - numpy zlib: - '1.2' zstd: diff --git a/dev/tasks/conda-recipes/.ci_support/osx_arm64_python3.8.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/osx_arm64_python3.8.____cpython.yaml new file mode 100644 index 00000000000..5894b8ee70b --- /dev/null +++ b/dev/tasks/conda-recipes/.ci_support/osx_arm64_python3.8.____cpython.yaml @@ -0,0 +1,65 @@ +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +aws_sdk_cpp: +- 1.8.151 +bzip2: +- '1' +c_compiler: +- clang +c_compiler_version: +- '11' +channel_sources: +- conda-forge/label/rust_dev,conda-forge +channel_targets: +- conda-forge main +cuda_compiler_version: +- None +cxx_compiler: +- clangxx +cxx_compiler_version: +- '11' +gflags: +- '2.2' +glog: +- 0.4.0 +grpc_cpp: +- '1.36' +libprotobuf: +- '3.15' +lz4_c: +- 1.9.3 +macos_machine: +- arm64-apple-darwin20.0.0 +numpy: +- '1.19' +orc: +- 1.6.7 +pin_run_as_build: + bzip2: + max_pin: x + lz4-c: + max_pin: x.x.x + python: + min_pin: x.x + max_pin: x.x + zlib: + max_pin: x.x +python: +- 3.8.* *_cpython +re2: +- 2021.04.01 +snappy: +- '1' +target_platform: +- osx-arm64 +thrift_cpp: +- 0.14.1 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy +zlib: +- '1.2' +zstd: +- '1.4' diff --git a/dev/tasks/conda-recipes/.ci_support/osx_arm64_python3.9.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/osx_arm64_python3.9.____cpython.yaml new file mode 100644 index 00000000000..4e6014c5db8 --- /dev/null +++ b/dev/tasks/conda-recipes/.ci_support/osx_arm64_python3.9.____cpython.yaml @@ -0,0 +1,65 @@ +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +aws_sdk_cpp: +- 1.8.151 +bzip2: +- '1' +c_compiler: +- clang +c_compiler_version: +- '11' +channel_sources: +- conda-forge/label/rust_dev,conda-forge +channel_targets: +- conda-forge main +cuda_compiler_version: +- None +cxx_compiler: +- clangxx +cxx_compiler_version: +- '11' +gflags: +- '2.2' +glog: +- 0.4.0 +grpc_cpp: +- '1.36' +libprotobuf: +- '3.15' +lz4_c: +- 1.9.3 +macos_machine: +- arm64-apple-darwin20.0.0 +numpy: +- '1.19' +orc: +- 1.6.7 +pin_run_as_build: + bzip2: + max_pin: x + lz4-c: + max_pin: x.x.x + python: + min_pin: x.x + max_pin: x.x + zlib: + max_pin: x.x +python: +- 3.9.* *_cpython +re2: +- 2021.04.01 +snappy: +- '1' +target_platform: +- osx-arm64 +thrift_cpp: +- 0.14.1 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy +zlib: +- '1.2' +zstd: +- '1.4' diff --git a/dev/tasks/conda-recipes/.ci_support/win_python3.6.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_versionNonenumpy1.17python3.6.____cpython.yaml similarity index 82% rename from dev/tasks/conda-recipes/.ci_support/win_python3.6.____cpython.yaml rename to dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_versionNonenumpy1.17python3.6.____cpython.yaml index 40199c679de..8fbbb64af9c 100644 --- a/dev/tasks/conda-recipes/.ci_support/win_python3.6.____cpython.yaml +++ b/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_versionNonenumpy1.17python3.6.____cpython.yaml @@ -1,7 +1,5 @@ aws_sdk_cpp: -- 1.8.63 -boost_cpp: -- 1.74.0 +- 1.8.151 bzip2: - '1' c_compiler: @@ -10,6 +8,8 @@ channel_sources: - conda-forge,defaults channel_targets: - conda-forge main +cuda_compiler: +- nvcc cuda_compiler_version: - None cxx_compiler: @@ -19,16 +19,14 @@ gflags: glog: - 0.4.0 grpc_cpp: -- '1.32' +- '1.36' libprotobuf: -- '3.13' +- '3.15' lz4_c: -- 1.9.2 +- 1.9.3 numpy: -- '1.16' +- '1.17' pin_run_as_build: - boost-cpp: - max_pin: x.x.x bzip2: max_pin: x lz4-c: @@ -41,11 +39,13 @@ pin_run_as_build: python: - 3.6.* *_cpython re2: -- 2020.10.01 +- 2021.04.01 snappy: - '1' target_platform: - win-64 +thrift_cpp: +- 0.14.1 zip_keys: - - numpy - python diff --git a/dev/tasks/conda-recipes/.ci_support/win_python3.7.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_versionNonenumpy1.17python3.7.____cpython.yaml similarity index 82% rename from dev/tasks/conda-recipes/.ci_support/win_python3.7.____cpython.yaml rename to dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_versionNonenumpy1.17python3.7.____cpython.yaml index 88d17108a98..4b702a38980 100644 --- a/dev/tasks/conda-recipes/.ci_support/win_python3.7.____cpython.yaml +++ b/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_versionNonenumpy1.17python3.7.____cpython.yaml @@ -1,7 +1,5 @@ aws_sdk_cpp: -- 1.8.63 -boost_cpp: -- 1.74.0 +- 1.8.151 bzip2: - '1' c_compiler: @@ -10,6 +8,8 @@ channel_sources: - conda-forge,defaults channel_targets: - conda-forge main +cuda_compiler: +- nvcc cuda_compiler_version: - None cxx_compiler: @@ -19,16 +19,14 @@ gflags: glog: - 0.4.0 grpc_cpp: -- '1.32' +- '1.36' libprotobuf: -- '3.13' +- '3.15' lz4_c: -- 1.9.2 +- 1.9.3 numpy: -- '1.16' +- '1.17' pin_run_as_build: - boost-cpp: - max_pin: x.x.x bzip2: max_pin: x lz4-c: @@ -41,11 +39,13 @@ pin_run_as_build: python: - 3.7.* *_cpython re2: -- 2020.10.01 +- 2021.04.01 snappy: - '1' target_platform: - win-64 +thrift_cpp: +- 0.14.1 zip_keys: - - numpy - python diff --git a/dev/tasks/conda-recipes/.ci_support/win_python3.8.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_versionNonenumpy1.17python3.8.____cpython.yaml similarity index 82% rename from dev/tasks/conda-recipes/.ci_support/win_python3.8.____cpython.yaml rename to dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_versionNonenumpy1.17python3.8.____cpython.yaml index e18785de135..6ae6c2fde4f 100644 --- a/dev/tasks/conda-recipes/.ci_support/win_python3.8.____cpython.yaml +++ b/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_versionNonenumpy1.17python3.8.____cpython.yaml @@ -1,7 +1,5 @@ aws_sdk_cpp: -- 1.8.63 -boost_cpp: -- 1.74.0 +- 1.8.151 bzip2: - '1' c_compiler: @@ -10,6 +8,8 @@ channel_sources: - conda-forge,defaults channel_targets: - conda-forge main +cuda_compiler: +- nvcc cuda_compiler_version: - None cxx_compiler: @@ -19,16 +19,14 @@ gflags: glog: - 0.4.0 grpc_cpp: -- '1.32' +- '1.36' libprotobuf: -- '3.13' +- '3.15' lz4_c: -- 1.9.2 +- 1.9.3 numpy: -- '1.16' +- '1.17' pin_run_as_build: - boost-cpp: - max_pin: x.x.x bzip2: max_pin: x lz4-c: @@ -41,11 +39,13 @@ pin_run_as_build: python: - 3.8.* *_cpython re2: -- 2020.10.01 +- 2021.04.01 snappy: - '1' target_platform: - win-64 +thrift_cpp: +- 0.14.1 zip_keys: - - numpy - python diff --git a/dev/tasks/conda-recipes/.ci_support/win_python3.9.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_versionNonenumpy1.19python3.9.____cpython.yaml similarity index 83% rename from dev/tasks/conda-recipes/.ci_support/win_python3.9.____cpython.yaml rename to dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_versionNonenumpy1.19python3.9.____cpython.yaml index 6177f96ce01..73a8b5099bb 100644 --- a/dev/tasks/conda-recipes/.ci_support/win_python3.9.____cpython.yaml +++ b/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_versionNonenumpy1.19python3.9.____cpython.yaml @@ -1,7 +1,5 @@ aws_sdk_cpp: -- 1.8.63 -boost_cpp: -- 1.74.0 +- 1.8.151 bzip2: - '1' c_compiler: @@ -10,6 +8,8 @@ channel_sources: - conda-forge,defaults channel_targets: - conda-forge main +cuda_compiler: +- nvcc cuda_compiler_version: - None cxx_compiler: @@ -19,16 +19,14 @@ gflags: glog: - 0.4.0 grpc_cpp: -- '1.32' +- '1.36' libprotobuf: -- '3.13' +- '3.15' lz4_c: -- 1.9.2 +- 1.9.3 numpy: - '1.19' pin_run_as_build: - boost-cpp: - max_pin: x.x.x bzip2: max_pin: x lz4-c: @@ -41,11 +39,13 @@ pin_run_as_build: python: - 3.9.* *_cpython re2: -- 2020.10.01 +- 2021.04.01 snappy: - '1' target_platform: - win-64 +thrift_cpp: +- 0.14.1 zip_keys: - - numpy - python diff --git a/dev/tasks/conda-recipes/.scripts/logging_utils.sh b/dev/tasks/conda-recipes/.scripts/logging_utils.sh new file mode 100644 index 00000000000..a53ef3f2c7a --- /dev/null +++ b/dev/tasks/conda-recipes/.scripts/logging_utils.sh @@ -0,0 +1,30 @@ +#!/bin/bash + +# Provide a unified interface for the different logging +# utilities CI providers offer. If unavailable, provide +# a compatible fallback (e.g. bare `echo xxxxxx`). + +function startgroup { + # Start a foldable group of log lines + # Pass a single argument, quoted + case ${CI:-} in + azure ) + echo "##[group]$1";; + travis ) + echo "$1" + echo -en 'travis_fold:start:'"${1// /}"'\\r';; + * ) + echo "$1";; + esac +} + +function endgroup { + # End a foldable group of log lines + # Pass a single argument, quoted + case ${CI:-} in + azure ) + echo "##[endgroup]";; + travis ) + echo -en 'travis_fold:end:'"${1// /}"'\\r';; + esac +} diff --git a/dev/tasks/conda-recipes/arrow-cpp/bld-arrow.bat b/dev/tasks/conda-recipes/arrow-cpp/bld-arrow.bat index cc2ed71fe3e..2cc6ed1ba3e 100644 --- a/dev/tasks/conda-recipes/arrow-cpp/bld-arrow.bat +++ b/dev/tasks/conda-recipes/arrow-cpp/bld-arrow.bat @@ -1,6 +1,19 @@ +@echo on + mkdir "%SRC_DIR%"\cpp\build pushd "%SRC_DIR%"\cpp\build +:: Enable CUDA support +if "%cuda_compiler_version%"=="None" ( + set "EXTRA_CMAKE_ARGS=-DARROW_CUDA=OFF" +) else ( + REM this should move to nvcc-feedstock + set "CUDA_PATH=%CUDA_PATH:\=/%" + set "CUDA_HOME=%CUDA_HOME:\=/%" + + set "EXTRA_CMAKE_ARGS=-DARROW_CUDA=ON" +) + cmake -G "Ninja" ^ -DBUILD_SHARED_LIBS=ON ^ -DCMAKE_INSTALL_PREFIX="%LIBRARY_PREFIX%" ^ @@ -31,6 +44,7 @@ cmake -G "Ninja" ^ -DARROW_S3:BOOL=ON ^ -DBoost_NO_BOOST_CMAKE=ON ^ -DCMAKE_UNITY_BUILD=ON ^ + %EXTRA_CMAKE_ARGS% ^ .. if errorlevel 1 exit 1 diff --git a/dev/tasks/conda-recipes/arrow-cpp/bld-pyarrow.bat b/dev/tasks/conda-recipes/arrow-cpp/bld-pyarrow.bat index 8f3357748df..89cec3710c3 100644 --- a/dev/tasks/conda-recipes/arrow-cpp/bld-pyarrow.bat +++ b/dev/tasks/conda-recipes/arrow-cpp/bld-pyarrow.bat @@ -2,18 +2,17 @@ pushd "%SRC_DIR%"\python @rem the symlinks for cmake modules don't work here +@rem NOTE: In contrast to conda-forge, they work here as we clone from git. @rem del cmake_modules\BuildUtils.cmake @rem del cmake_modules\SetupCxxFlags.cmake +@rem del cmake_modules\CompilerInfo.cmake @rem del cmake_modules\FindNumPy.cmake @rem del cmake_modules\FindPythonLibsNew.cmake @rem copy /Y "%SRC_DIR%\cpp\cmake_modules\BuildUtils.cmake" cmake_modules\ -@rem if errorlevel 1 exit 1 @rem copy /Y "%SRC_DIR%\cpp\cmake_modules\SetupCxxFlags.cmake" cmake_modules\ -@rem if errorlevel 1 exit 1 +@rem copy /Y "%SRC_DIR%\cpp\cmake_modules\CompilerInfo.cmake" cmake_modules\ @rem copy /Y "%SRC_DIR%\cpp\cmake_modules\FindNumPy.cmake" cmake_modules\ -@rem if errorlevel 1 exit 1 @rem copy /Y "%SRC_DIR%\cpp\cmake_modules\FindPythonLibsNew.cmake" cmake_modules\ -@rem if errorlevel 1 exit 1 SET ARROW_HOME=%LIBRARY_PREFIX% SET SETUPTOOLS_SCM_PRETEND_VERSION=%PKG_VERSION% @@ -26,6 +25,13 @@ SET PYARROW_WITH_GANDIVA=1 SET PYARROW_WITH_PARQUET=1 SET PYARROW_CMAKE_GENERATOR=Ninja +:: Enable CUDA support +if "%cuda_compiler_version%"=="None" ( + set "PYARROW_WITH_CUDA=0" +) else ( + set "PYARROW_WITH_CUDA=1" +) + %PYTHON% setup.py ^ build_ext ^ install --single-version-externally-managed ^ diff --git a/dev/tasks/conda-recipes/arrow-cpp/build-arrow.sh b/dev/tasks/conda-recipes/arrow-cpp/build-arrow.sh old mode 100755 new mode 100644 index e15fc92808c..f9c1d975ec3 --- a/dev/tasks/conda-recipes/arrow-cpp/build-arrow.sh +++ b/dev/tasks/conda-recipes/arrow-cpp/build-arrow.sh @@ -34,17 +34,26 @@ else EXTRA_CMAKE_ARGS=" ${EXTRA_CMAKE_ARGS} -DARROW_CUDA=OFF" fi +if [[ "${target_platform}" == "osx-arm64" ]]; then + # We need llvm 11+ support in Arrow for this + EXTRA_CMAKE_ARGS=" ${EXTRA_CMAKE_ARGS} -DARROW_GANDIVA=OFF" + sed -ie "s;protoc-gen-grpc.*$;protoc-gen-grpc=${BUILD_PREFIX}/bin/grpc_cpp_plugin\";g" ../src/arrow/flight/CMakeLists.txt + sed -ie 's;"--with-jemalloc-prefix\=je_arrow_";"--with-jemalloc-prefix\=je_arrow_" "--with-lg-page\=14";g' ../cmake_modules/ThirdpartyToolchain.cmake +else + EXTRA_CMAKE_ARGS=" ${EXTRA_CMAKE_ARGS} -DARROW_GANDIVA=ON" +fi + cmake \ - -DBUILD_SHARED_LIBS=ON \ -DARROW_BOOST_USE_SHARED=ON \ -DARROW_BUILD_BENCHMARKS=OFF \ -DARROW_BUILD_STATIC=OFF \ -DARROW_BUILD_TESTS=OFF \ -DARROW_BUILD_UTILITIES=OFF \ + -DBUILD_SHARED_LIBS=ON \ -DARROW_DATASET=ON \ -DARROW_DEPENDENCY_SOURCE=SYSTEM \ -DARROW_FLIGHT=ON \ - -DARROW_GANDIVA=ON \ + -DARROW_FLIGHT_REQUIRE_TLSCREDENTIALSOPTIONS=ON \ -DARROW_HDFS=ON \ -DARROW_JEMALLOC=ON \ -DARROW_MIMALLOC=ON \ @@ -55,34 +64,32 @@ cmake \ -DARROW_PYTHON=ON \ -DARROW_S3=ON \ -DARROW_SIMD_LEVEL=NONE \ + -DARROW_USE_LD_GOLD=ON \ -DARROW_WITH_BROTLI=ON \ -DARROW_WITH_BZ2=ON \ -DARROW_WITH_LZ4=ON \ -DARROW_WITH_SNAPPY=ON \ -DARROW_WITH_ZLIB=ON \ -DARROW_WITH_ZSTD=ON \ - -DARROW_USE_LD_GOLD=ON \ - -DCMAKE_AR=${AR} \ -DCMAKE_BUILD_TYPE=release \ -DCMAKE_INSTALL_LIBDIR=lib \ -DCMAKE_INSTALL_PREFIX=$PREFIX \ - -DCMAKE_RANLIB=${RANLIB} \ -DLLVM_TOOLS_BINARY_DIR=$PREFIX/bin \ - -DCMAKE_UNITY_BUILD=ON \ + -DPython3_EXECUTABLE=${PYTHON} \ + -DProtobuf_PROTOC_EXECUTABLE=$BUILD_PREFIX/bin/protoc \ -GNinja \ ${EXTRA_CMAKE_ARGS} \ .. -# Decrease parallelism a bit as we will otherwise get out-of-memory problems -# This is only necessary on Travis -if [ "${TRAVIS}" = "true" ]; then -# if [ "$(uname -m)" = "ppc64le" ]; then - echo "Using $(grep -c ^processor /proc/cpuinfo) CPUs" - CPU_COUNT=$(grep -c ^processor /proc/cpuinfo) - CPU_COUNT=$((CPU_COUNT / 4)) - ninja install -j${CPU_COUNT} -else - ninja install +# Commented out until jemalloc and mimalloc are fixed upstream +if [[ "${target_platform}" == "osx-arm64" ]]; then + ninja jemalloc_ep-prefix/src/jemalloc_ep-stamp/jemalloc_ep-patch mimalloc_ep-prefix/src/mimalloc_ep-stamp/mimalloc_ep-patch + cp $BUILD_PREFIX/share/gnuconfig/config.* jemalloc_ep-prefix/src/jemalloc_ep/build-aux/ + sed -ie 's/list(APPEND mi_cflags -march=native)//g' mimalloc_ep-prefix/src/mimalloc_ep/CMakeLists.txt + # Use the correct register for thread-local storage + sed -ie 's/tpidr_el0/tpidrro_el0/g' mimalloc_ep-prefix/src/mimalloc_ep/include/mimalloc-internal.h fi +ninja install + popd diff --git a/dev/tasks/conda-recipes/arrow-cpp/build-pyarrow.sh b/dev/tasks/conda-recipes/arrow-cpp/build-pyarrow.sh old mode 100755 new mode 100644 index d0fb55de580..a394e999f7b --- a/dev/tasks/conda-recipes/arrow-cpp/build-pyarrow.sh +++ b/dev/tasks/conda-recipes/arrow-cpp/build-pyarrow.sh @@ -9,10 +9,14 @@ export PARQUET_HOME=$PREFIX export SETUPTOOLS_SCM_PRETEND_VERSION=$PKG_VERSION export PYARROW_BUILD_TYPE=release export PYARROW_BUNDLE_ARROW_CPP_HEADERS=0 -export PYARROW_BUNDLE_PLASMA_EXECUTABLE=0 export PYARROW_WITH_DATASET=1 export PYARROW_WITH_FLIGHT=1 -export PYARROW_WITH_GANDIVA=1 +if [[ "${target_platform}" == "osx-arm64" ]]; then + # We need llvm 11+ support in Arrow for this + export PYARROW_WITH_GANDIVA=0 +else + export PYARROW_WITH_GANDIVA=1 +fi export PYARROW_WITH_HDFS=1 export PYARROW_WITH_ORC=1 export PYARROW_WITH_PARQUET=1 @@ -22,16 +26,14 @@ export PYARROW_CMAKE_GENERATOR=Ninja BUILD_EXT_FLAGS="" # Enable CUDA support -if [[ ! -z "${cuda_compiler_version+x}" && "${cuda_compiler_version}" != "None" ]] -then +if [[ ! -z "${cuda_compiler_version+x}" && "${cuda_compiler_version}" != "None" ]]; then export PYARROW_WITH_CUDA=1 else export PYARROW_WITH_CUDA=0 fi # Resolve: Make Error at cmake_modules/SetupCxxFlags.cmake:338 (message): Unsupported arch flag: -march=. -if [[ "$(uname -m)" = "aarch64" ]] -then +if [[ "${target_platform}" == "linux-aarch64" ]]; then export PYARROW_CMAKE_OPTIONS="-DARROW_ARMV8_ARCH=armv8-a" fi diff --git a/dev/tasks/conda-recipes/arrow-cpp/meta.yaml b/dev/tasks/conda-recipes/arrow-cpp/meta.yaml index cdbfc5d5b4d..48a8629866d 100644 --- a/dev/tasks/conda-recipes/arrow-cpp/meta.yaml +++ b/dev/tasks/conda-recipes/arrow-cpp/meta.yaml @@ -1,9 +1,9 @@ +# NOTE: In constrast to the conda-forge recipe, ARROW_VERSION is a templated variable here. {% set version = ARROW_VERSION %} -{% set number = "0" %} -{% set cuda_enabled = cuda_compiler_version is not undefined and cuda_compiler_version == '9.2' %} -{% set build_ext_version = "1.0.1" %} +{% set cuda_enabled = cuda_compiler_version != "None" %} +{% set build_ext_version = ARROW_VERSION %} {% set build_ext = "cuda" if cuda_enabled else "cpu" %} -{% set proc_build_number = "1" %} +{% set proc_build_number = "0" %} package: name: arrow-cpp-ext @@ -14,7 +14,10 @@ source: build: number: 0 - skip: true # [cuda_compiler_version not in (undefined, "None", "9.2")] + # for cuda on win/linux, building with 9.2 is enough to be compatible with all later versions, + # since arrow is only using libcuda, and not libcudart. + skip: true # [(win or linux) and cuda_compiler_version not in ("None", "10.2")] + skip: true # [osx and cuda_compiler_version != "None"] run_exports: - {{ pin_subpackage("arrow-cpp", max_pin="x.x.x") }} @@ -40,27 +43,31 @@ outputs: version: {{ version }} build: string: py{{ CONDA_PY }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }}_{{ build_ext }} - skip: true # [cuda_compiler_version not in (undefined, "None", "9.2")] run_exports: - {{ pin_subpackage("arrow-cpp", max_pin="x.x.x") }} ignore_run_exports: - cudatoolkit - # Gandiva only needs headers - - boost-cpp track_features: {{ "- arrow-cuda" if cuda_enabled else "" }} requirements: build: - - cmake 3.16.* + - python # [build_platform != target_platform] + - cross-python_{{ target_platform }} # [build_platform != target_platform] + - cython # [build_platform != target_platform] + - numpy # [build_platform != target_platform] + - gnuconfig # [osx and arm64] + - libprotobuf + - grpc-cpp + - cmake - autoconf # [unix] - ninja - make # [unix] - {{ compiler('c') }} - {{ compiler('cxx') }} - - {{ compiler("cuda") }} # [cuda_compiler_version not in (undefined, "None")] + - {{ compiler("cuda") }} # [cuda_compiler_version != "None"] host: - aws-sdk-cpp - - boost-cpp + - boost-cpp >=1.70 - brotli - bzip2 - c-ares @@ -68,8 +75,8 @@ outputs: - glog - grpc-cpp - libprotobuf - - clangdev 11 - - llvmdev 11 + - clangdev 10 # [not (osx and arm64)] + - llvmdev 10 # [not (osx and arm64)] - libutf8proc - lz4-c - numpy @@ -78,25 +85,15 @@ outputs: - rapidjson - re2 - snappy - - thrift-cpp >=0.11 + - thrift-cpp - zlib - zstd run: - {{ pin_compatible('numpy', lower_bound='1.16') }} - - aws-sdk-cpp - - brotli - - c-ares - - gflags - - glog - - grpc-cpp - - lz4-c - python - - re2 - - zlib - - zstd run_constrained: - arrow-cpp-proc * {{ build_ext }} - - cudatoolkit >=9.2 # [cuda_compiler_version not in (undefined, "None")] + - cudatoolkit >=9.2 # [cuda_compiler_version != "None"] about: home: http://github.com/apache/arrow @@ -111,7 +108,7 @@ outputs: - test -f $PREFIX/include/arrow/api.h # [unix] - test -f $PREFIX/include/arrow/flight/types.h # [unix] - test -f $PREFIX/include/plasma/client.h # [unix] - - test -f $PREFIX/include/gandiva/engine.h # [unix and not (aarch64 or ppc64le)] + - test -f $PREFIX/include/gandiva/engine.h # [unix and not (osx and arm64)] - test -f $PREFIX/include/parquet/api/reader.h # [unix] - if not exist %LIBRARY_INC%\\arrow\\api.h exit 1 # [win] - if not exist %LIBRARY_INC%\\gandiva\\engine.h exit 1 # [win] @@ -123,15 +120,16 @@ outputs: - test -f $PREFIX/lib/libarrow_flight.so # [linux] - test -f $PREFIX/lib/libarrow_python.so # [linux] - test -f $PREFIX/lib/libparquet.so # [linux] - - test -f $PREFIX/lib/libgandiva.so # [linux and not (aarch64 or ppc64le)] + - test -f $PREFIX/lib/libgandiva.so # [linux] - test -f $PREFIX/lib/libplasma.so # [linux] - {{ "- test %s -f $PREFIX/lib/libarrow_cuda.so" % (['!', ''][cuda_enabled]) }} # [linux] - {{ "- test %s -f $PREFIX/lib/libarrow_cuda.dylib" % (['!', ''][cuda_enabled]) }} # [osx] - {{ "- if %s exist %%PREFIX%%\\Library\\bin\\arrow_cuda.dll exit 1" % (['', 'not'][cuda_enabled]) }} # [win] + - test -f $PREFIX/lib/libarrow_cuda${SHLIB_EXT} # [(cuda_compiler_version != "None") and unix] + - test ! -f $PREFIX/lib/libarrow_cuda${SHLIB_EXT} # [(cuda_compiler_version == "None") and unix] + - if not exist %PREFIX%\\Library\\bin\\arrow_cuda.dll exit 1 # [(cuda_compiler_version != "None") and win] + - if exist %PREFIX%\\Library\\bin\\arrow_cuda.dll exit 1 # [(cuda_compiler_version == "None") and win] - test -f $PREFIX/lib/libarrow.dylib # [osx] - test -f $PREFIX/lib/libarrow_dataset.dylib # [osx] - test -f $PREFIX/lib/libarrow_python.dylib # [osx] - - test -f $PREFIX/lib/libgandiva.dylib # [osx] + - test -f $PREFIX/lib/libgandiva.dylib # [osx and not arm64] - test -f $PREFIX/lib/libparquet.dylib # [osx] - test -f $PREFIX/lib/libplasma.dylib # [osx] - if not exist %PREFIX%\\Library\\bin\\arrow.dll exit 1 # [win] @@ -162,20 +160,23 @@ outputs: version: {{ version }} build: string: py{{ CONDA_PY }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }}_{{ build_ext }} - skip: true # [cuda_compiler_version not in (undefined, "None", "9.2")] ignore_run_exports: - cudatoolkit track_features: {{ "- arrow-cuda" if cuda_enabled else "" }} requirements: build: - - cmake 3.16.* + - python # [build_platform != target_platform] + - cross-python_{{ target_platform }} # [build_platform != target_platform] + - cython # [build_platform != target_platform] + - numpy # [build_platform != target_platform] + - cmake - ninja - make # [unix] - {{ compiler('c') }} - {{ compiler('cxx') }} # pyarrow does not require nvcc but it needs to link against libraries in arrow-cpp=*=*cuda - - {{ compiler("cuda") }} # [cuda_compiler_version not in (undefined, "None")] + - {{ compiler("cuda") }} # [cuda_compiler_version != "None"] host: - {{ pin_subpackage('arrow-cpp', exact=True) }} - cython @@ -192,7 +193,7 @@ outputs: - python run_constrained: - arrow-cpp-proc * {{ build_ext }} - - cudatoolkit >=9.2 # [cuda_compiler_version not in (undefined, "None")] + - cudatoolkit >=9.2 # [cuda_compiler_version != "None"] about: home: http://github.com/apache/arrow @@ -206,7 +207,7 @@ outputs: - pyarrow - pyarrow.dataset - pyarrow.flight - - pyarrow.gandiva + - pyarrow.gandiva # [not (osx and arm64)] - pyarrow.orc # [unix] - pyarrow.parquet - pyarrow.plasma # [unix] @@ -215,31 +216,39 @@ outputs: - pyarrow._hdfs # We can only test importing cuda package but cannot run when a # CUDA device is not available, for instance, when building from CI. - - pyarrow.cuda # [cuda_compiler_version not in (undefined, "None")] + # On Windows, we cannot even do that due to `nvcuda.dll` not being found, see + # https://conda-forge.org/docs/maintainer/knowledge_base.html#nvcuda-dll-cannot-be-found-on-windows + # However, we check below for (at least) the presence of a correctly-compiled module + - pyarrow.cuda # [cuda_compiler_version != "None" and not win] commands: - - test ! -f ${SP_DIR}/pyarrow/plasma-store-server # [unix] - - test ! -f ${SP_DIR}/pyarrow/tests/test_array.py # [unix] - - if exist %SP_DIR%/pyarrow/tests/test_array.py exit 1 # [win] + - test ! -f ${SP_DIR}/pyarrow/tests/test_array.py # [unix] + - if exist %SP_DIR%/pyarrow/tests/test_array.py exit 1 # [win] + # Need to remove dot from PY_VER; %MYVAR:x=y% replaces "x" in %MYVAR% with "y" + - if not exist %SP_DIR%/pyarrow/_cuda.cp%PY_VER:.=%-win_amd64.pyd exit 1 # [win and cuda_compiler_version != "None"] + - name: pyarrow-tests script: build-pyarrow.sh # [not win] script: bld-pyarrow.bat # [win] version: {{ version }} build: string: py{{ CONDA_PY }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }}_{{ build_ext }} - skip: true # [cuda_compiler_version not in (undefined, "None", "9.2")] ignore_run_exports: - cudatoolkit track_features: {{ "- arrow-cuda" if cuda_enabled else "" }} requirements: build: - - cmake 3.16.* + - python # [build_platform != target_platform] + - cross-python_{{ target_platform }} # [build_platform != target_platform] + - cython # [build_platform != target_platform] + - numpy # [build_platform != target_platform] + - cmake - ninja - make # [unix] - {{ compiler('c') }} - {{ compiler('cxx') }} # pyarrow does not require nvcc but it needs to link against libraries in arrow-cpp=*=*cuda - - {{ compiler("cuda") }} # [cuda_compiler_version not in (undefined, "None")] + - {{ compiler("cuda") }} # [cuda_compiler_version != "None"] host: - {{ pin_subpackage('arrow-cpp', exact=True) }} - {{ pin_subpackage('pyarrow', exact=True) }} @@ -254,7 +263,7 @@ outputs: - python run_constrained: - arrow-cpp-proc * {{ build_ext }} - - cudatoolkit >=9.2 # [cuda_compiler_version not in (undefined, "None")] + - cudatoolkit >=9.2 # [cuda_compiler_version != "None"] about: home: http://github.com/apache/arrow diff --git a/dev/tasks/conda-recipes/azure.osx.yml b/dev/tasks/conda-recipes/azure.osx.yml index 58afa8045cb..dbb1a68aca6 100755 --- a/dev/tasks/conda-recipes/azure.osx.yml +++ b/dev/tasks/conda-recipes/azure.osx.yml @@ -58,9 +58,14 @@ jobs: - script: | source activate base - conda build arrow-cpp parquet-cpp \ + set +x + if [[ "${CONFIG}" == osx_arm* ]]; then + EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" + fi + conda build arrow-cpp \ -m ./.ci_support/${CONFIG}.yaml \ --clobber-file ./.ci_support/clobber_${CONFIG}.yaml \ + ${EXTRA_CB_OPTIONS:-} \ --output-folder ./build_artifacts if [ ! -z "${R_CONFIG}" ]; then @@ -71,5 +76,5 @@ jobs: workingDirectory: arrow/dev/tasks/conda-recipes displayName: Build recipes - {{ macros.azure_upload_releases("arrow/dev/tasks/conda-recipes/build_artifacts/osx-64/*.tar.bz2") }} - {{ macros.azure_upload_anaconda("arrow/dev/tasks/conda-recipes/build_artifacts/osx-64/*.tar.bz2") }} + {{ macros.azure_upload_releases("arrow/dev/tasks/conda-recipes/build_artifacts/osx-*/*.tar.bz2") }} + {{ macros.azure_upload_anaconda("arrow/dev/tasks/conda-recipes/build_artifacts/osx-*/*.tar.bz2") }} diff --git a/dev/tasks/conda-recipes/build_steps.sh b/dev/tasks/conda-recipes/build_steps.sh index 8f1743f5946..25864c08a70 100755 --- a/dev/tasks/conda-recipes/build_steps.sh +++ b/dev/tasks/conda-recipes/build_steps.sh @@ -1,5 +1,9 @@ #!/usr/bin/env bash +# NOTE: This script has been slightly adopted to suite the Apache Arrow / crossbow CI +# setup. The next time this is updated to the current version on conda-forge, +# you will also make this additions afterwards. + # PLEASE NOTE: This script has been automatically generated by conda-smithy. Any changes here # will be lost next time ``conda smithy rerender`` is run. If you would like to make permanent # changes to this script, consider a proposal to conda-smithy so that other feedstocks can also diff --git a/dev/tasks/conda-recipes/run_docker_build.sh b/dev/tasks/conda-recipes/run_docker_build.sh index 8a900379487..7645c43e2fa 100755 --- a/dev/tasks/conda-recipes/run_docker_build.sh +++ b/dev/tasks/conda-recipes/run_docker_build.sh @@ -1,5 +1,9 @@ #!/usr/bin/env bash +# NOTE: This script has been slightly adopted to suite the Apache Arrow / crossbow CI +# setup. The next time this is updated to the current version on conda-forge, +# you will also make this additions afterwards. + # PLEASE NOTE: This script has been automatically generated by conda-smithy. Any changes here # will be lost next time ``conda smithy rerender`` is run. If you would like to make permanent # changes to this script, consider a proposal to conda-smithy so that other feedstocks can also diff --git a/dev/tasks/tasks.yml b/dev/tasks/tasks.yml index 5a04c98f640..561794146ab 100644 --- a/dev/tasks/tasks.yml +++ b/dev/tasks/tasks.yml @@ -166,7 +166,7 @@ tasks: ci: azure template: conda-recipes/azure.linux.yml params: - config: linux_cuda_compiler_versionNonepython3.6.____cpython + config: linux_64_cuda_compiler_versionNonenumpy1.17python3.6.____cpython r_config: linux_64_r_base3.6 artifacts: - arrow-cpp-{no_rc_version}-py36(h[a-z0-9]+)_0_cpu.tar.bz2 @@ -176,7 +176,7 @@ tasks: ci: azure template: conda-recipes/azure.linux.yml params: - config: linux_cuda_compiler_versionNonepython3.7.____cpython + config: linux_64_cuda_compiler_versionNonenumpy1.17python3.7.____cpython r_config: linux_64_r_base4.0 artifacts: - arrow-cpp-{no_rc_version}-py37(h[a-z0-9]+)_0_cpu.tar.bz2 @@ -186,7 +186,7 @@ tasks: ci: azure template: conda-recipes/azure.linux.yml params: - config: linux_cuda_compiler_versionNonepython3.8.____cpython + config: linux_64_cuda_compiler_versionNonenumpy1.17python3.8.____cpython artifacts: - arrow-cpp-{no_rc_version}-py38(h[a-z0-9]+)_0_cpu.tar.bz2 - pyarrow-{no_rc_version}-py38(h[a-z0-9]+)_0_cpu.tar.bz2 @@ -195,7 +195,7 @@ tasks: ci: azure template: conda-recipes/azure.linux.yml params: - config: linux_cuda_compiler_versionNonepython3.9.____cpython + config: linux_64_cuda_compiler_versionNonenumpy1.19python3.9.____cpython artifacts: - arrow-cpp-{no_rc_version}-py39(h[a-z0-9]+)_0_cpu.tar.bz2 - pyarrow-{no_rc_version}-py39(h[a-z0-9]+)_0_cpu.tar.bz2 @@ -204,7 +204,7 @@ tasks: ci: azure template: conda-recipes/azure.linux.yml params: - config: linux_cuda_compiler_version9.2python3.6.____cpython + config: linux_64_cuda_compiler_version10.2numpy1.17python3.6.____cpython artifacts: - arrow-cpp-{no_rc_version}-py36(h[a-z0-9]+)_0_cuda.tar.bz2 - pyarrow-{no_rc_version}-py36(h[a-z0-9]+)_0_cuda.tar.bz2 @@ -213,7 +213,7 @@ tasks: ci: azure template: conda-recipes/azure.linux.yml params: - config: linux_cuda_compiler_version9.2python3.7.____cpython + config: linux_64_cuda_compiler_version10.2numpy1.17python3.7.____cpython artifacts: - arrow-cpp-{no_rc_version}-py37(h[a-z0-9]+)_0_cuda.tar.bz2 - pyarrow-{no_rc_version}-py37(h[a-z0-9]+)_0_cuda.tar.bz2 @@ -222,7 +222,7 @@ tasks: ci: azure template: conda-recipes/azure.linux.yml params: - config: linux_cuda_compiler_version9.2python3.8.____cpython + config: linux_64_cuda_compiler_version10.2numpy1.17python3.8.____cpython artifacts: - arrow-cpp-{no_rc_version}-py38(h[a-z0-9]+)_0_cuda.tar.bz2 - pyarrow-{no_rc_version}-py38(h[a-z0-9]+)_0_cuda.tar.bz2 @@ -231,7 +231,7 @@ tasks: ci: azure template: conda-recipes/azure.linux.yml params: - config: linux_cuda_compiler_version9.2python3.9.____cpython + config: linux_64_cuda_compiler_version10.2numpy1.19python3.9.____cpython artifacts: - arrow-cpp-{no_rc_version}-py39(h[a-z0-9]+)_0_cuda.tar.bz2 - pyarrow-{no_rc_version}-py39(h[a-z0-9]+)_0_cuda.tar.bz2 @@ -278,7 +278,7 @@ tasks: ci: azure template: conda-recipes/azure.osx.yml params: - config: osx_python3.6.____cpython + config: osx_64_numpy1.17python3.6.____cpython r_config: osx_64_r_base3.6 artifacts: - arrow-cpp-{no_rc_version}-py36(h[a-z0-9]+)_0_cpu.tar.bz2 @@ -288,7 +288,7 @@ tasks: ci: azure template: conda-recipes/azure.osx.yml params: - config: osx_python3.7.____cpython + config: osx_64_numpy1.17python3.7.____cpython r_config: osx_64_r_base4.0 artifacts: - arrow-cpp-{no_rc_version}-py37(h[a-z0-9]+)_0_cpu.tar.bz2 @@ -298,7 +298,7 @@ tasks: ci: azure template: conda-recipes/azure.osx.yml params: - config: osx_python3.8.____cpython + config: osx_64_numpy1.17python3.8.____cpython artifacts: - arrow-cpp-{no_rc_version}-py38(h[a-z0-9]+)_0_cpu.tar.bz2 - pyarrow-{no_rc_version}-py38(h[a-z0-9]+)_0_cpu.tar.bz2 @@ -307,7 +307,25 @@ tasks: ci: azure template: conda-recipes/azure.osx.yml params: - config: osx_python3.9.____cpython + config: osx_64_numpy1.19python3.9.____cpython + artifacts: + - arrow-cpp-{no_rc_version}-py39(h[a-z0-9]+)_0_cpu.tar.bz2 + - pyarrow-{no_rc_version}-py39(h[a-z0-9]+)_0_cpu.tar.bz2 + + conda-osx-arm64-clang-py38: + ci: azure + template: conda-recipes/azure.osx.yml + params: + config: osx_arm64_python3.8.____cpython + artifacts: + - arrow-cpp-{no_rc_version}-py38(h[a-z0-9]+)_0_cpu.tar.bz2 + - pyarrow-{no_rc_version}-py38(h[a-z0-9]+)_0_cpu.tar.bz2 + + conda-osx-arm64-clang-py39: + ci: azure + template: conda-recipes/azure.osx.yml + params: + config: osx_arm64_python3.9.____cpython artifacts: - arrow-cpp-{no_rc_version}-py39(h[a-z0-9]+)_0_cpu.tar.bz2 - pyarrow-{no_rc_version}-py39(h[a-z0-9]+)_0_cpu.tar.bz2 @@ -318,7 +336,7 @@ tasks: ci: azure template: conda-recipes/azure.win.yml params: - config: win_python3.6.____cpython + config: win_64_cuda_compiler_versionNonenumpy1.17python3.6.____cpython r_config: win_64_r_base3.6 artifacts: - arrow-cpp-{no_rc_version}-py36(h[a-z0-9]+)_0_cpu.tar.bz2 @@ -328,7 +346,7 @@ tasks: ci: azure template: conda-recipes/azure.win.yml params: - config: win_python3.7.____cpython + config: win_64_cuda_compiler_versionNonenumpy1.17python3.7.____cpython r_config: win_64_r_base4.0 artifacts: - arrow-cpp-{no_rc_version}-py37(h[a-z0-9]+)_0_cpu.tar.bz2 @@ -338,7 +356,16 @@ tasks: ci: azure template: conda-recipes/azure.win.yml params: - config: win_python3.8.____cpython + config: win_64_cuda_compiler_versionNonenumpy1.17python3.8.____cpython + artifacts: + - arrow-cpp-{no_rc_version}-py38(h[a-z0-9]+)_0_cpu.tar.bz2 + - pyarrow-{no_rc_version}-py38(h[a-z0-9]+)_0_cpu.tar.bz2 + + conda-win-vs2017-py39: + ci: azure + template: conda-recipes/azure.win.yml + params: + config: win_64_cuda_compiler_versionNonenumpy1.19python3.9.____cpython artifacts: - arrow-cpp-{no_rc_version}-py38(h[a-z0-9]+)_0_cpu.tar.bz2 - pyarrow-{no_rc_version}-py38(h[a-z0-9]+)_0_cpu.tar.bz2