From 8afadcb18192b7795fd48bc23aa7583ce5d0e4bd Mon Sep 17 00:00:00 2001 From: Janusz Lisiecki Date: Thu, 26 Sep 2024 21:30:56 +0200 Subject: [PATCH] Fix conda build for Python 3.9 - adds protobuf as a runtime dependency for DALI conda build as it makes sure that the right version of libasbseil is installed Signed-off-by: Janusz Lisiecki --- conda/dali_native_libs/recipe/meta.yaml | 5 +++++ conda/dali_python_bindings/recipe/meta.yaml | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/conda/dali_native_libs/recipe/meta.yaml b/conda/dali_native_libs/recipe/meta.yaml index cd10c5d2836..85e0d8e2e24 100644 --- a/conda/dali_native_libs/recipe/meta.yaml +++ b/conda/dali_native_libs/recipe/meta.yaml @@ -97,6 +97,11 @@ 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 libprotobuf 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) + - libprotobuf =5.27.4 - 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 3e498e87241..9ccd2dca1b8 100644 --- a/conda/dali_python_bindings/recipe/meta.yaml +++ b/conda/dali_python_bindings/recipe/meta.yaml @@ -85,6 +85,11 @@ requirements: - nvidia-nvimagecodec-cuda{{ environ.get('CUDA_VERSION', '') | replace(".","") }} run: - python + # libprotobuf-static we link statically depends on libabseil so add libprotobuf 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) + - libprotobuf =5.27.4 - future - astunparse >=1.6.0 - gast >=0.3.3