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

Deps update 06/24 #5514

Merged
merged 6 commits into from
Jun 19, 2024
Merged

Deps update 06/24 #5514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
337dd5d
Update third_party deps
banasraf Jun 10, 2024
19bb08f
Deps update
banasraf Jun 10, 2024
1678ba0
Review fixes
banasraf Jun 12, 2024
bfe2b09
Review fixes. Revert CUTLASS
banasraf Jun 13, 2024
a4e1a98
Fix conda yamls
banasraf Jun 17, 2024
a25ca0d
Update DALI_DEPS_VERSION
banasraf Jun 19, 2024
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
2 changes: 1 addition & 1 deletion DALI_DEPS_VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
22cb369c551d2ba5fd1cfe2b667965d968258cda
9388216e69d8df715786b8e728c150294e1558e1
8 changes: 4 additions & 4 deletions conda/third_party/dali_opencv/recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@
# See the License for the specific language governing permissions and
# limitations under the License.

{% set build_version = "4.9.0" %}
{% set build_version = "4.10.0" %}

package:
name: dali-opencv
version: {{ build_version }}

source:
fn: opencv-4.9.0.tar.gz
url: https://github.com/opencv/opencv/archive/refs/tags/4.9.0.tar.gz
sha256: ddf76f9dffd322c7c3cb1f721d0887f62d747b82059342213138dc190f28bc6c
fn: opencv-{{ build_version }}.tar.gz
url: https://github.com/opencv/opencv/archive/refs/tags/{{ build_version }}.tar.gz
sha256: b2171af5be6b26f7a06b1229948bbb2bdaa74fcf5cd097e0af6378fce50a6eb9

build:
number: 0
Expand Down
4 changes: 2 additions & 2 deletions conda/third_party/jpeg_turbo/recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
# See the License for the specific language governing permissions and
# limitations under the License.

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

package:
name: jpeg-turbo
version: {{ build_version }}

source:
git_url: https://github.com/libjpeg-turbo/libjpeg-turbo
git_rev: 3.0.2
git_rev: {{ build_version }}

