diff --git a/DALI_DEPS_VERSION b/DALI_DEPS_VERSION index 5899248cc09..4ec8cae34a3 100644 --- a/DALI_DEPS_VERSION +++ b/DALI_DEPS_VERSION @@ -1 +1 @@ -6d93550b1340c2010fc356b1e16ab6e4dfdc27c0 +c7e3e7b996b0a1b19f5e435d32e64c20d9a28a42 diff --git a/conda/third_party/jpeg_turbo/recipe/meta.yaml b/conda/third_party/jpeg_turbo/recipe/meta.yaml index fd4c03457c5..84b632761c6 100644 --- a/conda/third_party/jpeg_turbo/recipe/meta.yaml +++ b/conda/third_party/jpeg_turbo/recipe/meta.yaml @@ -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 diff --git a/dali/kernels/erase/erase_gpu_test.cu b/dali/kernels/erase/erase_gpu_test.cu index 58b11881ce2..49f4139ec98 100644 --- a/dali/kernels/erase/erase_gpu_test.cu +++ b/dali/kernels/erase/erase_gpu_test.cu @@ -17,6 +17,7 @@ #include #include #include +#include #include "dali/kernels/common/utils.h" #include "dali/kernels/erase/erase_gpu.h" diff --git a/dali/python/bundle-wheel.sh b/dali/python/bundle-wheel.sh index 4d290f889ac..d1f5fef27aa 100755 --- a/dali/python/bundle-wheel.sh +++ b/dali/python/bundle-wheel.sh @@ -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 diff --git a/dali/test/dali_test.h b/dali/test/dali_test.h index 9b0cc66087c..cc76e2fdfa4 100644 --- a/dali/test/dali_test.h +++ b/dali/test/dali_test.h @@ -25,6 +25,7 @@ #include #include #include +#include #include "dali/core/common.h" #include "dali/core/error_handling.h" diff --git a/third_party/README.rst b/third_party/README.rst index 88409c18d83..e89021b6f54 100644 --- a/third_party/README.rst +++ b/third_party/README.rst @@ -5,7 +5,7 @@ This part of the repository contains extra dependencies required to build DALI, +------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------+ | Repository | Version | License | +==================================================================+===========================================================================================================================+===================================================================================================================+ -| `Google Benchmark `_ | `1.8.4 `_ | `Apache License 2.0 `_ | +| `Google Benchmark `_ | `1.9.0 `_ | `Apache License 2.0 `_ | +------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------+ | `Boost Preprocessor `_ | `1.85.0 `_ | `Boost Software License 1.0 `_ | +------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------+ @@ -15,15 +15,15 @@ This part of the repository contains extra dependencies required to build DALI, +------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------+ | `CV-CUDA `_ | `0.7.0 beta `_ | `Apache License 2.0 `_ | +------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------+ -| `DLPack `_ | `0.8 `_ | `Apache License 2.0 `_ | +| `DLPack `_ | `1.0 `_ | `Apache License 2.0 `_ | +------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------+ -| `FFTS `_ | `Custom fork top-of-tree (Jan 23, 2020) `_ | `BSD 3-Clause License `_ | +| `FFTS `_ | `Custom fork top-of-tree (Sep 6, 2024) `_ | `BSD 3-Clause License `_ | +------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------+ -| `GoogleTest `_ | `1.14.0 `_ | `BSD 3-Clause License `_ | +| `GoogleTest `_ | `1.15.2 `_ | `BSD 3-Clause License `_ | +------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------+ -| `pybind11 `_ | `2.13.1 `_ | `BSD 3-Clause License `_ | +| `pybind11 `_ | `2.13.6 `_ | `BSD 3-Clause License `_ | +------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------+ -| `RapidJSON `_ | `Top-of-tree (Apr 9, 2024) `_ | `MIT License, BSD 3-Clause License, JSON License `_ | +| `RapidJSON `_ | `Top-of-tree (Sep 24, 2024) `_ | `MIT License, BSD 3-Clause License, JSON License `_ | +------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------+ | `black `_ | `24.4.2 `_ | `MIT License `_ | +------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------+ diff --git a/third_party/benchmark b/third_party/benchmark index a4cf155615c..12235e24652 160000 --- a/third_party/benchmark +++ b/third_party/benchmark @@ -1 +1 @@ -Subproject commit a4cf155615c63e019ae549e31703bf367df5b471 +Subproject commit 12235e24652fc7f809373e7c11a5f73c5763fc4c diff --git a/third_party/dlpack b/third_party/dlpack index 365b823cedb..bbd2f4d3242 160000 --- a/third_party/dlpack +++ b/third_party/dlpack @@ -1 +1 @@ -Subproject commit 365b823cedb281cd0240ca601aba9b78771f91a3 +Subproject commit bbd2f4d32427e548797929af08cfe2a9cbb3cf12 diff --git a/third_party/ffts b/third_party/ffts index c9a9f61a605..95489ebcd6f 160000 --- a/third_party/ffts +++ b/third_party/ffts @@ -1 +1 @@ -Subproject commit c9a9f61a60505751cac385ed062ce2720bdf07d4 +Subproject commit 95489ebcd6fc136c6a76f50f57d43e6072e2bd38 diff --git a/third_party/googletest b/third_party/googletest index f8d7d77c069..b514bdc898e 160000 --- a/third_party/googletest +++ b/third_party/googletest @@ -1 +1 @@ -Subproject commit f8d7d77c06936315286eb55f8de22cd23c188571 +Subproject commit b514bdc898e2951020cbdca1304b75f5950d1f59 diff --git a/third_party/pybind11 b/third_party/pybind11 index 941f45bcb51..a2e59f0e706 160000 --- a/third_party/pybind11 +++ b/third_party/pybind11 @@ -1 +1 @@ -Subproject commit 941f45bcb51457884fa1afd6e24a67377d70f75c +Subproject commit a2e59f0e7065404b44dfe92a28aca47ba1378dc4 diff --git a/third_party/rapidjson b/third_party/rapidjson index ab1842a2dae..815e6e7e7e1 160000 --- a/third_party/rapidjson +++ b/third_party/rapidjson @@ -1 +1 @@ -Subproject commit ab1842a2dae061284c0a62dca1cc6d5e7e37e346 +Subproject commit 815e6e7e7e14be44a6c15d9aefed232ff064cad0