trainingsample 0.2.8__tar.gz → 0.2.10__tar.gz

{trainingsample-0.2.8 → trainingsample-0.2.10}/.github/workflows/publish.yml

@@ -41,7 +41,7 @@ jobs:
       uses: actions/cache@v4
       with:
         path: third_party/opencv-static
-        key: opencv-static-4.12.0-no-itt-no-openjpeg-linux-${{ matrix.os }}-${{ runner.arch }}-${{ matrix.manylinux }}
+        key: opencv-static-4.12.0-codecs-jasper-no-itt-no-openjpeg-linux-${{ matrix.os }}-${{ runner.arch }}-${{ matrix.manylinux }}
 
     - name: Install build dependencies
       run: |
@@ -84,7 +84,6 @@ jobs:
         echo "LLVM config at: $(which llvm-config-14 2>/dev/null || which llvm-config-18 2>/dev/null)"
 
     - name: Build static OpenCV
-      if: steps.cache-opencv.outputs.cache-hit != 'true'
       run: |
         ./scripts/build-opencv-static.sh
 
@@ -105,7 +104,7 @@ 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=stdc++
+        OPENCV_LINK_LIBS: static=opencv_world,static=jpeg,static=png,static=tiff,static=webp,static=z,static=jasper,static=stdc++
         OPENCV_DISABLE_PROBES: pkg_config,cmake,vcpkg,vcpkg_cmake
 
     - name: Upload wheels
@@ -131,7 +130,7 @@ jobs:
       uses: actions/cache@v4
       with:
         path: third_party/opencv-static
-        key: opencv-static-4.12.0-no-itt-no-openjpeg-macos-${{ runner.os }}-${{ runner.arch }}
+        key: opencv-static-4.12.0-codecs-jasper-no-itt-no-openjpeg-macos-${{ runner.os }}-${{ runner.arch }}
 
     - name: Install build dependencies
       run: |
@@ -143,7 +142,6 @@ jobs:
         echo "DYLD_LIBRARY_PATH=/opt/homebrew/opt/llvm/lib:$DYLD_LIBRARY_PATH" >> $GITHUB_ENV
 
     - name: Build static OpenCV
-      if: steps.cache-opencv.outputs.cache-hit != 'true'
       run: |
         ./scripts/build-opencv-static.sh
 
@@ -159,7 +157,7 @@ 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,framework=Accelerate,dylib=c++
+        OPENCV_LINK_LIBS: static=opencv_world,static=jpeg,static=png,static=tiff,static=webp,static=z,static=jasper,framework=Accelerate,dylib=c++
         OPENCV_DISABLE_PROBES: pkg_config,cmake,vcpkg,vcpkg_cmake
     - name: Upload wheels
       uses: actions/upload-artifact@v4

{trainingsample-0.2.8 → trainingsample-0.2.10}/Cargo.lock

@@ -135,9 +135,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.9.4"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2261d10cca569e4643e526d8dc2e62e433cc8aba21ab764233731f8d369bf394"
+checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3"
 
 [[package]]
 name = "bitstream-io"
