Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update deps: pybind, FFmpeg, zstd #4749

Merged
merged 5 commits into from
Mar 31, 2023
Merged

Update deps: pybind, FFmpeg, zstd #4749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9e9f361
Update deps
klecki Mar 27, 2023
9e2c113
Adjust readme
klecki Mar 28, 2023
fc8ba46
If submodule, use --init
klecki Mar 29, 2023
cdb1020
I need more init
klecki Mar 29, 2023
b8df5bb
Update so versions
klecki Mar 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions dali/python/bundle-wheel.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.build.aarch64-linux
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/" && \
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.build.aarch64-qnx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" && \
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.deps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions third_party/README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion third_party/pybind11
Open in desktop
Submodule pybind11 updated 25 files
+8 −3 .github/workflows/ci.yml
+4 −4 .github/workflows/pip.yml
+10 −10 .pre-commit-config.yaml
+1 −0 MANIFEST.in
+36 −0 docs/changelog.rst
+0 −1 docs/conf.py
+9 −1 include/pybind11/detail/class.h
+3 −3 include/pybind11/detail/common.h
+2 −0 include/pybind11/eigen/matrix.h
+2 −0 include/pybind11/eigen/tensor.h
+4 −4 include/pybind11/gil.h
+4 −4 include/pybind11/numpy.h
+7 −1 pybind11/__main__.py
+1 −1 pybind11/_version.py
+3 −4 pybind11/setup_helpers.py
+1 −1 tests/CMakeLists.txt
+7 −1 tests/conftest.py
+0 −2 tests/extra_python_package/test_files.py
+0 −4 tests/test_chrono.py
+0 −1 tests/test_class.py
+2 −1 tests/test_custom_type_casters.py
+0 −6 tests/test_eigen_tensor.py
+2 −1 tests/test_local_bindings.py
+4 −5 tests/test_modules.py
+0 −1 tests/test_operator_overloading.py