trainingsample 0.2.11__tar.gz → 0.2.13__tar.gz

{trainingsample-0.2.11 → trainingsample-0.2.13}/.github/workflows/ci.yml

@@ -69,7 +69,7 @@ jobs:
     - name: Install Rust toolchain
       uses: dtolnay/rust-toolchain@master
       with:
-        toolchain: 1.85
+        toolchain: 1.89
         components: rustfmt, clippy
 
     - name: Cache cargo registry
@@ -169,7 +169,7 @@ jobs:
     - name: Install Rust toolchain
       uses: dtolnay/rust-toolchain@master
       with:
-        toolchain: 1.85
+        toolchain: 1.89
         components: rustfmt, clippy
 
     - name: Install maturin (Linux/macOS)
@@ -260,7 +260,7 @@ jobs:
     - name: Install Rust toolchain
       uses: dtolnay/rust-toolchain@master
       with:
-        toolchain: 1.85
+        toolchain: 1.89
         components: rustfmt, clippy
 
     - name: Install cargo-audit
@@ -342,7 +342,7 @@ jobs:
     - name: Install Rust toolchain
       uses: dtolnay/rust-toolchain@master
       with:
-        toolchain: 1.85
+        toolchain: 1.89
 
     - name: Install maturin (Linux/macOS)
       run: pip install maturin[patchelf]

{trainingsample-0.2.11 → trainingsample-0.2.13}/.github/workflows/publish.yml

@@ -107,10 +107,19 @@ jobs:
         OPENCV_LINK_LIBS: static=opencv_world,static=avformat,static=avcodec,static=avfilter,static=swresample,static=swscale,static=avutil,static=jpeg,static=png,static=tiff,static=webp,static=z,static=jasper,static=stdc++
         OPENCV_DISABLE_PROBES: pkg_config,cmake,vcpkg,vcpkg_cmake
 
