From e9e66054de3fa3a7b6468740ce678951c68de239 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Mon, 24 Jul 2023 18:40:44 +0200 Subject: [PATCH] sync .ci_support files --- ...> linux_64_cuda_compiler_version11.2.yaml} | 26 +++++++++---------- .../linux_64_cuda_compiler_versionNone.yaml | 16 ++++++------ ...nux_aarch64_cuda_compiler_version11.2.yaml | 14 +++++----- ...nux_aarch64_cuda_compiler_versionNone.yaml | 14 +++++----- ...nux_ppc64le_cuda_compiler_version11.2.yaml | 14 +++++----- ...nux_ppc64le_cuda_compiler_versionNone.yaml | 14 +++++----- .../conda-recipes/.ci_support/osx_64_.yaml | 14 +++++----- .../conda-recipes/.ci_support/osx_arm64_.yaml | 14 +++++----- ... => win_64_cuda_compiler_version11.2.yaml} | 16 +++++++----- .../win_64_cuda_compiler_versionNone.yaml | 14 +++++----- dev/tasks/tasks.yml | 4 +-- 11 files changed, 82 insertions(+), 78 deletions(-) rename dev/tasks/conda-recipes/.ci_support/{linux_64_cuda_compiler_version10.2.yaml => linux_64_cuda_compiler_version11.2.yaml} (85%) rename dev/tasks/conda-recipes/.ci_support/{win_64_cuda_compiler_version10.2.yaml => win_64_cuda_compiler_version11.2.yaml} (89%) diff --git a/dev/tasks/conda-recipes/.ci_support/linux_64_cuda_compiler_version10.2.yaml b/dev/tasks/conda-recipes/.ci_support/linux_64_cuda_compiler_version11.2.yaml similarity index 85% rename from dev/tasks/conda-recipes/.ci_support/linux_64_cuda_compiler_version10.2.yaml rename to dev/tasks/conda-recipes/.ci_support/linux_64_cuda_compiler_version11.2.yaml index e135017bbaa61..1cdcec199e7ba 100644 --- a/dev/tasks/conda-recipes/.ci_support/linux_64_cuda_compiler_version10.2.yaml +++ b/dev/tasks/conda-recipes/.ci_support/linux_64_cuda_compiler_version11.2.yaml @@ -1,17 +1,15 @@ aws_crt_cpp: -- 0.20.1 +- 0.20.3 aws_sdk_cpp: - 1.10.57 bzip2: - '1' -c_ares: -- '1' c_compiler: - gcc c_compiler_version: -- '7' +- '10' cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: @@ -19,29 +17,29 @@ channel_targets: cuda_compiler: - nvcc cuda_compiler_version: -- '10.2' +- '11.2' cuda_compiler_version_min: -- '10.2' +- '11.2' cxx_compiler: - gxx cxx_compiler_version: -- '7' +- '10' docker_image: -- quay.io/condaforge/linux-anvil-cos7-cuda:10.2 +- quay.io/condaforge/linux-anvil-cuda:11.2 gflags: - '2.2' glog: - '0.6' google_cloud_cpp: -- 2.10.1 +- '2.12' libabseil: - '20230125' -libevent: -- 2.1.12 libgrpc: - '1.54' +- '1.56' libprotobuf: - '3.21' +- 4.23.3 lz4_c: - 1.9.3 numpy: @@ -52,7 +50,7 @@ numpy: openssl: - '3' orc: -- 1.8.3 +- 1.9.0 pin_run_as_build: python: min_pin: x.x @@ -79,6 +77,8 @@ zip_keys: - cuda_compiler_version - cdt_name - docker_image +- - libgrpc + - libprotobuf - - python - numpy zlib: diff --git a/dev/tasks/conda-recipes/.ci_support/linux_64_cuda_compiler_versionNone.yaml b/dev/tasks/conda-recipes/.ci_support/linux_64_cuda_compiler_versionNone.yaml index 08590f860a5c3..5be5b58a73932 100644 --- a/dev/tasks/conda-recipes/.ci_support/linux_64_cuda_compiler_versionNone.yaml +++ b/dev/tasks/conda-recipes/.ci_support/linux_64_cuda_compiler_versionNone.yaml @@ -1,11 +1,9 @@ aws_crt_cpp: -- 0.20.1 +- 0.20.3 aws_sdk_cpp: - 1.10.57 bzip2: - '1' -c_ares: -- '1' c_compiler: - gcc c_compiler_version: @@ -21,7 +19,7 @@ cuda_compiler: cuda_compiler_version: - None cuda_compiler_version_min: -- '10.2' +- '11.2' cxx_compiler: - gxx cxx_compiler_version: @@ -33,15 +31,15 @@ gflags: glog: - '0.6' google_cloud_cpp: -- 2.10.1 +- '2.12' libabseil: - '20230125' -libevent: -- 2.1.12 libgrpc: - '1.54' +- '1.56' libprotobuf: - '3.21' +- 4.23.3 lz4_c: - 1.9.3 numpy: @@ -52,7 +50,7 @@ numpy: openssl: - '3' orc: -- 1.8.3 +- 1.9.0 pin_run_as_build: python: min_pin: x.x @@ -79,6 +77,8 @@ zip_keys: - cuda_compiler_version - cdt_name - docker_image +- - libgrpc + - libprotobuf - - python - numpy zlib: diff --git a/dev/tasks/conda-recipes/.ci_support/linux_aarch64_cuda_compiler_version11.2.yaml b/dev/tasks/conda-recipes/.ci_support/linux_aarch64_cuda_compiler_version11.2.yaml index 3853add25f5f1..1677b03564c08 100644 --- a/dev/tasks/conda-recipes/.ci_support/linux_aarch64_cuda_compiler_version11.2.yaml +++ b/dev/tasks/conda-recipes/.ci_support/linux_aarch64_cuda_compiler_version11.2.yaml @@ -1,13 +1,11 @@ BUILD: - aarch64-conda_cos7-linux-gnu aws_crt_cpp: -- 0.20.1 +- 0.20.3 aws_sdk_cpp: - 1.10.57 bzip2: - '1' -c_ares: -- '1' c_compiler: - gcc c_compiler_version: @@ -37,15 +35,15 @@ gflags: glog: - '0.6' google_cloud_cpp: -- 2.10.1 +- '2.12' libabseil: - '20230125' -libevent: -- 2.1.12 libgrpc: - '1.54' +- '1.56' libprotobuf: - '3.21' +- 4.23.3 lz4_c: - 1.9.3 numpy: @@ -56,7 +54,7 @@ numpy: openssl: - '3' orc: -- 1.8.3 +- 1.9.0 pin_run_as_build: python: min_pin: x.x @@ -83,6 +81,8 @@ zip_keys: - cuda_compiler_version - cdt_name - docker_image +- - libgrpc + - libprotobuf - - python - numpy zlib: diff --git a/dev/tasks/conda-recipes/.ci_support/linux_aarch64_cuda_compiler_versionNone.yaml b/dev/tasks/conda-recipes/.ci_support/linux_aarch64_cuda_compiler_versionNone.yaml index ef792635029d0..88fdf1254e661 100644 --- a/dev/tasks/conda-recipes/.ci_support/linux_aarch64_cuda_compiler_versionNone.yaml +++ b/dev/tasks/conda-recipes/.ci_support/linux_aarch64_cuda_compiler_versionNone.yaml @@ -1,13 +1,11 @@ BUILD: - aarch64-conda_cos7-linux-gnu aws_crt_cpp: -- 0.20.1 +- 0.20.3 aws_sdk_cpp: - 1.10.57 bzip2: - '1' -c_ares: -- '1' c_compiler: - gcc c_compiler_version: @@ -37,15 +35,15 @@ gflags: glog: - '0.6' google_cloud_cpp: -- 2.10.1 +- '2.12' libabseil: - '20230125' -libevent: -- 2.1.12 libgrpc: - '1.54' +- '1.56' libprotobuf: - '3.21' +- 4.23.3 lz4_c: - 1.9.3 numpy: @@ -56,7 +54,7 @@ numpy: openssl: - '3' orc: -- 1.8.3 +- 1.9.0 pin_run_as_build: python: min_pin: x.x @@ -83,6 +81,8 @@ zip_keys: - cuda_compiler_version - cdt_name - docker_image +- - libgrpc + - libprotobuf - - python - numpy zlib: diff --git a/dev/tasks/conda-recipes/.ci_support/linux_ppc64le_cuda_compiler_version11.2.yaml b/dev/tasks/conda-recipes/.ci_support/linux_ppc64le_cuda_compiler_version11.2.yaml index eef7acde228f5..3585db7b99baa 100644 --- a/dev/tasks/conda-recipes/.ci_support/linux_ppc64le_cuda_compiler_version11.2.yaml +++ b/dev/tasks/conda-recipes/.ci_support/linux_ppc64le_cuda_compiler_version11.2.yaml @@ -1,11 +1,9 @@ aws_crt_cpp: -- 0.20.1 +- 0.20.3 aws_sdk_cpp: - 1.10.57 bzip2: - '1' -c_ares: -- '1' c_compiler: - gcc c_compiler_version: @@ -33,15 +31,15 @@ gflags: glog: - '0.6' google_cloud_cpp: -- 2.10.1 +- '2.12' libabseil: - '20230125' -libevent: -- 2.1.12 libgrpc: - '1.54' +- '1.56' libprotobuf: - '3.21' +- 4.23.3 lz4_c: - 1.9.3 numpy: @@ -52,7 +50,7 @@ numpy: openssl: - '3' orc: -- 1.8.3 +- 1.9.0 pin_run_as_build: python: min_pin: x.x @@ -79,6 +77,8 @@ zip_keys: - cuda_compiler_version - cdt_name - docker_image +- - libgrpc + - libprotobuf - - python - numpy zlib: diff --git a/dev/tasks/conda-recipes/.ci_support/linux_ppc64le_cuda_compiler_versionNone.yaml b/dev/tasks/conda-recipes/.ci_support/linux_ppc64le_cuda_compiler_versionNone.yaml index b9bdd01b358cf..c13a522254286 100644 --- a/dev/tasks/conda-recipes/.ci_support/linux_ppc64le_cuda_compiler_versionNone.yaml +++ b/dev/tasks/conda-recipes/.ci_support/linux_ppc64le_cuda_compiler_versionNone.yaml @@ -1,11 +1,9 @@ aws_crt_cpp: -- 0.20.1 +- 0.20.3 aws_sdk_cpp: - 1.10.57 bzip2: - '1' -c_ares: -- '1' c_compiler: - gcc c_compiler_version: @@ -33,15 +31,15 @@ gflags: glog: - '0.6' google_cloud_cpp: -- 2.10.1 +- '2.12' libabseil: - '20230125' -libevent: -- 2.1.12 libgrpc: - '1.54' +- '1.56' libprotobuf: - '3.21' +- 4.23.3 lz4_c: - 1.9.3 numpy: @@ -52,7 +50,7 @@ numpy: openssl: - '3' orc: -- 1.8.3 +- 1.9.0 pin_run_as_build: python: min_pin: x.x @@ -79,6 +77,8 @@ zip_keys: - cuda_compiler_version - cdt_name - docker_image +- - libgrpc + - libprotobuf - - python - numpy zlib: diff --git a/dev/tasks/conda-recipes/.ci_support/osx_64_.yaml b/dev/tasks/conda-recipes/.ci_support/osx_64_.yaml index 0774679775a61..dd4a230760ef2 100644 --- a/dev/tasks/conda-recipes/.ci_support/osx_64_.yaml +++ b/dev/tasks/conda-recipes/.ci_support/osx_64_.yaml @@ -1,13 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' aws_crt_cpp: -- 0.20.1 +- 0.20.3 aws_sdk_cpp: - 1.10.57 bzip2: - '1' -c_ares: -- '1' c_compiler: - clang c_compiler_version: @@ -27,15 +25,15 @@ gflags: glog: - '0.6' google_cloud_cpp: -- 2.10.1 +- '2.12' libabseil: - '20230125' -libevent: -- 2.1.12 libgrpc: - '1.54' +- '1.56' libprotobuf: - '3.21' +- 4.23.3 lz4_c: - 1.9.3 macos_machine: @@ -48,7 +46,7 @@ numpy: openssl: - '3' orc: -- 1.8.3 +- 1.9.0 pin_run_as_build: python: min_pin: x.x @@ -69,6 +67,8 @@ thrift_cpp: zip_keys: - - c_compiler_version - cxx_compiler_version +- - libgrpc + - libprotobuf - - python - numpy zlib: diff --git a/dev/tasks/conda-recipes/.ci_support/osx_arm64_.yaml b/dev/tasks/conda-recipes/.ci_support/osx_arm64_.yaml index bd834a4b66cb0..6a6713a54fe86 100644 --- a/dev/tasks/conda-recipes/.ci_support/osx_arm64_.yaml +++ b/dev/tasks/conda-recipes/.ci_support/osx_arm64_.yaml @@ -1,13 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' aws_crt_cpp: -- 0.20.1 +- 0.20.3 aws_sdk_cpp: - 1.10.57 bzip2: - '1' -c_ares: -- '1' c_compiler: - clang c_compiler_version: @@ -27,15 +25,15 @@ gflags: glog: - '0.6' google_cloud_cpp: -- 2.10.1 +- '2.12' libabseil: - '20230125' -libevent: -- 2.1.12 libgrpc: - '1.54' +- '1.56' libprotobuf: - '3.21' +- 4.23.3 lz4_c: - 1.9.3 macos_machine: @@ -48,7 +46,7 @@ numpy: openssl: - '3' orc: -- 1.8.3 +- 1.9.0 pin_run_as_build: python: min_pin: x.x @@ -69,6 +67,8 @@ thrift_cpp: zip_keys: - - c_compiler_version - cxx_compiler_version +- - libgrpc + - libprotobuf - - python - numpy zlib: diff --git a/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_version10.2.yaml b/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_version11.2.yaml similarity index 89% rename from dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_version10.2.yaml rename to dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_version11.2.yaml index dc1c64446b4da..f75d92e276d9e 100644 --- a/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_version10.2.yaml +++ b/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_version11.2.yaml @@ -1,5 +1,5 @@ aws_crt_cpp: -- 0.20.1 +- 0.20.3 aws_sdk_cpp: - 1.10.57 bzip2: @@ -15,9 +15,9 @@ channel_targets: cuda_compiler: - nvcc cuda_compiler_version: -- '10.2' +- '11.2' cuda_compiler_version_min: -- '10.2' +- '11.2' cxx_compiler: - vs2019 gflags: @@ -25,19 +25,19 @@ gflags: glog: - '0.6' google_cloud_cpp: -- 2.10.1 +- '2.12' libabseil: - '20230125' libcrc32c: - '1.1' libcurl: - '8' -libevent: -- 2.1.12 libgrpc: - '1.54' +- '1.56' libprotobuf: - '3.21' +- 4.23.3 lz4_c: - 1.9.3 numpy: @@ -48,7 +48,7 @@ numpy: openssl: - '3' orc: -- 1.8.3 +- 1.9.0 pin_run_as_build: python: min_pin: x.x @@ -69,6 +69,8 @@ thrift_cpp: zip_keys: - - cuda_compiler - cuda_compiler_version +- - libgrpc + - libprotobuf - - python - numpy zlib: diff --git a/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_versionNone.yaml b/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_versionNone.yaml index e9dee6a0eac0d..6d8fb15b15a2a 100644 --- a/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_versionNone.yaml +++ b/dev/tasks/conda-recipes/.ci_support/win_64_cuda_compiler_versionNone.yaml @@ -1,5 +1,5 @@ aws_crt_cpp: -- 0.20.1 +- 0.20.3 aws_sdk_cpp: - 1.10.57 bzip2: @@ -17,7 +17,7 @@ cuda_compiler: cuda_compiler_version: - None cuda_compiler_version_min: -- '10.2' +- '11.2' cxx_compiler: - vs2019 gflags: @@ -25,19 +25,19 @@ gflags: glog: - '0.6' google_cloud_cpp: -- 2.10.1 +- '2.12' libabseil: - '20230125' libcrc32c: - '1.1' libcurl: - '8' -libevent: -- 2.1.12 libgrpc: - '1.54' +- '1.56' libprotobuf: - '3.21' +- 4.23.3 lz4_c: - 1.9.3 numpy: @@ -48,7 +48,7 @@ numpy: openssl: - '3' orc: -- 1.8.3 +- 1.9.0 pin_run_as_build: python: min_pin: x.x @@ -69,6 +69,8 @@ thrift_cpp: zip_keys: - - cuda_compiler - cuda_compiler_version +- - libgrpc + - libprotobuf - - python - numpy zlib: diff --git a/dev/tasks/tasks.yml b/dev/tasks/tasks.yml index 1e9ce8e9300ad..284946a8cd498 100644 --- a/dev/tasks/tasks.yml +++ b/dev/tasks/tasks.yml @@ -282,7 +282,7 @@ tasks: ci: azure template: conda-recipes/azure.linux.yml params: - config: linux_64_cuda_compiler_version10.2 + config: linux_64_cuda_compiler_version11.2 artifacts: - libarrow-{no_rc_version}-(h[a-z0-9]+)_0_cuda.conda - pyarrow-{no_rc_version}-py38(h[a-z0-9]+)_0_cuda.conda @@ -460,7 +460,7 @@ tasks: ci: azure template: conda-recipes/azure.win.yml params: - config: win_64_cuda_compiler_versionNone + config: win_64_cuda_compiler_version11.2 artifacts: - libarrow-{no_rc_version}-(h[a-z0-9]+)_0_cuda.conda - pyarrow-{no_rc_version}-py38(h[a-z0-9]+)_0_cuda.conda