@@ -840,7 +840,7 @@ version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25"
 dependencies = [
- "bitflags 2.9.4",
+ "bitflags 2.10.0",
  "block",
  "core-graphics-types",
  "foreign-types",
@@ -1164,7 +1164,7 @@ version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "97baced388464909d42d89643fe4361939af9b7ce7a31ee32a168f832a70f2a0"
 dependencies = [
- "bitflags 2.9.4",
+ "bitflags 2.10.0",
  "crc32fast",
  "fdeflate",
  "flate2",
@@ -1488,7 +1488,7 @@ version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e"
 dependencies = [
- "bitflags 2.9.4",
+ "bitflags 2.10.0",
  "errno",
  "libc",
  "linux-raw-sys",
@@ -1746,7 +1746,7 @@ dependencies = [
 
 [[package]]
 name = "trainingsample"
-version = "0.2.8"
+version = "0.2.10"
 dependencies = [
  "anyhow",
  "criterion",

{trainingsample-0.2.8 → trainingsample-0.2.10}/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.8"
+version = "0.2.10"
 readme = "README.md"
 
 [profile.release]

{trainingsample-0.2.8 → trainingsample-0.2.10}/PKG-INFO

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

{trainingsample-0.2.8 → trainingsample-0.2.10}/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.8"
+version = "0.2.10"
 
 [project.optional-dependencies]
 dev = ["pytest>=6.0", "pytest-benchmark", "maturin>=1.0,<2.0", "pre-commit"]

{trainingsample-0.2.8 → trainingsample-0.2.10}/scripts/build-opencv-static.sh

@@ -10,7 +10,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-no-itt-no-openjpeg"
+BUILD_SIGNATURE="opencv-${OPENCV_VERSION}-static-codecs-jasper-no-itt-no-openjpeg"
 
 echo "Building static OpenCV ${OPENCV_VERSION}..."
 echo "Install directory: ${INSTALL_DIR}"
@@ -46,6 +46,19 @@ cmake -S "opencv-${OPENCV_VERSION}" \
       -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 \
@@ -60,6 +73,7 @@ cmake -S "opencv-${OPENCV_VERSION}" \
       -DWITH_V4L=OFF \
       -DWITH_GTK=OFF \
       -DWITH_QT=OFF \
+      -DWITH_OPENEXR=OFF \
       -DWITH_ITT=OFF \
       -DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}"
 
@@ -71,12 +85,41 @@ cmake --build build --config Release --target opencv_world -j$(nproc 2>/dev/null
 echo "Installing to ${INSTALL_DIR}..."
 cmake --install build --config Release
 
+# Copy bundled third-party codec archives into the install lib directory and
+# provide canonical aliases (libjpeg.a, libwebp.a, …) for the linker.
+CODEC_LIB_DIR="${BUILD_DIR}/build/3rdparty/lib"
+mkdir -p "${INSTALL_DIR}/lib"
+
+declare -a CODEC_MAPPINGS=(
+    "liblibjpeg-turbo.a:libjpeg.a"
+    "liblibpng.a:libpng.a"
+    "liblibtiff.a:libtiff.a"
+    "liblibwebp.a:libwebp.a"
+    "libzlib.a:libz.a"
+    "liblibjasper.a:libjasper.a"
+)
+
+for mapping in "${CODEC_MAPPINGS[@]}"; do
+    SRC_ARCHIVE="${CODEC_LIB_DIR}/${mapping%%:*}"
+    CANONICAL_NAME="${mapping%%:*}"
+    LINK_NAME="${mapping##*:}"
+
+    if [ ! -f "${SRC_ARCHIVE}" ]; then
+        echo "ERROR: Expected third-party archive ${SRC_ARCHIVE} was not produced by the OpenCV build"
+        find "${CODEC_LIB_DIR}" -maxdepth 1 -type f -name 'lib*.a' | sed "s#^#  #"
+        exit 1
+    fi
+
+    cp -f "${SRC_ARCHIVE}" "${INSTALL_DIR}/lib/${CANONICAL_NAME}"
+    ln -sf "${CANONICAL_NAME}" "${INSTALL_DIR}/lib/${LINK_NAME}"
+done
+
 # Verify installation - check both lib and lib64 (manylinux uses lib64)
-if [ -f "${INSTALL_DIR}/lib64/libopencv_world.a" ]; then
-    # Move from lib64 to lib for consistency
+if [ -d "${INSTALL_DIR}/lib64" ]; then
+    # Move from lib64 to lib for consistency (copy to handle reruns safely)
     mkdir -p "${INSTALL_DIR}/lib"
-    mv "${INSTALL_DIR}/lib64"/* "${INSTALL_DIR}/lib/"
-    rmdir "${INSTALL_DIR}/lib64"
+    cp -a "${INSTALL_DIR}/lib64/." "${INSTALL_DIR}/lib/"
+    rm -rf "${INSTALL_DIR}/lib64"
 fi
 
 if [ ! -f "${INSTALL_DIR}/lib/libopencv_world.a" ]; then
@@ -86,6 +129,25 @@ if [ ! -f "${INSTALL_DIR}/lib/libopencv_world.a" ]; then
     exit 1
 fi
 
+# Ensure third-party codecs were produced as static archives
+REQUIRED_ARCHIVES=(
+    "libjpeg.a"
+    "libpng.a"
+    "libtiff.a"
+    "libwebp.a"
+    "libz.a"
+    "libjasper.a"
+)
+
+for archive in "${REQUIRED_ARCHIVES[@]}"; do
+    if [ ! -f "${INSTALL_DIR}/lib/${archive}" ]; then
+        echo "ERROR: Required static archive ${archive} not found in ${INSTALL_DIR}/lib"
+        echo "Available archives:"
+        find "${INSTALL_DIR}" -maxdepth 2 -type f -name 'lib*.a' | sed "s#^#  #"
+        exit 1
+    fi
+done
+
 printf '%s\n' "${BUILD_SIGNATURE}" > "${SIGNATURE_FILE}"
 
 echo "Static OpenCV built successfully!"