From 92ea87314cda73d63ffc96ae0cc7fd11168d3287 Mon Sep 17 00:00:00 2001 From: Janusz Lisiecki <39967756+JanuszL@users.noreply.github.com> Date: Tue, 24 Sep 2024 19:27:12 +0200 Subject: [PATCH] Pin libprotobuf and protobuf to 5.24 which works with python 3.8-3.12 in conda (#5643) - libprotobuf and protobuf 5.25 seems to be incompatible with python 3.8, so pin it to 5.24 Signed-off-by: Janusz Lisiecki --- conda/dali_native_libs/recipe/meta.yaml | 9 ++------- conda/dali_python_bindings/recipe/meta.yaml | 7 +------ 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/conda/dali_native_libs/recipe/meta.yaml b/conda/dali_native_libs/recipe/meta.yaml index 92c4a36a86..cd10c5d283 100644 --- a/conda/dali_native_libs/recipe/meta.yaml +++ b/conda/dali_native_libs/recipe/meta.yaml @@ -71,8 +71,8 @@ requirements: - python-clang - git-lfs host: - - protobuf >=3.26.1 - - libprotobuf-static >=3.6.1 + - protobuf =5.27.4 + - libprotobuf-static =5.27.4 - libjpeg-turbo - dali-opencv - dali-ffmpeg @@ -97,11 +97,6 @@ requirements: # Since we link statically, we need to add those dependencies explicitly - libwebp-base - openjpeg - # libprotobuf-static we link statically depends on libabseil so add protobuf here as a runtime - # dependency to install the right version on the libabseil (as protobuf depends on - # libprotobuf-static and a newer version of libprotobuf-static may be available than - # the protobuf was build with) - - protobuf >=3.26.1 - cfitsio - nvidia-nvimagecodec-cuda{{ environ.get('CUDA_VERSION', '') | replace(".","") }} diff --git a/conda/dali_python_bindings/recipe/meta.yaml b/conda/dali_python_bindings/recipe/meta.yaml index 49440901c1..3e498e8724 100644 --- a/conda/dali_python_bindings/recipe/meta.yaml +++ b/conda/dali_python_bindings/recipe/meta.yaml @@ -69,20 +69,15 @@ requirements: - patchelf - python-clang - git-lfs - - astunparse >=1.6.0 - - gast >=0.3.3 - - dm-tree >=0.1.8 - black =24.4.2 - black-jupyter =24.4.2 - bandit - - nvidia-dali-core{% if environ.get('NVIDIA_DALI_BUILD_FLAVOR', '')|length %}{{"-" + environ.get('NVIDIA_DALI_BUILD_FLAVOR', '')}}{% endif %}-cuda{{ environ.get('CUDA_VERSION', '') | replace(".","") }} ={{ environ.get('DALI_CONDA_BUILD_VERSION', '') }} host: + - libprotobuf-static =5.27.4 - dali-opencv - dali-ffmpeg - - libprotobuf-static >=3.26.1 - python - future - - protobuf >=3.26.1 - astunparse >=1.6.0 - gast >=0.3.3 - dm-tree >=0.1.8