Skip to content

Commit

Permalink
Deps update 10 2024 (#5670)
Browse files Browse the repository at this point in the history
Dependency update 10-2024:
- DALI_deps moved to the latest commit: c7e3e7b996b0a1b19f5e435d32e64c20d9a28a42
- Google Benchmark updated to v1.9.0
- DLPack updated to v1.0
- FFTS updated to the top of the tree: Sep, 2024
- GoogleTest updated to v1.15.2
- pybind11 updated to v2.13.6
- RapidJSON updated to the top of tree: Sep 24, 2024

Signed-off-by: Marek Dabek <mdabek@nvidia.com>
  • Loading branch information
mdabek-nvidia authored Oct 17, 2024
1 parent 1b51e15 commit 0d55aa0
Show file tree
Hide file tree
Showing 12 changed files with 31 additions and 14 deletions.
2 changes: 1 addition & 1 deletion DALI_DEPS_VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6d93550b1340c2010fc356b1e16ab6e4dfdc27c0
c7e3e7b996b0a1b19f5e435d32e64c20d9a28a42
2 changes: 1 addition & 1 deletion conda/third_party/jpeg_turbo/recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

{% set build_version = "3.0.3" %}
{% set build_version = "3.0.90" %}

package:
name: jpeg-turbo
Expand Down
1 change: 1 addition & 0 deletions dali/kernels/erase/erase_gpu_test.cu
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#include <complex>
#include <tuple>
#include <vector>
#include <iomanip>

#include "dali/kernels/common/utils.h"
#include "dali/kernels/erase/erase_gpu.h"
Expand Down
15 changes: 15 additions & 0 deletions dali/python/bundle-wheel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,21 @@ DEPS_LIST=(
"${DEPS_PATH}/lib/libcfitsio.so.4"
"${DEPS_PATH}/lib/libaws-cpp-sdk-core.so"
"${DEPS_PATH}/lib/libaws-cpp-sdk-s3.so"
"${DEPS_PATH}/lib/libaws-crt-cpp.so"
"${DEPS_PATH}/lib/libaws-c-mqtt.so.1.0.0"
"${DEPS_PATH}/lib/libaws-c-event-stream.so.1.0.0"
"${DEPS_PATH}/lib/libaws-c-common.so.1.0.0"
"${DEPS_PATH}/lib/libaws-c-common.so.1"
"${DEPS_PATH}/lib/libaws-c-sdkutils.so.1.0.0"
"${DEPS_PATH}/lib/libaws-c-io.so.1.0.0"
"${DEPS_PATH}/lib/libaws-c-cal.so.1.0.0"
"${DEPS_PATH}/lib/libaws-c-compression.so.1.0.0"
"${DEPS_PATH}/lib/libaws-c-http.so.1.0.0"
"${DEPS_PATH}/lib/libaws-c-auth.so.1.0.0"
"${DEPS_PATH}/lib/libaws-checksums.so.1.0.0"
"${DEPS_PATH}/lib/libaws-c-s3.so.1.0.0"
"${DEPS_PATH}/lib/libaws-c-s3.so.0unstable"
"${DEPS_PATH}/lib/libs2n.so.1"
"lib/libcvcuda.so.0"
"lib/libnvcv_types.so.0"
# cvcuda adds _d suffix to lib names for debug builds
Expand Down
1 change: 1 addition & 0 deletions dali/test/dali_test.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#include <utility>
#include <vector>
#include <numeric>
#include <iomanip>

#include "dali/core/common.h"
#include "dali/core/error_handling.h"
Expand Down
12 changes: 6 additions & 6 deletions third_party/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ This part of the repository contains extra dependencies required to build DALI,
+------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------+
| Repository | Version | License |
+==================================================================+===========================================================================================================================+===================================================================================================================+
| `Google Benchmark <https://github.com/google/benchmark>`_ | `1.8.4 <https://github.com/google/benchmark/releases/tag/v1.8.4>`_ | `Apache License 2.0 <https://github.com/google/benchmark/blob/master/LICENSE>`_ |
| `Google Benchmark <https://github.com/google/benchmark>`_ | `1.9.0 <https://github.com/google/benchmark/releases/tag/v1.9.0>`_ | `Apache License 2.0 <https://github.com/google/benchmark/blob/master/LICENSE>`_ |
+------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------+
| `Boost Preprocessor <https://github.com/boostorg/preprocessor>`_ | `1.85.0 <https://github.com/boostorg/preprocessor/releases/tag/boost-1.85.0>`_ | `Boost Software License 1.0 <https://github.com/boostorg/boost/blob/master/LICENSE_1_0.txt>`_ |
+------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------+
Expand All @@ -15,15 +15,15 @@ This part of the repository contains extra dependencies required to build DALI,
+------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------+
| `CV-CUDA <https://github.com/CVCUDA/CV-CUDA>`_ | `0.7.0 beta <https://github.com/CVCUDA/CV-CUDA/releases/tag/v0.8.0-beta>`_ | `Apache License 2.0 <https://github.com/CVCUDA/CV-CUDA/blob/main/LICENSE.md>`_ |
+------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------+
| `DLPack <https://github.com/dmlc/dlpack>`_ | `0.8 <https://github.com/dmlc/dlpack/releases/tag/v0.8>`_ | `Apache License 2.0 <https://github.com/dmlc/dlpack/blob/main/LICENSE>`_ |
| `DLPack <https://github.com/dmlc/dlpack>`_ | `1.0 <https://github.com/dmlc/dlpack/releases/tag/v1.0>`_ | `Apache License 2.0 <https://github.com/dmlc/dlpack/blob/main/LICENSE>`_ |
+------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------+
| `FFTS <https://github.com/JanuszL/ffts>`_ | `Custom fork top-of-tree (Jan 23, 2020) <https://github.com/JanuszL/ffts/tree/c9a9f61a60505751cac385ed062ce2720bdf07d4>`_ | `BSD 3-Clause License <https://github.com/JanuszL/ffts/blob/master/COPYRIGHT>`_ |
| `FFTS <https://github.com/JanuszL/ffts>`_ | `Custom fork top-of-tree (Sep 6, 2024) <https://github.com/JanuszL/ffts/tree/95489ebcd6fc136c6a76f50f57d43e6072e2bd38>`_ | `BSD 3-Clause License <https://github.com/JanuszL/ffts/blob/master/COPYRIGHT>`_ |
+------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------+
| `GoogleTest <https://github.com/google/googletest>`_ | `1.14.0 <https://github.com/google/googletest/releases/tag/v1.14.0>`_ | `BSD 3-Clause License <https://github.com/google/googletest/blob/master/LICENSE>`_ |
| `GoogleTest <https://github.com/google/googletest>`_ | `1.15.2 <https://github.com/google/googletest/releases/tag/v1.15.2>`_ | `BSD 3-Clause License <https://github.com/google/googletest/blob/master/LICENSE>`_ |
+------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------+
| `pybind11 <https://github.com/pybind/pybind11>`_ | `2.13.1 <https://github.com/pybind/pybind11/releases/tag/v2.13.1>`_ | `BSD 3-Clause License <https://github.com/pybind/pybind11/blob/master/LICENSE>`_ |
| `pybind11 <https://github.com/pybind/pybind11>`_ | `2.13.6 <https://github.com/pybind/pybind11/releases/tag/v2.13.6>`_ | `BSD 3-Clause License <https://github.com/pybind/pybind11/blob/master/LICENSE>`_ |
+------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------+
| `RapidJSON <https://github.com/Tencent/rapidjson>`_ | `Top-of-tree (Apr 9, 2024) <https://github.com/Tencent/rapidjson/commit/3f73edae00aba5b0112a80b4d41e6f1ff7d92a3d>`_ | `MIT License, BSD 3-Clause License, JSON License <https://github.com/Tencent/rapidjson/blob/master/license.txt>`_ |
| `RapidJSON <https://github.com/Tencent/rapidjson>`_ | `Top-of-tree (Sep 24, 2024) <https://github.com/Tencent/rapidjson/commit/815e6e7e7e14be44a6c15d9aefed232ff064cad0>`_ | `MIT License, BSD 3-Clause License, JSON License <https://github.com/Tencent/rapidjson/blob/master/license.txt>`_ |
+------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------+
| `black <https://github.com/psf/black>`_ | `24.4.2 <https://pypi.org/project/black/24.4.2/>`_ | `MIT License <https://github.com/psf/black/blob/main/LICENSE>`_ |
+------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------+
2 changes: 1 addition & 1 deletion third_party/ffts
Submodule ffts updated 1 files
+3 −3 src/ffts.c
2 changes: 1 addition & 1 deletion third_party/googletest
Submodule googletest updated 76 files
+0 −43 .github/workflows/gtest-ci.yml
+1 −0 .gitignore
+17 −0 BUILD.bazel
+11 −2 CMakeLists.txt
+4 −4 CONTRIBUTING.md
+1 −0 CONTRIBUTORS
+69 −0 MODULE.bazel
+9 −13 README.md
+17 −12 WORKSPACE
+35 −0 WORKSPACE.bzlmod
+6 −4 ci/linux-presubmit.sh
+2 −1 ci/macos-presubmit.sh
+8 −3 ci/windows-presubmit.bat
+23 −13 docs/advanced.md
+18 −39 docs/faq.md
+38 −3 docs/gmock_cook_book.md
+4 −2 docs/gmock_for_dummies.md
+19 −20 docs/primer.md
+1 −1 docs/reference/assertions.md
+1 −2 docs/reference/mocking.md
+25 −4 docs/reference/testing.md
+33 −0 fake_fuchsia_sdk.bzl
+14 −13 googlemock/CMakeLists.txt
+3 −3 googlemock/README.md
+34 −10 googlemock/include/gmock/gmock-actions.h
+5 −4 googlemock/include/gmock/gmock-function-mocker.h
+90 −89 googlemock/include/gmock/gmock-matchers.h
+4 −3 googlemock/include/gmock/gmock-more-actions.h
+8 −7 googlemock/include/gmock/gmock.h
+8 −6 googlemock/include/gmock/internal/gmock-internal-utils.h
+4 −4 googlemock/include/gmock/internal/gmock-port.h
+3 −2 googlemock/src/gmock-internal-utils.cc
+14 −15 googlemock/src/gmock-matchers.cc
+2 −1 googlemock/src/gmock-spec-builders.cc
+9 −0 googlemock/test/gmock-matchers-comparisons_test.cc
+14 −3 googlemock/test/gmock-matchers-containers_test.cc
+39 −1 googlemock/test/gmock-more-actions_test.cc
+1 −1 googlemock/test/gmock-spec-builders_test.cc
+9 −0 googlemock/test/gmock_link_test.h
+14 −14 googletest/CMakeLists.txt
+2 −2 googletest/README.md
+4 −0 googletest/cmake/Config.cmake.in
+22 −20 googletest/cmake/internal_utils.cmake
+1 −1 googletest/include/gtest/gtest-assertion-result.h
+4 −4 googletest/include/gtest/gtest-death-test.h
+9 −10 googletest/include/gtest/gtest-message.h
+4 −4 googletest/include/gtest/gtest-param-test.h
+63 −27 googletest/include/gtest/gtest-printers.h
+65 −61 googletest/include/gtest/gtest-typed-test.h
+36 −19 googletest/include/gtest/gtest.h
+25 −26 googletest/include/gtest/internal/gtest-death-test-internal.h
+7 −1 googletest/include/gtest/internal/gtest-filepath.h
+30 −69 googletest/include/gtest/internal/gtest-internal.h
+79 −75 googletest/include/gtest/internal/gtest-param-util.h
+2 −0 googletest/include/gtest/internal/gtest-port-arch.h
+98 −43 googletest/include/gtest/internal/gtest-port.h
+3 −3 googletest/include/gtest/internal/gtest-type-util.h
+19 −17 googletest/src/gtest-death-test.cc
+1 −1 googletest/src/gtest-filepath.cc
+29 −17 googletest/src/gtest-internal-inl.h
+70 −28 googletest/src/gtest-port.cc
+174 −120 googletest/src/gtest.cc
+1 −0 googletest/test/googletest-color-test.py
+41 −37 googletest/test/googletest-death-test-test.cc
+15 −0 googletest/test/googletest-json-output-unittest.py
+4 −1 googletest/test/googletest-options-test.cc
+0 −5 googletest/test/googletest-output-test-golden-lin.txt
+3 −3 googletest/test/googletest-port-test.cc
+16 −0 googletest/test/googletest-printers-test.cc
+52 −44 googletest/test/gtest_environment_test.cc
+23 −41 googletest/test/gtest_help_test.py
+3 −0 googletest/test/gtest_json_test_utils.py
+1 −3 googletest/test/gtest_repeat_test.cc
+19 −27 googletest/test/gtest_unittest.cc
+9 −6 googletest/test/gtest_xml_output_unittest.py
+14 −8 googletest_deps.bzl
2 changes: 1 addition & 1 deletion third_party/pybind11
Submodule pybind11 updated 79 files
+2 −0 .clang-tidy
+9 −1 .github/workflows/ci.yml
+30 −0 .github/workflows/emscripten.yaml
+1 −1 .github/workflows/format.yml
+6 −3 .github/workflows/pip.yml
+7 −7 .pre-commit-config.yaml
+3 −0 CMakeLists.txt
+1 −1 docs/advanced/cast/eigen.rst
+3 −3 docs/advanced/cast/stl.rst
+3 −3 docs/advanced/smart_ptrs.rst
+7 −0 docs/basics.rst
+164 −0 docs/changelog.rst
+3 −3 docs/compiling.rst
+44 −0 docs/faq.rst
+0 −4 docs/limitations.rst
+3 −3 docs/requirements.txt
+9 −2 include/pybind11/cast.h
+16 −3 include/pybind11/detail/class.h
+22 −3 include/pybind11/detail/common.h
+77 −0 include/pybind11/detail/cpp_conduit.h
+71 −0 include/pybind11/detail/exception_translation.h
+4 −2 include/pybind11/detail/init.h
+30 −13 include/pybind11/detail/internals.h
+44 −63 include/pybind11/detail/type_caster_base.h
+77 −0 include/pybind11/detail/value_and_holder.h
+2 −1 include/pybind11/eigen/matrix.h
+2 −4 include/pybind11/eigen/tensor.h
+45 −34 include/pybind11/functional.h
+10 −1 include/pybind11/gil_safe_call_once.h
+6 −2 include/pybind11/numpy.h
+7 −55 include/pybind11/pybind11.h
+2 −0 include/pybind11/pytypes.h
+16 −7 include/pybind11/stl/filesystem.h
+1 −1 include/pybind11/stl_bind.h
+5 −2 include/pybind11/typing.h
+26 −3 pybind11/__main__.py
+1 −1 pybind11/_version.py
+16 −1 tests/CMakeLists.txt
+3 −3 tests/conftest.py
+1 −1 tests/constructor_stats.h
+103 −0 tests/exo_planet_c_api.cpp
+19 −0 tests/exo_planet_pybind11.cpp
+3 −0 tests/extra_python_package/test_files.py
+13 −0 tests/home_planet_very_lonely_traveler.cpp
+8 −8 tests/local_bindings.h
+21 −0 tests/pyproject.toml
+6 −1 tests/test_async.py
+12 −0 tests/test_buffers.cpp
+7 −0 tests/test_buffers.py
+2 −0 tests/test_builtin_casters.py
+1 −1 tests/test_callbacks.cpp
+3 −0 tests/test_callbacks.py
+22 −0 tests/test_cpp_conduit.cpp
+162 −0 tests/test_cpp_conduit.py
+47 −0 tests/test_cpp_conduit_traveler_bindings.h
+25 −0 tests/test_cpp_conduit_traveler_types.h
+1 −1 tests/test_custom_type_setup.py
+2 −2 tests/test_eigen_matrix.cpp
+11 −5 tests/test_eigen_tensor.inl
+1 −1 tests/test_exceptions.py
+9 −4 tests/test_gil_scoped.py
+4 −0 tests/test_iostream.py
+6 −6 tests/test_modules.cpp
+1 −1 tests/test_numpy_array.py
+2 −0 tests/test_numpy_dtypes.cpp
+2 −2 tests/test_opaque_types.cpp
+67 −4 tests/test_pytypes.cpp
+46 −4 tests/test_pytypes.py
+2 −2 tests/test_sequences_and_iterators.cpp
+9 −6 tests/test_smart_ptr.cpp
+1 −1 tests/test_stl.cpp
+2 −1 tests/test_tagbased_polymorphic.cpp
+5 −0 tests/test_thread.py
+46 −0 tests/test_type_caster_std_function_specializations.cpp
+15 −0 tests/test_type_caster_std_function_specializations.py
+1 −1 tests/test_virtual_functions.cpp
+3 −0 tests/test_virtual_functions.py
+29 −3 tools/pybind11Common.cmake
+1 −1 tools/pybind11Config.cmake.in

0 comments on commit 0d55aa0

Please sign in to comment.