From c33b70203debd0df19e9cf271a672dbcce5cdd8f Mon Sep 17 00:00:00 2001 From: Marek Dabek Date: Mon, 7 Oct 2024 19:50:26 +0200 Subject: [PATCH 01/10] Dependency update 10-2024 Signed-off-by: Marek Dabek --- dali/kernels/erase/erase_gpu_test.cu | 1 + dali/test/dali_test.h | 1 + third_party/README.rst | 12 ++++++------ third_party/benchmark | 2 +- third_party/dlpack | 2 +- third_party/ffts | 2 +- third_party/googletest | 2 +- third_party/pybind11 | 2 +- third_party/rapidjson | 2 +- 9 files changed, 14 insertions(+), 12 deletions(-) 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/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 From a9916fdf0b5c6d2c69453ebad38008f24cca214d Mon Sep 17 00:00:00 2001 From: Marek Dabek Date: Mon, 7 Oct 2024 19:50:26 +0200 Subject: [PATCH 02/10] Dependency update 10-2024 Signed-off-by: Marek Dabek --- dali/python/bundle-wheel.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/dali/python/bundle-wheel.sh b/dali/python/bundle-wheel.sh index 4d290f889ac..2a14b23e7c5 100755 --- a/dali/python/bundle-wheel.sh +++ b/dali/python/bundle-wheel.sh @@ -121,6 +121,7 @@ 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" "lib/libcvcuda.so.0" "lib/libnvcv_types.so.0" # cvcuda adds _d suffix to lib names for debug builds From 2e9d11ab77425aec2dec867502bff9b9cdc045d0 Mon Sep 17 00:00:00 2001 From: Marek Dabek Date: Mon, 7 Oct 2024 19:50:26 +0200 Subject: [PATCH 03/10] Dependency update 10-2024 Signed-off-by: Marek Dabek --- dali/python/bundle-wheel.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/dali/python/bundle-wheel.sh b/dali/python/bundle-wheel.sh index 2a14b23e7c5..23f52648404 100755 --- a/dali/python/bundle-wheel.sh +++ b/dali/python/bundle-wheel.sh @@ -122,6 +122,7 @@ DEPS_LIST=( "${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" "lib/libcvcuda.so.0" "lib/libnvcv_types.so.0" # cvcuda adds _d suffix to lib names for debug builds From 4904bd382384fd196aa021c6c43002280ef1ca8c Mon Sep 17 00:00:00 2001 From: Marek Dabek Date: Mon, 7 Oct 2024 19:50:26 +0200 Subject: [PATCH 04/10] Dependency update 10-2024 Signed-off-by: Marek Dabek --- dali/python/bundle-wheel.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dali/python/bundle-wheel.sh b/dali/python/bundle-wheel.sh index 23f52648404..f92cde0230b 100755 --- a/dali/python/bundle-wheel.sh +++ b/dali/python/bundle-wheel.sh @@ -122,7 +122,7 @@ DEPS_LIST=( "${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" + "${DEPS_PATH}/lib/libaws-c-mqtt.so.1.0.0" "lib/libcvcuda.so.0" "lib/libnvcv_types.so.0" # cvcuda adds _d suffix to lib names for debug builds From 863d7c1db076ed6d9e044447009e7fc00bacf10c Mon Sep 17 00:00:00 2001 From: Marek Dabek Date: Mon, 7 Oct 2024 19:50:26 +0200 Subject: [PATCH 05/10] Dependency update 10-2024 Signed-off-by: Marek Dabek --- dali/python/bundle-wheel.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dali/python/bundle-wheel.sh b/dali/python/bundle-wheel.sh index f92cde0230b..491ac15cf46 100755 --- a/dali/python/bundle-wheel.sh +++ b/dali/python/bundle-wheel.sh @@ -123,6 +123,17 @@ DEPS_LIST=( "${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-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-cpp-sdk-s3.so" + "${DEPS_PATH}/lib/libaws-c-s3.so.1.0.0" "lib/libcvcuda.so.0" "lib/libnvcv_types.so.0" # cvcuda adds _d suffix to lib names for debug builds From e6fb7a71fb7e17d0a4770e90f0e4517ec47a7974 Mon Sep 17 00:00:00 2001 From: Marek Dabek Date: Mon, 7 Oct 2024 19:50:26 +0200 Subject: [PATCH 06/10] Dependency update 10-2024 Signed-off-by: Marek Dabek --- dali/python/bundle-wheel.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/dali/python/bundle-wheel.sh b/dali/python/bundle-wheel.sh index 491ac15cf46..adc9222ef0a 100755 --- a/dali/python/bundle-wheel.sh +++ b/dali/python/bundle-wheel.sh @@ -134,6 +134,7 @@ DEPS_LIST=( "${DEPS_PATH}/lib/libaws-checksums.so.1.0.0" "${DEPS_PATH}/lib/libaws-cpp-sdk-s3.so" "${DEPS_PATH}/lib/libaws-c-s3.so.1.0.0" + "${DEPS_PATH}/lib/libaws-c-s3.so.0unstable" "lib/libcvcuda.so.0" "lib/libnvcv_types.so.0" # cvcuda adds _d suffix to lib names for debug builds From 9873d763b622e19f34c1b67120c3afee2a23565b Mon Sep 17 00:00:00 2001 From: Marek Dabek Date: Mon, 7 Oct 2024 19:50:26 +0200 Subject: [PATCH 07/10] Dependency update 10-2024 Signed-off-by: Marek Dabek --- dali/python/bundle-wheel.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/dali/python/bundle-wheel.sh b/dali/python/bundle-wheel.sh index adc9222ef0a..f793a7419a1 100755 --- a/dali/python/bundle-wheel.sh +++ b/dali/python/bundle-wheel.sh @@ -135,6 +135,7 @@ DEPS_LIST=( "${DEPS_PATH}/lib/libaws-cpp-sdk-s3.so" "${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 From 8abd6d4c1750f820549e9be0b6c1fd1420ce7581 Mon Sep 17 00:00:00 2001 From: Marek Dabek Date: Mon, 7 Oct 2024 19:50:26 +0200 Subject: [PATCH 08/10] Dependency update 10-2024 Signed-off-by: Marek Dabek --- dali/python/bundle-wheel.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/dali/python/bundle-wheel.sh b/dali/python/bundle-wheel.sh index f793a7419a1..d7194aff10b 100755 --- a/dali/python/bundle-wheel.sh +++ b/dali/python/bundle-wheel.sh @@ -125,6 +125,7 @@ DEPS_LIST=( "${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" From 9b51b970b3a504b72ac9a52ca7f73aa38cb71de8 Mon Sep 17 00:00:00 2001 From: Marek Dabek Date: Tue, 15 Oct 2024 18:16:27 +0200 Subject: [PATCH 09/10] Post review comments and conda update Signed-off-by: Marek Dabek --- conda/third_party/jpeg_turbo/recipe/meta.yaml | 2 +- dali/python/bundle-wheel.sh | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) 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/python/bundle-wheel.sh b/dali/python/bundle-wheel.sh index d7194aff10b..d1f5fef27aa 100755 --- a/dali/python/bundle-wheel.sh +++ b/dali/python/bundle-wheel.sh @@ -133,7 +133,6 @@ DEPS_LIST=( "${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-cpp-sdk-s3.so" "${DEPS_PATH}/lib/libaws-c-s3.so.1.0.0" "${DEPS_PATH}/lib/libaws-c-s3.so.0unstable" "${DEPS_PATH}/lib/libs2n.so.1" From b79b7e912325fd0f0ffe50b939eba699e91cca62 Mon Sep 17 00:00:00 2001 From: Marek Dabek Date: Tue, 15 Oct 2024 18:24:03 +0200 Subject: [PATCH 10/10] DALI_deps update to 10-2024 Signed-off-by: Marek Dabek --- DALI_DEPS_VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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