From 0e27abe328bd67cf4332589a4902207642d9f7aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Szo=C5=82ucha?= Date: Sat, 18 Jun 2022 11:09:01 +0200 Subject: [PATCH] Dependencies update (#3979) * update dlpack to v0.7 * update rapidjson at top-of-tree * README update * update DALI_DEPS_VERSION * update opencv in conda to 4.6.0 Signed-off-by: szalpal --- DALI_DEPS_VERSION | 2 +- conda/third_party/dali_opencv/recipe/meta.yaml | 8 ++++---- third_party/README.rst | 8 ++++---- third_party/dlpack | 2 +- third_party/rapidjson | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/DALI_DEPS_VERSION b/DALI_DEPS_VERSION index 868eaa71805..01daf00e5b2 100644 --- a/DALI_DEPS_VERSION +++ b/DALI_DEPS_VERSION @@ -1 +1 @@ -459be38cfabd605a7199e2a6f346779b9eca181e +fc9e3b99ed9ce56d008619e5f34e8e1778e7a1d7 diff --git a/conda/third_party/dali_opencv/recipe/meta.yaml b/conda/third_party/dali_opencv/recipe/meta.yaml index 0f2d17f7239..e79baba326e 100644 --- a/conda/third_party/dali_opencv/recipe/meta.yaml +++ b/conda/third_party/dali_opencv/recipe/meta.yaml @@ -12,16 +12,16 @@ # See the License for the specific language governing permissions and # limitations under the License. -{% set build_version = "4.5.5" %} +{% set build_version = "4.6.0" %} package: name: dali-opencv version: {{ build_version }} source: - fn: opencv-4.5.5.tar.gz - url: https://github.com/opencv/opencv/archive/refs/tags/4.5.5.tar.gz - sha256: a1cfdcf6619387ca9e232687504da996aaa9f7b5689986b8331ec02cb61d28ad + fn: opencv-4.6.0.tar.gz + url: https://github.com/opencv/opencv/archive/refs/tags/4.6.0.tar.gz + sha256: 1ec1cba65f9f20fe5a41fda1586e01c70ea0c9a6d7b67c9e13edf0cfe2239277 build: number: 0 diff --git a/third_party/README.rst b/third_party/README.rst index 8ce756d6ac1..35a87708b0d 100644 --- a/third_party/README.rst +++ b/third_party/README.rst @@ -56,8 +56,8 @@ This part of the repository contains extra dependencies required to build DALI, .. |dlpack| replace:: DLPack .. _dlpack: https://github.com/dmlc/dlpack -.. |dlpackver| replace:: 0.6 -.. _dlpackver: https://github.com/dmlc/dlpack/releases/tag/v0.6 +.. |dlpackver| replace:: 0.7 +.. _dlpackver: https://github.com/dmlc/dlpack/releases/tag/v0.7 .. |dlpacklic| replace:: Apache License 2.0 .. _dlpacklic: https://github.com/dmlc/dlpack/blob/main/LICENSE @@ -91,7 +91,7 @@ This part of the repository contains extra dependencies required to build DALI, .. |rapidjson| replace:: RapidJSON .. _rapidjson: https://github.com/Tencent/rapidjson -.. |rapidjsonver| replace:: Top-of-tree (April 20, 2022) -.. _rapidjsonver: https://github.com/Tencent/rapidjson/tree/fcb23c2dbf561ec0798529be4f66394d3e4996d8 +.. |rapidjsonver| replace:: Top-of-tree (May 24, 2022) +.. _rapidjsonver: https://github.com/Tencent/rapidjson/tree/232389d4f1012dddec4ef84861face2d2ba85709 .. |rapidjsonlic| replace:: MIT License, BSD 3-Clause License, JSON License .. _rapidjsonlic: https://github.com/Tencent/rapidjson/blob/master/license.txt diff --git a/third_party/dlpack b/third_party/dlpack index 27750887987..e2bdd3bee8c 160000 --- a/third_party/dlpack +++ b/third_party/dlpack @@ -1 +1 @@ -Subproject commit 277508879878e0a5b5b43599b1bea11f66eb3c6c +Subproject commit e2bdd3bee8cb6501558042633fa59144cc8b7f5f diff --git a/third_party/rapidjson b/third_party/rapidjson index fcb23c2dbf5..232389d4f10 160000 --- a/third_party/rapidjson +++ b/third_party/rapidjson @@ -1 +1 @@ -Subproject commit fcb23c2dbf561ec0798529be4f66394d3e4996d8 +Subproject commit 232389d4f1012dddec4ef84861face2d2ba85709