From 2991538bcdcc4933d39c484560d1d889228018d4 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Mon, 9 Dec 2024 21:47:43 +0100 Subject: [PATCH 1/3] Rebuild for libgrpc167_libprotobuf5282 --- .ci_support/migrations/libgrpc167_libprotobuf5282.yaml | 10 ++++++++++ recipe/meta.yaml | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/libgrpc167_libprotobuf5282.yaml diff --git a/.ci_support/migrations/libgrpc167_libprotobuf5282.yaml b/.ci_support/migrations/libgrpc167_libprotobuf5282.yaml new file mode 100644 index 0000000..67f50fd --- /dev/null +++ b/.ci_support/migrations/libgrpc167_libprotobuf5282.yaml @@ -0,0 +1,10 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for libgrpc 1.67 & libprotobuf 5.28.2 + kind: version + migration_number: 1 +libgrpc: +- "1.67" +libprotobuf: +- 5.28.2 +migrator_ts: 1729238463 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index eed0c04..be1324f 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set version = "0.4.34" %} -{% set build = 1 %} +{% set build = 2 %} {% if cuda_compiler_version != "None" %} {% set build = build + 200 %} From 36fb2d2742f1a55b6b7570afcb4facfcd2d6bb23 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Mon, 9 Dec 2024 21:50:40 +0100 Subject: [PATCH 2/3] MNT: Re-rendered with conda-build 24.11.2, conda-smithy 3.44.9, and conda-forge-pinning 2024.12.09.20.27.57 --- ..._compiler_version12numpy2.0python3.10.____cpython.yaml | 4 ++-- ..._compiler_version12numpy2.0python3.11.____cpython.yaml | 4 ++-- ..._compiler_version12numpy2.0python3.12.____cpython.yaml | 4 ++-- ...6cxx_compiler_version12numpy2python3.13.____cp313.yaml | 4 ++-- ..._compiler_version13numpy2.0python3.10.____cpython.yaml | 4 ++-- ..._compiler_version13numpy2.0python3.11.____cpython.yaml | 4 ++-- ..._compiler_version13numpy2.0python3.12.____cpython.yaml | 4 ++-- ...ecxx_compiler_version13numpy2python3.13.____cp313.yaml | 4 ++-- ..._compiler_version13numpy2.0python3.10.____cpython.yaml | 8 ++------ ..._compiler_version13numpy2.0python3.11.____cpython.yaml | 8 ++------ ..._compiler_version13numpy2.0python3.12.____cpython.yaml | 8 ++------ ...ecxx_compiler_version13numpy2python3.13.____cp313.yaml | 8 ++------ .ci_support/osx_64_numpy2.0python3.10.____cpython.yaml | 4 ++-- .ci_support/osx_64_numpy2.0python3.11.____cpython.yaml | 4 ++-- .ci_support/osx_64_numpy2.0python3.12.____cpython.yaml | 4 ++-- .ci_support/osx_64_numpy2python3.13.____cp313.yaml | 4 ++-- .ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml | 4 ++-- .ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml | 4 ++-- .ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml | 4 ++-- .ci_support/osx_arm64_numpy2python3.13.____cp313.yaml | 4 ++-- .scripts/run_osx_build.sh | 5 +++-- 21 files changed, 43 insertions(+), 58 deletions(-) diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12numpy2.0python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12numpy2.0python3.10.____cpython.yaml index 966d026..3ddcf82 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12numpy2.0python3.10.____cpython.yaml @@ -29,9 +29,9 @@ github_actions_labels: libabseil: - '20240722' libgrpc: -- '1.65' +- '1.67' libprotobuf: -- 5.27.5 +- 5.28.2 nccl: - '2' numpy: diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12numpy2.0python3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12numpy2.0python3.11.____cpython.yaml index 7723224..fec61da 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12numpy2.0python3.11.____cpython.yaml @@ -29,9 +29,9 @@ github_actions_labels: libabseil: - '20240722' libgrpc: -- '1.65' +- '1.67' libprotobuf: -- 5.27.5 +- 5.28.2 nccl: - '2' numpy: diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12numpy2.0python3.12.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12numpy2.0python3.12.____cpython.yaml index b143ca3..20992a5 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12numpy2.0python3.12.____cpython.yaml @@ -29,9 +29,9 @@ github_actions_labels: libabseil: - '20240722' libgrpc: -- '1.65' +- '1.67' libprotobuf: -- 5.27.5 +- 5.28.2 nccl: - '2' numpy: diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12numpy2python3.13.____cp313.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12numpy2python3.13.____cp313.yaml index c9f3655..7dea8fa 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12numpy2python3.13.____cp313.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12numpy2python3.13.____cp313.yaml @@ -29,9 +29,9 @@ github_actions_labels: libabseil: - '20240722' libgrpc: -- '1.65' +- '1.67' libprotobuf: -- 5.27.5 +- 5.28.2 nccl: - '2' numpy: diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13numpy2.0python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13numpy2.0python3.10.____cpython.yaml index 26faf20..50d36fb 100644 --- a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13numpy2.0python3.10.____cpython.yaml @@ -29,9 +29,9 @@ github_actions_labels: libabseil: - '20240722' libgrpc: -- '1.65' +- '1.67' libprotobuf: -- 5.27.5 +- 5.28.2 nccl: - '2' numpy: diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13numpy2.0python3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13numpy2.0python3.11.____cpython.yaml index 60f304a..12b4d43 100644 --- a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13numpy2.0python3.11.____cpython.yaml @@ -29,9 +29,9 @@ github_actions_labels: libabseil: - '20240722' libgrpc: -- '1.65' +- '1.67' libprotobuf: -- 5.27.5 +- 5.28.2 nccl: - '2' numpy: diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13numpy2.0python3.12.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13numpy2.0python3.12.____cpython.yaml index de2581c..8741e35 100644 --- a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13numpy2.0python3.12.____cpython.yaml @@ -29,9 +29,9 @@ github_actions_labels: libabseil: - '20240722' libgrpc: -- '1.65' +- '1.67' libprotobuf: -- 5.27.5 +- 5.28.2 nccl: - '2' numpy: diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13numpy2python3.13.____cp313.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13numpy2python3.13.____cp313.yaml index 583d44f..a988d15 100644 --- a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13numpy2python3.13.____cp313.yaml +++ b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13numpy2python3.13.____cp313.yaml @@ -29,9 +29,9 @@ github_actions_labels: libabseil: - '20240722' libgrpc: -- '1.65' +- '1.67' libprotobuf: -- 5.27.5 +- 5.28.2 nccl: - '2' numpy: diff --git a/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13numpy2.0python3.10.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13numpy2.0python3.10.____cpython.yaml index 8cce269..8d16c0a 100644 --- a/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13numpy2.0python3.10.____cpython.yaml @@ -1,5 +1,3 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu c_compiler: - gcc c_compiler_version: @@ -8,8 +6,6 @@ c_stdlib: - sysroot c_stdlib_version: - '2.17' -cdt_arch: -- aarch64 cdt_name: - conda channel_sources: @@ -33,9 +29,9 @@ github_actions_labels: libabseil: - '20240722' libgrpc: -- '1.65' +- '1.67' libprotobuf: -- 5.27.5 +- 5.28.2 numpy: - '2.0' openssl: diff --git a/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13numpy2.0python3.11.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13numpy2.0python3.11.____cpython.yaml index 321a21f..b526abc 100644 --- a/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13numpy2.0python3.11.____cpython.yaml @@ -1,5 +1,3 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu c_compiler: - gcc c_compiler_version: @@ -8,8 +6,6 @@ c_stdlib: - sysroot c_stdlib_version: - '2.17' -cdt_arch: -- aarch64 cdt_name: - conda channel_sources: @@ -33,9 +29,9 @@ github_actions_labels: libabseil: - '20240722' libgrpc: -- '1.65' +- '1.67' libprotobuf: -- 5.27.5 +- 5.28.2 numpy: - '2.0' openssl: diff --git a/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13numpy2.0python3.12.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13numpy2.0python3.12.____cpython.yaml index 4c19c76..9f52a56 100644 --- a/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13numpy2.0python3.12.____cpython.yaml @@ -1,5 +1,3 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu c_compiler: - gcc c_compiler_version: @@ -8,8 +6,6 @@ c_stdlib: - sysroot c_stdlib_version: - '2.17' -cdt_arch: -- aarch64 cdt_name: - conda channel_sources: @@ -33,9 +29,9 @@ github_actions_labels: libabseil: - '20240722' libgrpc: -- '1.65' +- '1.67' libprotobuf: -- 5.27.5 +- 5.28.2 numpy: - '2.0' openssl: diff --git a/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13numpy2python3.13.____cp313.yaml b/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13numpy2python3.13.____cp313.yaml index 652618e..99b51c2 100644 --- a/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13numpy2python3.13.____cp313.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13numpy2python3.13.____cp313.yaml @@ -1,5 +1,3 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu c_compiler: - gcc c_compiler_version: @@ -8,8 +6,6 @@ c_stdlib: - sysroot c_stdlib_version: - '2.17' -cdt_arch: -- aarch64 cdt_name: - conda channel_sources: @@ -33,9 +29,9 @@ github_actions_labels: libabseil: - '20240722' libgrpc: -- '1.65' +- '1.67' libprotobuf: -- 5.27.5 +- 5.28.2 numpy: - '2' openssl: diff --git a/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml index 91ca282..c357998 100644 --- a/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml @@ -29,9 +29,9 @@ github_actions_labels: libabseil: - '20240722' libgrpc: -- '1.65' +- '1.67' libprotobuf: -- 5.27.5 +- 5.28.2 macos_machine: - x86_64-apple-darwin13.4.0 numpy: diff --git a/.ci_support/osx_64_numpy2.0python3.11.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.11.____cpython.yaml index d10153c..6bc5315 100644 --- a/.ci_support/osx_64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.11.____cpython.yaml @@ -29,9 +29,9 @@ github_actions_labels: libabseil: - '20240722' libgrpc: -- '1.65' +- '1.67' libprotobuf: -- 5.27.5 +- 5.28.2 macos_machine: - x86_64-apple-darwin13.4.0 numpy: diff --git a/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml index cd0a5a8..f8a5422 100644 --- a/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml @@ -29,9 +29,9 @@ github_actions_labels: libabseil: - '20240722' libgrpc: -- '1.65' +- '1.67' libprotobuf: -- 5.27.5 +- 5.28.2 macos_machine: - x86_64-apple-darwin13.4.0 numpy: diff --git a/.ci_support/osx_64_numpy2python3.13.____cp313.yaml b/.ci_support/osx_64_numpy2python3.13.____cp313.yaml index 21018fa..e1390b5 100644 --- a/.ci_support/osx_64_numpy2python3.13.____cp313.yaml +++ b/.ci_support/osx_64_numpy2python3.13.____cp313.yaml @@ -29,9 +29,9 @@ github_actions_labels: libabseil: - '20240722' libgrpc: -- '1.65' +- '1.67' libprotobuf: -- 5.27.5 +- 5.28.2 macos_machine: - x86_64-apple-darwin13.4.0 numpy: diff --git a/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml index 45b1db1..a8fe936 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml @@ -29,9 +29,9 @@ github_actions_labels: libabseil: - '20240722' libgrpc: -- '1.65' +- '1.67' libprotobuf: -- 5.27.5 +- 5.28.2 macos_machine: - arm64-apple-darwin20.0.0 numpy: diff --git a/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml index 8a73122..31b0369 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml @@ -29,9 +29,9 @@ github_actions_labels: libabseil: - '20240722' libgrpc: -- '1.65' +- '1.67' libprotobuf: -- 5.27.5 +- 5.28.2 macos_machine: - arm64-apple-darwin20.0.0 numpy: diff --git a/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml index e87533e..822f58d 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml @@ -29,9 +29,9 @@ github_actions_labels: libabseil: - '20240722' libgrpc: -- '1.65' +- '1.67' libprotobuf: -- 5.27.5 +- 5.28.2 macos_machine: - arm64-apple-darwin20.0.0 numpy: diff --git a/.ci_support/osx_arm64_numpy2python3.13.____cp313.yaml b/.ci_support/osx_arm64_numpy2python3.13.____cp313.yaml index b8541dd..6dd11ea 100644 --- a/.ci_support/osx_arm64_numpy2python3.13.____cp313.yaml +++ b/.ci_support/osx_arm64_numpy2python3.13.____cp313.yaml @@ -29,9 +29,9 @@ github_actions_labels: libabseil: - '20240722' libgrpc: -- '1.65' +- '1.67' libprotobuf: -- 5.27.5 +- 5.28.2 macos_machine: - arm64-apple-darwin20.0.0 numpy: diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 0b36498..0e3c394 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -6,8 +6,9 @@ source .scripts/logging_utils.sh set -xe -MINIFORGE_HOME=${MINIFORGE_HOME:-${HOME}/miniforge3} -MINIFORGE_HOME=${MINIFORGE_HOME%/} # remove trailing slash +MINIFORGE_HOME="${MINIFORGE_HOME:-${HOME}/miniforge3}" +MINIFORGE_HOME="${MINIFORGE_HOME%/}" # remove trailing slash +export CONDA_BLD_PATH="${CONDA_BLD_PATH:-${MINIFORGE_HOME}/conda-bld}" ( startgroup "Provisioning base env with micromamba" ) 2> /dev/null MICROMAMBA_VERSION="1.5.10-0" From a7a10d78143ad8e9c922143d075bc3473cc6646d Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Tue, 10 Dec 2024 20:50:17 +0100 Subject: [PATCH 3/3] Add zlib for cross --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index be1324f..381bb46 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -37,6 +37,7 @@ requirements: - python # [build_platform != target_platform] - cross-python_{{ target_platform }} # [build_platform != target_platform] - numpy # [build_platform != target_platform] + - zlib # [build_platform != target_platform] - unzip - rsync # [(cuda_compiler_version or "").startswith("12")] # Keep bazel listed twice here to help the migrators track dependencies