+    - name: Repair wheels
+      env:
+        OPENCV_LINK_PATHS: ${{ github.workspace }}/third_party/opencv-static/lib
+      run: |
+        ./scripts/repair-wheel.sh dist/*.whl
+    - name: Prune unrepaired wheels
+      run: |
+        find dist -type f -name '*.linux_*.whl' -print -delete
+
     - name: Upload wheels
       uses: actions/upload-artifact@v4
       with:
-        name: wheels-linux-${{ matrix.os }}-${{ matrix.target }}-py${{ matrix.python }}
+        name: wheels-${{ matrix.os }}-${{ matrix.target }}-py${{ matrix.python }}
         path: dist
 
 
@@ -157,12 +166,17 @@ jobs:
         # OpenCV static linking configuration
         OPENCV_INCLUDE_PATHS: ${{ github.workspace }}/third_party/opencv-static/include/opencv4
         OPENCV_LINK_PATHS: ${{ github.workspace }}/third_party/opencv-static/lib
-        OPENCV_LINK_LIBS: static=opencv_world,static=avformat,static=avcodec,static=avfilter,static=swresample,static=swscale,static=avutil,static=jpeg,static=png,static=tiff,static=webp,static=z,static=jasper,framework=Accelerate,dylib=c++
+        OPENCV_LINK_LIBS: static=opencv_world,static=avformat,static=avcodec,static=avfilter,static=swresample,static=swscale,static=avutil,static=jpeg,static=png,static=tiff,static=webp,static=jasper,framework=Accelerate,dylib=c++,framework=OpenCL,z
         OPENCV_DISABLE_PROBES: pkg_config,cmake,vcpkg,vcpkg_cmake
+    - name: Repair wheels
+      env:
+        OPENCV_LINK_PATHS: ${{ github.workspace }}/third_party/opencv-static/lib
+      run: |
+        ./scripts/repair-wheel.sh dist/*.whl
     - name: Upload wheels
       uses: actions/upload-artifact@v4
       with:
-        name: wheels-macos-${{ matrix.target }}
+        name: wheels-macos-latest-${{ matrix.target }}-py3.11
         path: dist
 
   sdist:
@@ -180,10 +194,58 @@ jobs:
         name: wheels-sdist
         path: dist
 
+  smoketest:
+    runs-on: ${{ matrix.os }}
+    needs: [linux, macos]
+    strategy:
+      matrix:
+        include:
+          # Ubuntu 22.04 (libc 2.35)
+          - os: ubuntu-22.04
+            target: x86_64
+            manylinux: manylinux_2_35
+            python: '3.11'
+          - os: ubuntu-22.04
+            target: x86_64
+            manylinux: manylinux_2_35
+            python: '3.12'
+          # Ubuntu 24.04 (libc 2.39)
+          - os: ubuntu-24.04
+            target: x86_64
+            manylinux: manylinux_2_39
+            python: '3.11'
+          - os: ubuntu-24.04
+            target: x86_64
+            manylinux: manylinux_2_39
+            python: '3.12'
+          - os: macos-latest
+            target: aarch64
+            manylinux: ''
+            python: '3.11'
+    steps:
+    - uses: actions/download-artifact@v4
+      with:
+        pattern: wheels-${{ matrix.os }}-${{ matrix.target }}-py${{ matrix.python }}
+        path: dist
+    - uses: actions/setup-python@v5
+      with:
+        python-version: ${{ matrix.python }}
+    - run: |
+        set -euo pipefail
+        wheel="$(find "${{ github.workspace }}/dist" -type f -name '*.whl' | sort | head -n 1)"
+        if [ -z "${wheel}" ]; then
+          echo "No wheel files found under dist/"
+          find "${{ github.workspace }}/dist" -maxdepth 3 -type f || true
+          exit 1
+        fi
+        echo "Installing wheel: ${wheel}"
+        pip install "${wheel}"
+        python -c 'import trainingsample' || echo "Import failed"
+
   release:
     name: Release
     runs-on: ubuntu-latest
-    needs: [linux, macos, sdist]
+    needs: [smoketest, sdist]
     steps:
     - uses: actions/download-artifact@v4
       with:
@@ -194,13 +256,9 @@ jobs:
       run: |
         echo "Built wheels:"
         ls -la dist/
-        echo "Wheel information:"
-        for wheel in dist/*.whl; do
-          if [ -f "$wheel" ]; then
-            echo "Checking $wheel:"
-            python -c "import zipfile; print(zipfile.ZipFile('$wheel').namelist()[:3])" || echo "  Could not read wheel contents"
-          fi
-        done
+    - name: Prune unsupported linux-tag wheels
+      run: |
+        find dist -type f -name '*.linux_*.whl' -print -delete
     - name: Publish to PyPI
       uses: pypa/gh-action-pypi-publish@v1.12.4
       with:

{trainingsample-0.2.11 → trainingsample-0.2.13}/Cargo.lock

@@ -100,9 +100,9 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
 
 [[package]]
 name = "av1-grain"
-version = "0.2.4"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f3efb2ca85bc610acfa917b5aaa36f3fcbebed5b3182d7f877b02531c4b80c8"
+checksum = "8cfddb07216410377231960af4fcab838eaa12e013417781b78bd95ee22077f8"
 dependencies = [
  "anyhow",
  "arrayvec",
@@ -183,9 +183,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
 
 [[package]]
 name = "cc"
-version = "1.2.41"
+version = "1.2.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac9fe6cdbb24b6ade63616c0a0688e45bb56732262c158df3c0c4bea4ca47cb7"
+checksum = "739eb0f94557554b3ca9a86d2d37bebd49c5e6d0c1d2bda35ba5bdac830befc2"
 dependencies = [
  "find-msvc-tools",
  "jobserver",
@@ -258,18 +258,18 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.49"
+version = "4.5.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4512b90fa68d3a9932cea5184017c5d200f5921df706d45e853537dea51508f"
+checksum = "0c2cfd7bf8a6017ddaa4e32ffe7403d547790db06bd171c1c53926faab501623"
 dependencies = [
  "clap_builder",
 ]
 
 [[package]]
 name = "clap_builder"
-version = "4.5.49"
+version = "4.5.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0025e98baa12e766c67ba13ff4695a887a1eba19569aad00a472546795bd6730"
+checksum = "0a4c05b9e80c5ccd3a7ef080ad7b6ba7d6fc00a985b8b157197075677c82c7a0"
 dependencies = [
  "anstyle",
  "clap_lex",
@@ -435,7 +435,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
  "libc",
- "windows-sys 0.61.2",
+ "windows-sys",
 ]
 
 [[package]]
@@ -496,9 +496,9 @@ checksum = "52051878f80a721bb68ebfbc930e07b65ba72f2da88968ea5c06fd6ca3d3a127"
 
 [[package]]
 name = "flate2"
-version = "1.1.4"
+version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc5a4e564e38c699f2880d3fda590bedc2e69f3f84cd48b457bd892ce61d0aa9"
+checksum = "bfe33edd8e85a12a67454e37f8c75e730830d83e313556ab9ebf9ee7fbeb3bfb"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
@@ -671,9 +671,12 @@ dependencies = [
 
 [[package]]
 name = "indoc"
-version = "2.0.6"
+version = "2.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd"
+checksum = "79cf5c93f93228cf8efb3ba362535fb11199ac548a09ce117c9b1adc3030d706"
+dependencies = [
+ "rustversion",
+]
 
 [[package]]
 name = "interpolate_name"
@@ -688,13 +691,13 @@ dependencies = [
 
 [[package]]
 name = "is-terminal"
-version = "0.4.16"
+version = "0.4.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9"
+checksum = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46"
 dependencies = [
  "hermit-abi",
  "libc",
- "windows-sys 0.59.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -733,9 +736,9 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.81"
+version = "0.3.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec48937a97411dcb524a265206ccd4c90bb711fca92b2792c407f268825b9305"
+checksum = "b011eec8cc36da2aab2d5cff675ec18454fad408585853910a202391cf9f8e65"
 dependencies = [
  "once_cell",
  "wasm-bindgen",
@@ -849,12 +852,6 @@ dependencies = [
  "paste",
 ]
 
-[[package]]
-name = "minimal-lexical"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
-
 [[package]]
 name = "miniz_oxide"
 version = "0.8.9"
@@ -867,9 +864,9 @@ dependencies = [
 
 [[package]]
 name = "moxcms"
-version = "0.7.7"
+version = "0.7.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c588e11a3082784af229e23e8e4ecf5bcc6fbe4f69101e0421ce8d79da7f0b40"
+checksum = "0fbdd3d7436f8b5e892b8b7ea114271ff0fa00bc5acae845d53b07d498616ef6"
 dependencies = [
  "num-traits",
  "pxfm",
@@ -913,12 +910,11 @@ checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086"
 
 [[package]]
 name = "nom"
-version = "7.1.3"
+version = "8.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+checksum = "df9761775871bdef83bee530e60050f7e54b1105350d6884eb0fb4f46c2f9405"
 dependencies = [
  "memchr",
- "minimal-lexical",
 ]
 
 [[package]]
@@ -1197,9 +1193,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.101"
+version = "1.0.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de"
+checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8"
 dependencies = [
  "unicode-ident",
 ]
@@ -1492,7 +1488,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.61.2",
+ "windows-sys",
 ]
 
 [[package]]
@@ -1625,9 +1621,9 @@ checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
 
 [[package]]
 name = "syn"
-version = "2.0.107"
+version = "2.0.108"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a26dbd934e5451d21ef060c018dae56fc073894c5a7896f882928a76e6d081b"
+checksum = "da58917d35242480a05c2897064da0a80589a2a0476c9a3f2fdc83b53502e917"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1663,7 +1659,7 @@ dependencies = [
  "getrandom 0.3.4",
  "once_cell",
  "rustix",
- "windows-sys 0.61.2",
+ "windows-sys",
 ]
 
 [[package]]
@@ -1746,7 +1742,7 @@ dependencies = [
 
 [[package]]
 name = "trainingsample"
-version = "0.2.11"
+version = "0.2.12"
 dependencies = [
  "anyhow",
  "criterion",
@@ -1779,9 +1775,9 @@ checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.19"
+version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f63a545481291138910575129486daeaf8ac54aee4387fe7906919f7830c7d9d"
+checksum = "462eeb75aeb73aea900253ce739c8e18a67423fadf006037cd3ff27e82748a06"
 
 [[package]]
 name = "unindent"
@@ -1839,9 +1835,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.104"
+version = "0.2.105"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1da10c01ae9f1ae40cbfac0bac3b1e724b320abfcf52229f80b547c0d250e2d"
+checksum = "da95793dfc411fbbd93f5be7715b0578ec61fe87cb1a42b12eb625caa5c5ea60"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -1850,25 +1846,11 @@ dependencies = [
  "wasm-bindgen-shared",
 ]
 
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.104"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "671c9a5a66f49d8a47345ab942e2cb93c7d1d0339065d4f8139c486121b43b19"
-dependencies = [
- "bumpalo",
- "log",
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-shared",
-]
-
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.104"
+version = "0.2.105"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ca60477e4c59f5f2986c50191cd972e3a50d8a95603bc9434501cf156a9a119"
+checksum = "04264334509e04a7bf8690f2384ef5265f05143a4bff3889ab7a3269adab59c2"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -1876,31 +1858,31 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.104"
+version = "0.2.105"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f07d2f20d4da7b26400c9f4a0511e6e0345b040694e8a75bd41d578fa4421d7"
+checksum = "420bc339d9f322e562942d52e115d57e950d12d88983a14c79b86859ee6c7ebc"
 dependencies = [
+ "bumpalo",
  "proc-macro2",
  "quote",
  "syn",
- "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.104"
+version = "0.2.105"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bad67dc8b2a1a6e5448428adec4c3e84c43e561d8c9ee8a9e5aabeb193ec41d1"
+checksum = "76f218a38c84bcb33c25ec7059b07847d465ce0e0a76b995e134a45adcb6af76"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "web-sys"
-version = "0.3.81"
+version = "0.3.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9367c417a924a74cae129e6a2ae3b47fabb1f8995595ab474029da749a8be120"
+checksum = "3a1f95c0d03a47f4ae1f7a64643a6bb97465d9b740f0fa8f90ea33915c99a9a1"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -1928,7 +1910,7 @@ version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 dependencies = [
- "windows-sys 0.61.2",
+ "windows-sys",
 ]
 
 [[package]]
@@ -1938,7 +1920,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f919aee0a93304be7f62e8e5027811bbba96bcb1de84d6618be56e43f8a32a1"
 dependencies = [
  "windows-core",
- "windows-targets 0.53.5",
+ "windows-targets",
 ]
 
 [[package]]
@@ -1951,7 +1933,7 @@ dependencies = [
  "windows-interface",
  "windows-result",
  "windows-strings",
- "windows-targets 0.53.5",
+ "windows-targets",
 ]
 
 [[package]]
@@ -2006,15 +1988,6 @@ dependencies = [
  "windows-link 0.1.3",
 ]
 
-[[package]]
-name = "windows-sys"
-version = "0.59.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
-dependencies = [
- "windows-targets 0.52.6",
-]
-
 [[package]]
 name = "windows-sys"
 version = "0.61.2"
@@ -2024,22 +1997,6 @@ dependencies = [
  "windows-link 0.2.1",
 ]
 
-[[package]]
-name = "windows-targets"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
-dependencies = [
- "windows_aarch64_gnullvm 0.52.6",
- "windows_aarch64_msvc 0.52.6",
- "windows_i686_gnu 0.52.6",
- "windows_i686_gnullvm 0.52.6",
- "windows_i686_msvc 0.52.6",
- "windows_x86_64_gnu 0.52.6",
- "windows_x86_64_gnullvm 0.52.6",
- "windows_x86_64_msvc 0.52.6",
-]
-
 [[package]]
 name = "windows-targets"
 version = "0.53.5"
@@ -2047,106 +2004,58 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3"
 dependencies = [
  "windows-link 0.2.1",
- "windows_aarch64_gnullvm 0.53.1",
- "windows_aarch64_msvc 0.53.1",
- "windows_i686_gnu 0.53.1",
- "windows_i686_gnullvm 0.53.1",
- "windows_i686_msvc 0.53.1",
- "windows_x86_64_gnu 0.53.1",
- "windows_x86_64_gnullvm 0.53.1",
- "windows_x86_64_msvc 0.53.1",
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
 ]
 
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
-
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53"
 
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
-
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006"
 
-[[package]]
-name = "windows_i686_gnu"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
-
 [[package]]
 name = "windows_i686_gnu"
 version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3"
 
-[[package]]
-name = "windows_i686_gnullvm"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
-
 [[package]]
 name = "windows_i686_gnullvm"
 version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c"
 
-[[package]]
-name = "windows_i686_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
-
 [[package]]
 name = "windows_i686_msvc"
 version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2"
 
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
-
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499"
 
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
-
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1"
 
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
-
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.53.1"

{trainingsample-0.2.11 → trainingsample-0.2.13}/Cargo.toml

@@ -38,7 +38,7 @@ description = "High-performance Rust reimplementation of GIL-blocking video/imag
 edition = "2021"
 license = "MIT"
 name = "trainingsample"
-version = "0.2.11"
+version = "0.2.12"
 readme = "README.md"
 
 [profile.release]

{trainingsample-0.2.11 → trainingsample-0.2.13}/Dockerfile

@@ -66,7 +66,7 @@ ENV PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH
 ENV LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
 
 # Install Rust
-RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.85
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.89
 ENV PATH="/root/.cargo/bin:${PATH}"
 RUN rustup component add rustfmt clippy
 

{trainingsample-0.2.11 → trainingsample-0.2.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trainingsample
-Version: 0.2.11
+Version: 0.2.13
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy

trainingsample-0.2.13/docs/BUILDING_STATIC_OPENCV.md

@@ -0,0 +1,197 @@
+# Building a statically linked OpenCV bundle
+
+The `opencv` crate expects to find an existing OpenCV toolkit and, by default, it
+links against the dynamic libraries that come with a system installation
+(`libopencv_core.dylib`, `libopencv_core.so`, …). To ship the `trainingsample`
+crate without asking end users to install OpenCV themselves, build a static
+OpenCV distribution once and point Cargo at it during compilation.
+
+## 1. Build FFmpeg as static libraries
+
+1. Download FFmpeg sources (6.1+ recommended) to a temporary location:
+
+   ```bash
+   curl -sSLo ~/Downloads/ffmpeg-6.1.1.tar.bz2 https://ffmpeg.org/releases/ffmpeg-6.1.1.tar.bz2
+   tar -C ~/Downloads -xjf ~/Downloads/ffmpeg-6.1.1.tar.bz2
+   ```
+
+2. Configure a static build that keeps only the components required for software
+   decoding. Disable the executables and hardware accelerators so the build
+   stays self-contained:
+
+   ```bash
+   pushd ~/Downloads/ffmpeg-6.1.1
+   ./configure \
+       --prefix=$(pwd)/../../third_party/ffmpeg-static \
+       --pkg-config-flags="--static" \
+       --extra-cflags="-fPIC" \
+       --extra-cxxflags="-fPIC" \
+       --extra-ldflags="-fPIC" \
+       --enable-static \
+       --disable-shared \
+       --disable-doc \
+       --disable-debug \
+       --disable-autodetect \
+       --disable-hwaccels \
+       --disable-vulkan \
+       --disable-cuvid \
+       --disable-nvenc \
+       --disable-nvdec \
+       --disable-vaapi \
+       --disable-vdpau \
+       --disable-d3d11va \
+       --disable-dxva2 \
+       --disable-alsa \
+       --disable-sdl2 \
+       --disable-libxcb \
+       --disable-iconv \
+       --disable-libdrm \
+       --disable-network \
+       --disable-avdevice \
+       --disable-postproc \
+       --disable-programs \
+       --enable-swscale \
+       --enable-swresample
+   make -j$(nproc)
+   make install
+   popd
+   ```
+
+   The install step writes the static archives and headers to
+   `third_party/ffmpeg-static`. The OpenCV build picks them up via pkg-config.
+   Copy the resulting libraries into the OpenCV bundle later (`libavcodec.a`,
+   `libavfilter.a`, `libavformat.a`, `libavutil.a`, `libswresample.a`,
+   `libswscale.a`).
+
+## 2. Build OpenCV as static libraries
+
+1. Download an official OpenCV source archive (4.9+ recommended) and place it
+   somewhere outside the repository, e.g. `~/Downloads/opencv-4.10.0`.
+2. Configure a *Release* build that turns off shared libraries and only enables
+   the modules that `trainingsample` uses. Ensure the FFmpeg pkg-config files
+   are visible (e.g. `export PKG_CONFIG_PATH=$(pwd)/third_party/ffmpeg-static/lib/pkgconfig:$PKG_CONFIG_PATH`).
+   On macOS or Linux:
+
+   ```bash
+   cmake -S ~/Downloads/opencv-4.10.0 \
+         -B ~/Downloads/opencv-build-static \
+         -DBUILD_LIST=core,imgproc,imgcodecs,highgui,video,videoio,calib3d,features2d,photo \
+         -DBUILD_SHARED_LIBS=OFF \
+         -DBUILD_opencv_world=ON \
+         -DOPENCV_FORCE_3RDPARTY_BUILD=ON \
+         -DBUILD_JPEG=ON -DWITH_JPEG=ON \
+         -DBUILD_PNG=ON -DWITH_PNG=ON \
+         -DBUILD_TIFF=ON -DWITH_TIFF=ON \
+         -DBUILD_WEBP=ON -DWITH_WEBP=ON \
+         -DBUILD_ZLIB=ON -DWITH_ZLIB=ON \
+         -DBUILD_JASPER=ON -DWITH_JASPER=ON \
+         -DWITH_FFMPEG=ON -DOPENCV_FFMPEG_USE_FIND_LIBS=ON \
+         -DBUILD_TESTS=OFF -DBUILD_PERF_TESTS=OFF -DBUILD_EXAMPLES=OFF \
+         -DWITH_IPP=OFF -DWITH_OPENCL=OFF -DWITH_CUDA=OFF -DWITH_OPENEXR=OFF
+   cmake --build ~/Downloads/opencv-build-static --config Release --target opencv_world
+   cmake --install ~/Downloads/opencv-build-static \
+         --config Release \
+         --prefix $(pwd)/third_party/opencv-static
+   ```
+
+   The `opencv_world` target gives you a single `libopencv_world.a` archive;
+   switch it off and install the individual module archives if you prefer.
+   The OpenCV build drops the bundled codec libraries (`liblibjpeg-turbo.a`,
+   `liblibpng.a`, `liblibtiff.a`, `liblibwebp.a`, `libzlib.a`, `liblibjasper.a`) inside the
+   build tree under `build/3rdparty/lib/`. Copy them into
+   `third_party/opencv-static/lib/` and add the expected linker aliases, e.g.:
+
+   ```bash
+   cp ~/Downloads/opencv-build-static/3rdparty/lib/liblibjpeg-turbo.a third_party/opencv-static/lib/
+   ln -sf liblibjpeg-turbo.a third_party/opencv-static/lib/libjpeg.a
+   # Repeat for liblibpng.a→libpng.a, liblibtiff.a→libtiff.a, liblibwebp.a→libwebp.a, libzlib.a→libz.a, liblibjasper.a→libjasper.a
+   ```
+
+3. After installation you should have:
+
+   ```text
+   third_party/opencv-static/include/opencv4/...
+   third_party/opencv-static/lib/libopencv_world.a
+   third_party/opencv-static/lib/libz.a (and other third-party static deps)
+   third_party/opencv-static/lib/libjasper.a
+   third_party/opencv-static/lib/libavcodec.a
+   third_party/opencv-static/lib/libavfilter.a
+   third_party/opencv-static/lib/libavformat.a
+   third_party/opencv-static/lib/libavutil.a
+    third_party/opencv-static/lib/libswresample.a
+    third_party/opencv-static/lib/libswscale.a
+   ```
+
+   If your OpenCV build links to optional third-party components (TBB, JPEG,
+   PNG, WebP, etc.), install their static archives into the same `lib/` folder
+   so Cargo can link them in one pass.
+
+> **macOS note**: Apple does not provide static builds of the C++ standard
+> library. Replace `static=stdc++` with `dylib=c++` (or `framework=Accelerate`
+> when required) in the linking step below.
+
+## 2. Point Cargo at the static toolchain
+
+Add a `.cargo/config.toml` (kept inside the repo) with the environment variables
+that the `opencv` build script understands:
+
+```toml
+[env]
+# Paths are resolved relative to the workspace root.
+OPENCV_INCLUDE_PATHS = { value = "third_party/opencv-static/include", relative = true }
+OPENCV_LINK_PATHS    = { value = "third_party/opencv-static/lib",      relative = true }
+# Tell the build script to stop probing the system.
+OPENCV_DISABLE_PROBES = "pkg_config,cmake,vcpkg"
+# Static link OpenCV and the extra libraries it depends on.
+# Adjust the list to match the archives present in third_party/opencv-static/lib.
+OPENCV_LINK_LIBS = "static=opencv_world,static=avformat,static=avcodec,static=avfilter,static=swresample,static=swscale,static=avutil,static=png,static=jpeg,static=tiff,static=webp,static=z,static=jasper,static=stdc++"
+```
+
+The helper script in this repository disables OpenJPEG support
+(`-DWITH_OPENJPEG=OFF`), so `opencv_world` does not depend on `openjp2`. If you
+enable JPEG2000 support yourself, append the appropriate OpenJPEG archive
+(`static=openjp2`) to `OPENCV_LINK_LIBS`.
+
+To avoid stale caches, the script drops a `build_signature.txt` file alongside
+the libraries containing the configuration fingerprint (OpenCV version and the
+set of disabled features). If you rebuild OpenCV manually, update or remove that
+file so subsequent runs do not skip regeneration.
+
+If you elected to install the individual module archives instead of
+`opencv_world`, list each one (`static=opencv_core`, `static=opencv_imgproc`,
+…). Keep the order roughly from high- to low-level modules so the linker can
+resolve symbols in one pass.
+
+For cross-compilation add target-specific sections, e.g.:
+
+```toml
+[target.aarch64-apple-darwin.env]
+OPENCV_LINK_LIBS = "static=opencv_world,static=avformat,static=avcodec,static=avfilter,static=swresample,static=swscale,static=avutil,static=png,static=jpeg,static=tiff,static=z,static=jasper,dylib=c++"
+```
+
+## 3. Build the crate
+
+With the static bundle in place you can now build the crate without touching the
+system OpenCV installation:
+
+```bash
+cargo build --features opencv --release
+```
+
+The resulting `libtrainingsample.{so,dylib}` (or the wheels produced by the
+Python bindings) now embed the OpenCV symbols directly, so end users do not need
+`opencv_core` on their machines.
+
+## 4. Regenerating the bundle
+
+Whenever you need to update OpenCV:
+
+1. Re-run the CMake configure/build/install steps pointing at the new source
+   tree.
+2. Verify that the list in `OPENCV_LINK_LIBS` still matches the archives produced.
+3. Commit the regenerated contents of `third_party/opencv-static/` if you keep
+   it under version control (or upload it to your release pipeline’s artifact
+   store).
+
+That is all Cargo needs—no changes to `Cargo.toml` are required beyond enabling
+the `opencv` feature when you want the acceleration path.

{trainingsample-0.2.11 → trainingsample-0.2.13}/pyproject.toml

@@ -14,7 +14,7 @@ description = "High-performance Rust reimplementation of GIL-blocking video/imag
 license = {text = "MIT"}
 name = "trainingsample"
 requires-python = ">=3.11"
-version = "0.2.11"
+version = "0.2.13"
 
 [project.optional-dependencies]
 dev = ["pytest>=6.0", "pytest-benchmark", "maturin>=1.0,<2.0", "pre-commit"]

{trainingsample-0.2.11 → trainingsample-0.2.13}/rust-toolchain.toml

@@ -1,4 +1,4 @@
 [toolchain]
-channel = "1.85"
+channel = "1.89"
 components = ["rustfmt", "clippy"]
 profile = "minimal"

{trainingsample-0.2.11 → trainingsample-0.2.13}/scripts/build-opencv-static.sh

@@ -11,7 +11,7 @@ PROJECT_ROOT="$(cd "${SCRIPT_DIR}/.." && pwd)"
 BUILD_DIR="${PROJECT_ROOT}/opencv-build-tmp"
 INSTALL_DIR="${PROJECT_ROOT}/third_party/opencv-static"
 SIGNATURE_FILE="${INSTALL_DIR}/build_signature.txt"
-BUILD_SIGNATURE="opencv-${OPENCV_VERSION}-static-codecs-jasper-ffmpeg-no-itt-no-openjpeg"
+BUILD_SIGNATURE="opencv-${OPENCV_VERSION}-static-codecs-jasper-ffmpeg-no-itt-no-openjpeg-no-tbb"
 
 FFMPEG_BUILD_DIR="${PROJECT_ROOT}/ffmpeg-build-tmp"
 FFMPEG_INSTALL_DIR="${PROJECT_ROOT}/third_party/ffmpeg-static"
@@ -136,43 +136,57 @@ fi
 # Configure CMake build
 echo "Configuring CMake build..."
 export PKG_CONFIG_PATH="${FFMPEG_INSTALL_DIR}/lib/pkgconfig:${PKG_CONFIG_PATH:-}"
-cmake -S "opencv-${OPENCV_VERSION}" \
-      -B build \
-      -DCMAKE_BUILD_TYPE=Release \
-      -DBUILD_LIST=core,imgproc,imgcodecs,highgui,video,videoio,calib3d,features2d,photo \
-      -DBUILD_SHARED_LIBS=OFF \
-      -DBUILD_opencv_world=ON \
-      -DOPENCV_FORCE_3RDPARTY_BUILD=ON \
-      -DBUILD_JPEG=ON \
-      -DBUILD_PNG=ON \
-      -DBUILD_TIFF=ON \
-      -DBUILD_WEBP=ON \
-      -DBUILD_ZLIB=ON \
-      -DBUILD_JASPER=ON \
-      -DWITH_JPEG=ON \
-      -DWITH_PNG=ON \
-      -DWITH_TIFF=ON \
-      -DWITH_WEBP=ON \
-      -DWITH_ZLIB=ON \
-      -DWITH_JASPER=ON \
-      -DBUILD_TESTS=OFF \
-      -DBUILD_PERF_TESTS=OFF \
-      -DBUILD_EXAMPLES=OFF \
-      -DBUILD_opencv_apps=OFF \
-      -DBUILD_DOCS=OFF \
-      -DWITH_IPP=OFF \
-      -DWITH_OPENCL=OFF \
-      -DWITH_CUDA=OFF \
-      -DWITH_OPENJPEG=OFF \
-      -DWITH_FFMPEG=ON \
-      -DOPENCV_FFMPEG_USE_FIND_LIBS=ON \
-      -DWITH_GSTREAMER=OFF \
-      -DWITH_V4L=OFF \
-      -DWITH_GTK=OFF \
-      -DWITH_QT=OFF \
-      -DWITH_OPENEXR=OFF \
-      -DWITH_ITT=OFF \
-      -DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}"
+
+CMAKE_ARGS=(
+    -S "opencv-${OPENCV_VERSION}"
+    -B build
+    -DCMAKE_BUILD_TYPE=Release
+    -DBUILD_LIST=core,imgproc,imgcodecs,highgui,video,videoio,calib3d,features2d,photo
+    -DBUILD_SHARED_LIBS=OFF
+    -DBUILD_opencv_world=ON
+    -DOPENCV_FORCE_3RDPARTY_BUILD=ON
+    -DBUILD_JPEG=ON
+    -DBUILD_PNG=ON
+    -DBUILD_TIFF=ON
+    -DBUILD_WEBP=ON
+    -DBUILD_ZLIB=ON
+    -DBUILD_JASPER=ON
+    -DWITH_JPEG=ON
+    -DWITH_PNG=ON
+    -DWITH_TIFF=ON
+    -DWITH_WEBP=ON
+    -DWITH_ZLIB=ON
+    -DWITH_JASPER=ON
+    -DBUILD_TESTS=OFF
+    -DBUILD_PERF_TESTS=OFF
+    -DBUILD_EXAMPLES=OFF
+    -DBUILD_opencv_apps=OFF
+    -DBUILD_DOCS=OFF
+    -DWITH_IPP=OFF
+    -DWITH_OPENCL=OFF
+    -DWITH_CUDA=OFF
+    -DWITH_OPENJPEG=OFF
+    -DWITH_FFMPEG=ON
+    -DOPENCV_FFMPEG_USE_FIND_LIBS=ON
+    -DWITH_GSTREAMER=OFF
+    -DWITH_V4L=OFF
+    -DWITH_GTK=OFF
+    -DWITH_QT=OFF
+    -DWITH_OPENEXR=OFF
+    -DWITH_ITT=OFF
+    -DBUILD_TBB=OFF
+    -DWITH_TBB=OFF
+    -DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}"
+)
+
+if [[ "$(uname)" == "Darwin" ]]; then
+    echo "Detected macOS host; disabling Carotene to avoid linking issue."
+    CMAKE_ARGS+=(
+        -DWITH_CAROTENE=OFF
+    )
+fi
+
+cmake "${CMAKE_ARGS[@]}"
 
 # Build opencv_world (single unified library)
 echo "Building OpenCV (this may take several minutes)..."

trainingsample-0.2.13/scripts/repair-wheel.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+pip install repairwheel
+
+repairwheel -o $(dirname "$1") -l "${OPENCV_LINK_PATHS}" "$1"

trainingsample-0.2.11/docs/BUILDING_STATIC_OPENCV.md

@@ -1,103 +0,0 @@
-# Building a statically linked OpenCV bundle
-
-The `opencv` crate expects to find an existing OpenCV toolkit and, by default, it
-links against the dynamic libraries that come with a system installation
-(`libopencv_core.dylib`, `libopencv_core.so`, …). To ship the `trainingsample`
-crate without asking end users to install OpenCV themselves, build a static
-OpenCV distribution once and point Cargo at it during compilation.
-
-## 1. Build OpenCV as static libraries
-
-1. Download an official OpenCV source archive (4.9+ recommended) and place it
-   somewhere outside the repository, e.g. `~/Downloads/opencv-4.10.0`.
-2. Configure a *Release* build that turns off shared libraries and only enables
-   the modules that `trainingsample` uses. On macOS or Linux:
-
-   ```bash
-   cmake -S ~/Downloads/opencv-4.10.0 \
-         -B ~/Downloads/opencv-build-static \
-         -DBUILD_LIST=core,imgproc,imgcodecs,highgui,video,videoio,calib3d,features2d,photo \
-         -DBUILD_SHARED_LIBS=OFF \
-         -DBUILD_opencv_world=ON \
-         -DBUILD_TESTS=OFF -DBUILD_PERF_TESTS=OFF -DBUILD_EXAMPLES=OFF \
-         -DWITH_IPP=OFF -DWITH_OPENCL=OFF -DWITH_CUDA=OFF
-   cmake --build ~/Downloads/opencv-build-static --config Release --target opencv_world
-   cmake --install ~/Downloads/opencv-build-static \
-         --config Release \
-         --prefix $(pwd)/third_party/opencv-static
-   ```
-
-   The `opencv_world` target gives you a single `libopencv_world.a` archive;
-   switch it off and install the individual module archives if you prefer.
-
-3. After installation you should have:
-
-   ```text
-   third_party/opencv-static/include/opencv4/...
-   third_party/opencv-static/lib/libopencv_world.a
-   third_party/opencv-static/lib/libz.a (and other third-party static deps)
-   ```
-
-   If your OpenCV build links to optional third-party components (TBB, JPEG,
-   PNG, WebP, etc.), install their static archives into the same `lib/` folder
-   so Cargo can link them in one pass.
-
-> **macOS note**: Apple does not provide static builds of the C++ standard
-> library. Replace `static=stdc++` with `dylib=c++` (or `framework=Accelerate`
-> when required) in the linking step below.
-
-## 2. Point Cargo at the static toolchain
-
-Add a `.cargo/config.toml` (kept inside the repo) with the environment variables
-that the `opencv` build script understands:
-
-```toml
-[env]
-# Paths are resolved relative to the workspace root.
-OPENCV_INCLUDE_PATHS = { value = "third_party/opencv-static/include", relative = true }
-OPENCV_LINK_PATHS    = { value = "third_party/opencv-static/lib",      relative = true }
-# Tell the build script to stop probing the system.
-OPENCV_DISABLE_PROBES = "pkg_config,cmake,vcpkg"
-# Static link OpenCV and the extra libraries it depends on.
-# Adjust the list to match the archives present in third_party/opencv-static/lib.
-OPENCV_LINK_LIBS = "static=opencv_world,static=png,static=jpeg,static=tiff,static=webp,static=z,static=stdc++"
-```
-
-If you elected to install the individual module archives instead of
-`opencv_world`, list each one (`static=opencv_core`, `static=opencv_imgproc`,
-…). Keep the order roughly from high- to low-level modules so the linker can
-resolve symbols in one pass.
-
-For cross-compilation add target-specific sections, e.g.:
-
-```toml
-[target.aarch64-apple-darwin.env]
-OPENCV_LINK_LIBS = "static=opencv_world,static=png,static=jpeg,static=tiff,static=z,dylib=c++"
-```
-
-## 3. Build the crate
-
-With the static bundle in place you can now build the crate without touching the
-system OpenCV installation:
-
-```bash
-cargo build --features opencv --release
-```
-
-The resulting `libtrainingsample.{so,dylib}` (or the wheels produced by the
-Python bindings) now embed the OpenCV symbols directly, so end users do not need
-`opencv_core` on their machines.
-
-## 4. Regenerating the bundle
-
-Whenever you need to update OpenCV:
-
-1. Re-run the CMake configure/build/install steps pointing at the new source
-   tree.
-2. Verify that the list in `OPENCV_LINK_LIBS` still matches the archives produced.
-3. Commit the regenerated contents of `third_party/opencv-static/` if you keep
-   it under version control (or upload it to your release pipeline’s artifact
-   store).
-
-That is all Cargo needs—no changes to `Cargo.toml` are required beyond enabling
-the `opencv` feature when you want the acceleration path.