From 6fca135e249e7042de168532580f08126ba4c617 Mon Sep 17 00:00:00 2001 From: "Viral B. Shah" Date: Sat, 12 Oct 2024 20:45:41 -0400 Subject: [PATCH 1/6] Bump CXXWrap --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 748570c..78b4b70 100644 --- a/Project.toml +++ b/Project.toml @@ -8,5 +8,5 @@ CxxWrap = "1f15a43c-97ca-5a2a-ae31-89f07a497df4" OpenCV_jll = "33b9d88c-85f9-5d73-bd91-4e2b95a9aa0b" [compat] -CxxWrap = "0.11, 0.12, 0.13" +CxxWrap = "0.11, 0.12, 0.13, 0.14, 0.15, 0.16" julia = "^1.6.0" From ffb2976998ba0564b397599ff7c1a7b9d4a94988 Mon Sep 17 00:00:00 2001 From: "Viral B. Shah" <744411+ViralBShah@users.noreply.github.com> Date: Thu, 24 Oct 2024 10:13:27 -0400 Subject: [PATCH 2/6] Update Project.toml --- Project.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Project.toml b/Project.toml index 78b4b70..43661c9 100644 --- a/Project.toml +++ b/Project.toml @@ -1,12 +1,12 @@ name = "OpenCV" uuid = "f878e3a2-a245-4720-8660-60795d644f2a" authors = ["Archit Rungta "] -version = "4.5.3" +version = "4.6" [deps] CxxWrap = "1f15a43c-97ca-5a2a-ae31-89f07a497df4" OpenCV_jll = "33b9d88c-85f9-5d73-bd91-4e2b95a9aa0b" [compat] -CxxWrap = "0.11, 0.12, 0.13, 0.14, 0.15, 0.16" -julia = "^1.6.0" +CxxWrap = "0.16" +julia = "1.6" From d668888c1e5077f69c29d887fb003126a653ab29 Mon Sep 17 00:00:00 2001 From: "Viral B. Shah" Date: Thu, 24 Oct 2024 10:32:55 -0400 Subject: [PATCH 3/6] Fix tests --- test/Artifacts.toml | 4 ++-- test/test_dnn.jl | 2 +- test/test_feature2d.jl | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/Artifacts.toml b/test/Artifacts.toml index c16f0ba..39058b0 100644 --- a/test/Artifacts.toml +++ b/test/Artifacts.toml @@ -3,5 +3,5 @@ git-tree-sha1 = "6d7d3f9fcc70a7a13e6617cea255f143df9957db" lazy = true [[opencv_extra.download]] - sha256 = "f1aff8497dbb84088b505c7dbda66480ac94ff2cae1b1db7f30c49781035b427" - url = "https://github.com/opencv/opencv_extra/archive/refs/tags/4.5.3.tar.gz" + sha256 = "21867d1f2469bac6f11f81ba292789bd61cdc46e18205f67803dfe28b7803609" + url = "https://github.com/opencv/opencv_extra/archive/refs/tags/4.10.0.tar.gz" diff --git a/test/test_dnn.jl b/test/test_dnn.jl index eea43d1..00dfaae 100644 --- a/test/test_dnn.jl +++ b/test/test_dnn.jl @@ -18,7 +18,7 @@ size0 = 300 # cv.dnn.setPreferableTarget(net, cv.dnn.DNN_TARGET_CPU) cv.dnn.setInputMean(net, (104, 177, 123)) -cv.dnn.setInputScale(net, 1.) +cv.dnn.setInputScale(net, (1.,)) cv.dnn.setInputSize(net, size0, size0) diff --git a/test/test_feature2d.jl b/test/test_feature2d.jl index dfa6d96..4a8fdcf 100644 --- a/test/test_feature2d.jl +++ b/test/test_feature2d.jl @@ -17,5 +17,5 @@ for kp in kps end end - @test_skip closest_match < 10 # TODO This test fails intermittently + @test closest_match < 10 # TODO This test fails intermittently end From d8d4200dfd754900409cae44799775b9ea32754d Mon Sep 17 00:00:00 2001 From: "Viral B. Shah" Date: Thu, 24 Oct 2024 10:36:42 -0400 Subject: [PATCH 4/6] Update git-tree-sha1 --- test/Artifacts.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Artifacts.toml b/test/Artifacts.toml index 39058b0..5c4d9f7 100644 --- a/test/Artifacts.toml +++ b/test/Artifacts.toml @@ -1,5 +1,5 @@ [opencv_extra] -git-tree-sha1 = "6d7d3f9fcc70a7a13e6617cea255f143df9957db" +git-tree-sha1 = "41248814be0db6d9ae939420e33d320fe5c859b8" lazy = true [[opencv_extra.download]] From e2972af9b27c2dc40fb10fe629def98f5a1a5631 Mon Sep 17 00:00:00 2001 From: "Viral B. Shah" Date: Thu, 24 Oct 2024 10:41:25 -0400 Subject: [PATCH 5/6] Update CI scripts. Julia 1.10 as min --- .github/workflows/UnitTest.yml | 18 +++++++----------- Project.toml | 4 ++-- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/.github/workflows/UnitTest.yml b/.github/workflows/UnitTest.yml index ae6dd93..a144e36 100644 --- a/.github/workflows/UnitTest.yml +++ b/.github/workflows/UnitTest.yml @@ -12,37 +12,33 @@ concurrency: cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }} jobs: test: - name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }} + name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ github.event_name }} runs-on: ${{ matrix.os }} strategy: fail-fast: false matrix: version: - - '1.6' + - '1.10' - '1' os: - ubuntu-latest - windows-latest - arch: - - x64 - include: - os: macOS-latest - arch: aarch64 - version: 1 steps: - uses: actions/checkout@v4 - uses: julia-actions/setup-julia@v2 with: version: ${{ matrix.version }} - arch: ${{ matrix.arch }} - uses: julia-actions/cache@v2 - uses: julia-actions/julia-buildpkg@v1 - uses: julia-actions/julia-runtest@v1 - uses: julia-actions/julia-processcoverage@v1 - - uses: codecov/codecov-action@v2 + - uses: codecov/codecov-action@v4 with: files: lcov.info + token: ${{ secrets.CODECOV_TOKEN }} + multithreads: name: Julia (threads) 1 - ubuntu-latest - x64 - ${{ github.event_name }} runs-on: ubuntu-latest @@ -51,12 +47,12 @@ jobs: - uses: julia-actions/setup-julia@v2 with: version: '1' - arch: 'x64' - uses: julia-actions/cache@v2 - uses: julia-actions/julia-buildpkg@v1 - name: run test run: julia --project --code-coverage -t4 -e 'using Pkg; Pkg.test()' - uses: julia-actions/julia-processcoverage@v1 - - uses: codecov/codecov-action@v2 + - uses: codecov/codecov-action@v4 with: files: lcov.info + token: ${{ secrets.CODECOV_TOKEN }} diff --git a/Project.toml b/Project.toml index 43661c9..3a31a2f 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "OpenCV" uuid = "f878e3a2-a245-4720-8660-60795d644f2a" authors = ["Archit Rungta "] -version = "4.6" +version = "4.6.0" [deps] CxxWrap = "1f15a43c-97ca-5a2a-ae31-89f07a497df4" @@ -9,4 +9,4 @@ OpenCV_jll = "33b9d88c-85f9-5d73-bd91-4e2b95a9aa0b" [compat] CxxWrap = "0.16" -julia = "1.6" +julia = "1.10" From 93b50a2de151520604f15f2e83bf274bee75c1e7 Mon Sep 17 00:00:00 2001 From: "Viral B. Shah" Date: Thu, 24 Oct 2024 11:07:28 -0400 Subject: [PATCH 6/6] Update CI --- .github/workflows/UnitTest.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/UnitTest.yml b/.github/workflows/UnitTest.yml index a144e36..634ce81 100644 --- a/.github/workflows/UnitTest.yml +++ b/.github/workflows/UnitTest.yml @@ -12,7 +12,7 @@ concurrency: cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }} jobs: test: - name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ github.event_name }} + name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }} runs-on: ${{ matrix.os }} strategy: fail-fast: false @@ -23,13 +23,19 @@ jobs: os: - ubuntu-latest - windows-latest + arch: + - x64 + include: - os: macOS-latest + arch: aarch64 + version: 1 steps: - uses: actions/checkout@v4 - uses: julia-actions/setup-julia@v2 with: version: ${{ matrix.version }} + arch: ${{ matrix.arch }} - uses: julia-actions/cache@v2 - uses: julia-actions/julia-buildpkg@v1 - uses: julia-actions/julia-runtest@v1 @@ -47,6 +53,7 @@ jobs: - uses: julia-actions/setup-julia@v2 with: version: '1' + arch: 'x64' - uses: julia-actions/cache@v2 - uses: julia-actions/julia-buildpkg@v1 - name: run test