From 9e9f3618813cc473673cd2ca8ed61d2d50b76a30 Mon Sep 17 00:00:00 2001 From: Krzysztof Lecki Date: Mon, 27 Mar 2023 19:20:04 +0200 Subject: [PATCH 1/5] Update deps Signed-off-by: Krzysztof Lecki --- third_party/pybind11 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/pybind11 b/third_party/pybind11 index 0bd8896a401..5b0a6fc2017 160000 --- a/third_party/pybind11 +++ b/third_party/pybind11 @@ -1 +1 @@ -Subproject commit 0bd8896a4010f2d91b2340570c24fa08606ec406 +Subproject commit 5b0a6fc2017fcc176545afe3e09c9f9885283242 From 9e2c113a2c9eaf6613b7cc55645cbe86d2e05cee Mon Sep 17 00:00:00 2001 From: Krzysztof Lecki Date: Tue, 28 Mar 2023 17:49:45 +0200 Subject: [PATCH 2/5] Adjust readme Signed-off-by: Krzysztof Lecki --- third_party/README.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/third_party/README.rst b/third_party/README.rst index c5c9c751e1d..3278eff77a0 100644 --- a/third_party/README.rst +++ b/third_party/README.rst @@ -84,8 +84,8 @@ This part of the repository contains extra dependencies required to build DALI, .. |pybind11| replace:: pybind11 .. _pybind11: https://github.com/pybind/pybind11 -.. |pybind11ver| replace:: 2.10.3 -.. _pybind11ver: https://github.com/pybind/pybind11/releases/tag/v2.10.3 +.. |pybind11ver| replace:: 2.10.4 +.. _pybind11ver: https://github.com/pybind/pybind11/releases/tag/v2.10.4 .. |pybind11lic| replace:: BSD 3-Clause License .. _pybind11lic: https://github.com/pybind/pybind11/blob/master/LICENSE From fc8ba4637bf504dce38118e0d06043b2eedc6e31 Mon Sep 17 00:00:00 2001 From: Krzysztof Lecki Date: Wed, 29 Mar 2023 14:41:33 +0200 Subject: [PATCH 3/5] If submodule, use --init Signed-off-by: Krzysztof Lecki --- docker/Dockerfile.deps | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile.deps b/docker/Dockerfile.deps index 71a8c750561..6428b803b5f 100644 --- a/docker/Dockerfile.deps +++ b/docker/Dockerfile.deps @@ -50,7 +50,7 @@ RUN /bin/bash -c 'DALI_DEPS_VERSION_SHA=${DALI_DEPS_VERSION_SHA:-$(cat /tmp/DALI cd /tmp/dali_deps && \ git checkout ${DALI_DEPS_VERSION_SHA} && \ git submodule init && \ - git submodule update --depth 1 --recursive && \ + git submodule update --depth 1 --init --recursive && \ export CC_COMP=${CC} && \ export CXX_COMP=${CXX} && \ /tmp/dali_deps/build_scripts/build_deps.sh && rm -rf /tmp/dali_deps && rm -rf /tmp/DALI_DEPS_VERSION' From cdb10201fe726323c5e8df143a68bed2ace6777f Mon Sep 17 00:00:00 2001 From: Krzysztof Lecki Date: Wed, 29 Mar 2023 16:32:18 +0200 Subject: [PATCH 4/5] I need more init Signed-off-by: Krzysztof Lecki --- docker/Dockerfile.build.aarch64-linux | 2 +- docker/Dockerfile.build.aarch64-qnx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile.build.aarch64-linux b/docker/Dockerfile.build.aarch64-linux index 540dcab2770..884e2a9ea1f 100644 --- a/docker/Dockerfile.build.aarch64-linux +++ b/docker/Dockerfile.build.aarch64-linux @@ -75,7 +75,7 @@ RUN /bin/bash -c 'DALI_DEPS_VERSION_SHA=${DALI_DEPS_VERSION_SHA:-$(cat /tmp/DALI cd /tmp/dali_deps && \ git checkout ${DALI_DEPS_VERSION_SHA} && \ git submodule init && \ - git submodule update --depth 1 --recursive && \ + git submodule update --depth 1 --init --recursive && \ export CC_COMP=aarch64-linux-gnu-gcc && \ export CXX_COMP=aarch64-linux-gnu-g++ && \ export INSTALL_PREFIX="/usr/aarch64-linux-gnu/" && \ diff --git a/docker/Dockerfile.build.aarch64-qnx b/docker/Dockerfile.build.aarch64-qnx index 683af25378c..c7e4c1e3c02 100644 --- a/docker/Dockerfile.build.aarch64-qnx +++ b/docker/Dockerfile.build.aarch64-qnx @@ -75,7 +75,7 @@ RUN /bin/bash -c 'DALI_DEPS_VERSION_SHA=${DALI_DEPS_VERSION_SHA:-$(cat /tmp/DALI cd /tmp/dali_deps && \ git checkout ${DALI_DEPS_VERSION_SHA} && \ git submodule init && \ - git submodule update --depth 1 --recursive && \ + git submodule update --depth 1 --init --recursive && \ export CC_COMP=aarch64-unknown-nto-qnx7.0.0-gcc && \ export CXX_COMP=aarch64-unknown-nto-qnx7.0.0-g++ && \ export INSTALL_PREFIX="/usr/aarch64-unknown-nto-qnx/aarch64le" && \ From b8df5bb50ed894c23a741566f980ea85d5bcc41d Mon Sep 17 00:00:00 2001 From: Krzysztof Lecki Date: Thu, 30 Mar 2023 17:17:15 +0200 Subject: [PATCH 5/5] Update so versions Signed-off-by: Krzysztof Lecki --- dali/python/bundle-wheel.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dali/python/bundle-wheel.sh b/dali/python/bundle-wheel.sh index 54052ef5916..618ff9af122 100755 --- a/dali/python/bundle-wheel.sh +++ b/dali/python/bundle-wheel.sh @@ -1,6 +1,6 @@ #!/bin/bash -e # -# Copyright (c) 2018-2022, NVIDIA CORPORATION & AFFILIATES. All rights reserved. +# Copyright (c) 2018-2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -106,11 +106,11 @@ make_wheel_record() { DEPS_LIST=( "${DEPS_PATH}/lib64/libjpeg.so.62" "${DEPS_PATH}/lib/libjpeg.so.62" - "${DEPS_PATH}/lib/libavformat.so.59" - "${DEPS_PATH}/lib/libavcodec.so.59" - "${DEPS_PATH}/lib/libavfilter.so.8" - "${DEPS_PATH}/lib/libavutil.so.57" - "${DEPS_PATH}/lib/libswscale.so.6" + "${DEPS_PATH}/lib/libavformat.so.60" + "${DEPS_PATH}/lib/libavcodec.so.60" + "${DEPS_PATH}/lib/libavfilter.so.9" + "${DEPS_PATH}/lib/libavutil.so.58" + "${DEPS_PATH}/lib/libswscale.so.7" "${DEPS_PATH}/lib/libtiff.so.6" "${DEPS_PATH}/lib/libsndfile.so.1" "${DEPS_PATH}/lib/libFLAC.so.12"