build:
number: 0
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 @@ -5,15 +5,15 @@ This part of the repository contains extra dependencies required to build DALI,
+------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------+
| Repository | Version | License |
+==================================================================+===========================================================================================================================+===================================================================================================================+
| `Google Benchmark <https://github.com/google/benchmark>`_ | `1.8.3 <https://github.com/google/benchmark/releases/tag/v1.8.3>`_ | `Apache License 2.0 <https://github.com/google/benchmark/blob/master/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>`_ |
+------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------+
| `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>`_ |
+------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------+
| `COCO API <https://github.com/cocodataset/cocoapi>`_ | `Top-of-tree (Feb 20, 2020) <https://github.com/cocodataset/cocoapi/tree/8c9bcc3cf640524c4c20a9c40e89cb6a2f2fa0e9>`_ | `BSD 2-Clause License <https://github.com/cocodataset/cocoapi/blob/master/license.txt>`_ |
+------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------+
| `CUTLASS <https://github.com/NVIDIA/cutlass>`_ | `3.4.1 <https://github.com/NVIDIA/cutlass/tree/v3.4.1>`_ | `BSD 3-Clause License <https://github.com/NVIDIA/cutlass/blob/master/LICENSE.txt>`_ |
+------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------+
| `CV-CUDA <https://github.com/CVCUDA/CV-CUDA>`_ | `0.7.0 beta <https://github.com/CVCUDA/CV-CUDA/releases/tag/v0.7.0-beta>`_ | `Apache License 2.0 <https://github.com/CVCUDA/CV-CUDA/blob/main/LICENSE.md>`_ |
| `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>`_ |
+------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------+
Expand Down
2 changes: 1 addition & 1 deletion third_party/benchmark
Open in desktop
Submodule benchmark updated 80 files
+0 −1 .clang-tidy
+4 −5 .github/install_bazel.sh
+1 −1 .github/libcxx-setup.sh
+1 −1 .github/workflows/bazel.yml
+53 −6 .github/workflows/build-and-test.yml
+2 −1 .github/workflows/clang-format-lint.yml
+38 −0 .github/workflows/pre-commit.yml
+0 −28 .github/workflows/pylint.yml
+8 −7 .github/workflows/test_bindings.yml
+44 −33 .github/workflows/wheels.yml
+1 −0 .gitignore
+18 −0 .pre-commit-config.yaml
+99 −94 .ycm_extra_conf.py
+1 −0 AUTHORS
+40 −13 BUILD.bazel
+25 −10 CMakeLists.txt
+2 −0 CONTRIBUTORS
+27 −10 MODULE.bazel
+11 −9 WORKSPACE
+16 −19 bazel/benchmark_deps.bzl
+0 −3 bindings/python/BUILD
+0 −25 bindings/python/build_defs.bzl
+3 −16 bindings/python/google_benchmark/BUILD
+18 −39 bindings/python/google_benchmark/__init__.py
+4 −1 bindings/python/google_benchmark/example.py
+7 −0 bindings/python/google_benchmark/version.py
+0 −17 bindings/python/nanobind.BUILD
+0 −6 bindings/python/python_headers.BUILD
+4 −26 cmake/GetGitVersion.cmake
+7 −0 cmake/benchmark_main.pc.in
+4 −4 docs/python_bindings.md
+2 −4 docs/reducing_variance.md
+4 −14 docs/releasing.md
+28 −2 docs/user_guide.md
+61 −12 include/benchmark/benchmark.h
+38 −2 pyproject.toml
+101 −66 setup.py
+10 −1 src/CMakeLists.txt
+33 −4 src/benchmark.cc
+3 −2 src/benchmark_register.cc
+2 −2 src/benchmark_register.h
+6 −5 src/benchmark_runner.cc
+3 −3 src/colorprint.cc
+29 −14 src/complexity.cc
+9 −5 src/console_reporter.cc
+2 −2 src/counter.cc
+11 −3 src/csv_reporter.cc
+24 −12 src/cycleclock.h
+1 −5 src/internal_macros.h
+7 −0 src/json_reporter.cc
+3 −2 src/perf_counters.cc
+10 −5 src/statistics.cc
+1 −1 src/string_util.cc
+38 −22 src/sysinfo.cc
+7 −3 src/timers.cc
+5 −0 test/BUILD
+49 −40 test/CMakeLists.txt
+1 −1 test/basic_test.cc
+1 −1 test/benchmark_gtest.cc
+26 −0 test/benchmark_test.cc
+101 −59 test/complexity_test.cc
+2 −2 test/diagnostics_test.cc
+1 −1 test/link_main_test.cc
+1 −1 test/memory_manager_test.cc
+1 −0 test/output_test_helper.cc
+1 −1 test/perf_counters_gtest.cc
+1 −1 test/perf_counters_test.cc
+7 −4 test/reporter_output_test.cc
+1 −1 test/skip_with_error_test.cc
+2 −2 test/statistics_gtest.cc
+6 −3 test/user_counters_tabular_test.cc
+7 −7 test/user_counters_test.cc
+3 −2 tools/BUILD.bazel
+261 −170 tools/compare.py
+18 −0 tools/gbench/Inputs/test5_run0.json
+18 −0 tools/gbench/Inputs/test5_run1.json
+4 −4 tools/gbench/__init__.py
+1,071 −653 tools/gbench/report.py
+71 −43 tools/gbench/util.py
+65 −53 tools/strip_asm.py
2 changes: 1 addition & 1 deletion third_party/cvcuda
Open in desktop
Submodule cvcuda updated 75 files
+43 −24 .github/workflows/codeql.yml
+0 −91 .pre-commit-config.yaml
+1 −1 CMakeLists.txt
+3 −3 CONTRIBUTING.md
+1 −0 DEVELOPER_GUIDE.md
+6 −6 README.md
+124 −0 bench/BenchResizeCropConvertReformat.cpp
+1 −0 bench/CMakeLists.txt
+38 −0 bench/python/all_ops/op_as_image.py
+42 −0 bench/python/all_ops/op_as_images.py
+44 −0 bench/python/all_ops/op_resize_crop_convert_reformat.py
+11 −7 bench/python/bench_utils.py
+1 −1 ci/build_docs.sh
+1 −1 docker/config
+1 −0 docs/sphinx/content/cvcuda_oplist.csv
+10 −9 docs/sphinx/index.rst
+3 −3 docs/sphinx/installation.rst
+1 −1 docs/sphinx/relnotes/v0.1.0-prealpha.rst
+1 −1 docs/sphinx/relnotes/v0.2.0-alpha.rst
+1 −1 docs/sphinx/relnotes/v0.2.1-alpha.rst
+1 −1 docs/sphinx/relnotes/v0.3.0-beta.rst
+1 −1 docs/sphinx/relnotes/v0.3.1-beta.rst
+1 −1 docs/sphinx/relnotes/v0.4.0-beta.rst
+1 −1 docs/sphinx/relnotes/v0.5.0-beta.rst
+1 −1 docs/sphinx/relnotes/v0.6.0-beta.rst
+2 −2 docs/sphinx/relnotes/v0.7.0-beta.rst
+66 −0 docs/sphinx/relnotes/v0.8.0-beta.rst
+2 −0 python/mod_cvcuda/CMakeLists.txt
+31 −0 python/mod_cvcuda/ChannelManipType.cpp
+29 −0 python/mod_cvcuda/ChannelManipType.hpp
+3 −0 python/mod_cvcuda/Main.cpp
+6 −6 python/mod_cvcuda/OpCropFlipNormalizeReformat.cpp
+3 −5 python/mod_cvcuda/OpPairwiseMatcher.cpp
+374 −0 python/mod_cvcuda/OpResizeCropConvertReformat.cpp
+1 −0 python/mod_cvcuda/Operators.hpp
+31 −0 python/mod_nvcv/Cache.cpp
+6 −0 python/mod_nvcv/Cache.hpp
+95 −31 python/mod_nvcv/Image.cpp
+5 −1 python/mod_nvcv/Image.hpp
+25 −11 python/mod_nvcv/ImageBatch.cpp
+1 −1 python/mod_nvcv/ImageBatch.hpp
+19 −11 python/mod_nvcv/Main.cpp
+11 −11 python/mod_nvcv/Resource.cpp
+2 −0 python/mod_nvcv/Resource.hpp
+23 −15 python/mod_nvcv/Stream.cpp
+51 −19 samples/common/python/perf_utils.py
+418 −144 samples/scripts/benchmark.py
+1 −1 samples/scripts/benchmark_samples.sh
+2 −1 samples/scripts/build_samples.sh
+3 −3 samples/scripts/install_dependencies.sh
+3 −3 samples/scripts/run_samples.sh
+1 −0 src/cvcuda/CMakeLists.txt
+71 −0 src/cvcuda/OpResizeCropConvertReformat.cpp
+4 −5 src/cvcuda/include/cvcuda/OpCropFlipNormalizeReformat.h
+176 −0 src/cvcuda/include/cvcuda/OpResizeCropConvertReformat.h
+97 −0 src/cvcuda/include/cvcuda/OpResizeCropConvertReformat.hpp
+10 −0 src/cvcuda/include/cvcuda/Types.h
+1 −0 src/cvcuda/priv/CMakeLists.txt
+584 −0 src/cvcuda/priv/OpResizeCropConvertReformat.cu
+54 −0 src/cvcuda/priv/OpResizeCropConvertReformat.hpp
+1 −1 src/cvcuda/priv/legacy/custom_crop.cu
+29 −1 src/nvcv_types/include/nvcv/cuda/TensorWrap.hpp
+422 −0 tests/cvcuda/python/test_opresizecropconvertreformat.py
+1 −0 tests/cvcuda/system/CMakeLists.txt
+185 −134 tests/cvcuda/system/ResizeUtils.cpp
+9 −1 tests/cvcuda/system/ResizeUtils.hpp
+208 −167 tests/cvcuda/system/TestOpBilateralFilter.cpp
+10 −1 tests/cvcuda/system/TestOpCvtColor.cpp
+38 −25 tests/cvcuda/system/TestOpErase.cpp
+262 −216 tests/cvcuda/system/TestOpJointBilateralFilter.cpp
+20 −5 tests/cvcuda/system/TestOpPillowResize.cpp
+29 −14 tests/cvcuda/system/TestOpResize.cpp
+491 −0 tests/cvcuda/system/TestOpResizeCropConvertReformat.cpp
+40 −11 tests/nvcv_types/python/test_image.py
+55 −2 tests/nvcv_types/python/test_imgbatchvarshape.py
Loading