trainingsample 0.2.2__tar.gz → 0.2.4__tar.gz

{trainingsample-0.2.2 → trainingsample-0.2.4}/.github/workflows/ci.yml

@@ -13,9 +13,6 @@ jobs:
   rust-tests:
     name: Rust Tests
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        rust: [stable, beta]
 
     steps:
     - uses: actions/checkout@v4
@@ -23,7 +20,7 @@ jobs:
     - name: Install OpenCV and LLVM dependencies
       run: |
         sudo apt-get update
-        sudo apt-get install -y pkg-config libopencv-dev clang libclang-dev llvm-dev
+        sudo apt-get install -y pkg-config clang libclang-dev llvm-dev wget cmake build-essential
         # Install LLVM 18 which has the proper libclang.so symlink
         sudo apt-get install -y llvm-18 llvm-18-dev llvm-18-tools libclang1-18 libclang-cpp18
         # Set environment variables for LLVM 18
@@ -34,10 +31,45 @@ jobs:
         ls -la /usr/lib/llvm-18/lib/libclang.so
         which llvm-config-18
 
+        # Build OpenCV 4.12 from source since Ubuntu 24.04 only has 4.6
+        echo "Building OpenCV 4.12 from source..."
+        cd /tmp
+        wget -q https://github.com/opencv/opencv/archive/4.12.0.tar.gz
+        tar -xzf 4.12.0.tar.gz
+        cd opencv-4.12.0
+        mkdir build
+        cd build
+        cmake \
+          -DCMAKE_BUILD_TYPE=RELEASE \
+          -DCMAKE_INSTALL_PREFIX=/usr/local \
+          -DWITH_CUDA=OFF \
+          -DWITH_OPENGL=OFF \
+          -DWITH_OPENCL=OFF \
+          -DWITH_TBB=OFF \
+          -DWITH_IPP=OFF \
+          -DWITH_1394=OFF \
+          -DWITH_V4L=OFF \
+          -DWITH_GTK=OFF \
+          -DBUILD_TESTS=OFF \
+          -DBUILD_PERF_TESTS=OFF \
+          -DBUILD_EXAMPLES=OFF \
+          -DBUILD_opencv_python2=OFF \
+          -DBUILD_opencv_python3=OFF \
+          -DBUILD_opencv_java=OFF \
+          -DOPENCV_GENERATE_PKGCONFIG=ON \
+          ..
+        make -j$(nproc)
+        sudo make install
+        sudo ldconfig
+
+        # Set OpenCV environment variables
+        echo "PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH" >> $GITHUB_ENV
+        echo "LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH" >> $GITHUB_ENV
+
     - name: Install Rust toolchain
       uses: dtolnay/rust-toolchain@master
       with:
-        toolchain: ${{ matrix.rust }}
+        toolchain: 1.85
         components: rustfmt, clippy
 
     - name: Cache cargo registry
@@ -83,7 +115,7 @@ jobs:
     - name: Install OpenCV and LLVM dependencies
       run: |
         sudo apt-get update
-        sudo apt-get install -y pkg-config libopencv-dev clang libclang-dev llvm-dev
+        sudo apt-get install -y pkg-config clang libclang-dev llvm-dev wget cmake build-essential
         # Install LLVM 18 which has the proper libclang.so symlink
         sudo apt-get install -y llvm-18 llvm-18-dev llvm-18-tools libclang1-18 libclang-cpp18
         # Set environment variables for LLVM 18
@@ -94,13 +126,51 @@ jobs:
         ls -la /usr/lib/llvm-18/lib/libclang.so
         which llvm-config-18
 
+        # Build OpenCV 4.12 from source since Ubuntu 24.04 only has 4.6
+        echo "Building OpenCV 4.12 from source..."
+        cd /tmp
+        wget -q https://github.com/opencv/opencv/archive/4.12.0.tar.gz
+        tar -xzf 4.12.0.tar.gz
+        cd opencv-4.12.0
+        mkdir build
+        cd build
+        cmake \
+          -DCMAKE_BUILD_TYPE=RELEASE \
+          -DCMAKE_INSTALL_PREFIX=/usr/local \
+          -DWITH_CUDA=OFF \
+          -DWITH_OPENGL=OFF \
+          -DWITH_OPENCL=OFF \
+          -DWITH_TBB=OFF \
+          -DWITH_IPP=OFF \
+          -DWITH_1394=OFF \
+          -DWITH_V4L=OFF \
+          -DWITH_GTK=OFF \
+          -DBUILD_TESTS=OFF \
+          -DBUILD_PERF_TESTS=OFF \
+          -DBUILD_EXAMPLES=OFF \
+          -DBUILD_opencv_python2=OFF \
+          -DBUILD_opencv_python3=OFF \
+          -DBUILD_opencv_java=OFF \
+          -DOPENCV_GENERATE_PKGCONFIG=ON \
+          ..
+        make -j$(nproc)
+        sudo make install
+        sudo ldconfig
+
+        # Set OpenCV environment variables
+        echo "PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH" >> $GITHUB_ENV
+        echo "LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH" >> $GITHUB_ENV
+
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
 
     - name: Install Rust toolchain
-      uses: dtolnay/rust-toolchain@stable
+      uses: dtolnay/rust-toolchain@master
+      with:
+        toolchain: 1.85
+        components: rustfmt, clippy
 
     - name: Install maturin (Linux/macOS)
       run: pip install maturin[patchelf]
@@ -136,7 +206,7 @@ jobs:
     - name: Install OpenCV and LLVM dependencies
       run: |
         sudo apt-get update
-        sudo apt-get install -y pkg-config libopencv-dev clang libclang-dev llvm-dev
+        sudo apt-get install -y pkg-config clang libclang-dev llvm-dev wget cmake build-essential
         # Install LLVM 18 which has the proper libclang.so symlink
         sudo apt-get install -y llvm-18 llvm-18-dev llvm-18-tools libclang1-18 libclang-cpp18
         # Set environment variables for LLVM 18
@@ -147,14 +217,50 @@ jobs:
         ls -la /usr/lib/llvm-18/lib/libclang.so
         which llvm-config-18
 
+        # Build OpenCV 4.12 from source since Ubuntu 24.04 only has 4.6
+        echo "Building OpenCV 4.12 from source..."
+        cd /tmp
+        wget -q https://github.com/opencv/opencv/archive/4.12.0.tar.gz
+        tar -xzf 4.12.0.tar.gz
+        cd opencv-4.12.0
+        mkdir build
+        cd build
+        cmake \
+          -DCMAKE_BUILD_TYPE=RELEASE \
+          -DCMAKE_INSTALL_PREFIX=/usr/local \
+          -DWITH_CUDA=OFF \
+          -DWITH_OPENGL=OFF \
+          -DWITH_OPENCL=OFF \
+          -DWITH_TBB=OFF \
+          -DWITH_IPP=OFF \
+          -DWITH_1394=OFF \
+          -DWITH_V4L=OFF \
+          -DWITH_GTK=OFF \
+          -DBUILD_TESTS=OFF \
+          -DBUILD_PERF_TESTS=OFF \
+          -DBUILD_EXAMPLES=OFF \
+          -DBUILD_opencv_python2=OFF \
+          -DBUILD_opencv_python3=OFF \
+          -DBUILD_opencv_java=OFF \
+          -DOPENCV_GENERATE_PKGCONFIG=ON \
+          ..
+        make -j$(nproc)
+        sudo make install
+        sudo ldconfig
+
+        # Set OpenCV environment variables
+        echo "PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH" >> $GITHUB_ENV
+        echo "LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH" >> $GITHUB_ENV
+
     - name: Set up Python
       uses: actions/setup-python@v4
       with:
         python-version: 3.11
 
     - name: Install Rust toolchain
-      uses: dtolnay/rust-toolchain@stable
+      uses: dtolnay/rust-toolchain@master
       with:
+        toolchain: 1.85
         components: rustfmt, clippy
 
     - name: Install cargo-audit
@@ -180,7 +286,7 @@ jobs:
       if: runner.os == 'Linux'
       run: |
         sudo apt-get update
-        sudo apt-get install -y pkg-config libopencv-dev clang libclang-dev llvm-dev
+        sudo apt-get install -y pkg-config clang libclang-dev llvm-dev wget cmake build-essential
         # Install LLVM 18 which has the proper libclang.so symlink
         sudo apt-get install -y llvm-18 llvm-18-dev llvm-18-tools libclang1-18 libclang-cpp18
         # Set environment variables for LLVM 18
@@ -191,6 +297,41 @@ jobs:
         ls -la /usr/lib/llvm-18/lib/libclang.so
         which llvm-config-18
 
+        # Build OpenCV 4.12 from source since Ubuntu 24.04 only has 4.6
+        echo "Building OpenCV 4.12 from source..."
+        cd /tmp
+        wget -q https://github.com/opencv/opencv/archive/4.12.0.tar.gz
+        tar -xzf 4.12.0.tar.gz
+        cd opencv-4.12.0
+        mkdir build
+        cd build
+        cmake \
+          -DCMAKE_BUILD_TYPE=RELEASE \
+          -DCMAKE_INSTALL_PREFIX=/usr/local \
+          -DWITH_CUDA=OFF \
+          -DWITH_OPENGL=OFF \
+          -DWITH_OPENCL=OFF \
+          -DWITH_TBB=OFF \
+          -DWITH_IPP=OFF \
+          -DWITH_1394=OFF \
+          -DWITH_V4L=OFF \
+          -DWITH_GTK=OFF \
+          -DBUILD_TESTS=OFF \
+          -DBUILD_PERF_TESTS=OFF \
+          -DBUILD_EXAMPLES=OFF \
+          -DBUILD_opencv_python2=OFF \
+          -DBUILD_opencv_python3=OFF \
+          -DBUILD_opencv_java=OFF \
+          -DOPENCV_GENERATE_PKGCONFIG=ON \
+          ..
+        make -j$(nproc)
+        sudo make install
+        sudo ldconfig
+
+        # Set OpenCV environment variables
+        echo "PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH" >> $GITHUB_ENV
+        echo "LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH" >> $GITHUB_ENV
+
 
 
     - name: Set up Python
@@ -199,7 +340,9 @@ jobs:
         python-version: 3.11
 
     - name: Install Rust toolchain
-      uses: dtolnay/rust-toolchain@stable
+      uses: dtolnay/rust-toolchain@master
+      with:
+        toolchain: 1.85
 
     - name: Install maturin (Linux/macOS)
       run: pip install maturin[patchelf]

{trainingsample-0.2.2 → trainingsample-0.2.4}/.github/workflows/publish.yml

@@ -8,10 +8,20 @@ on:
 
 jobs:
   linux:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        target: [x86_64]
+        include:
+          # Ubuntu 22.04 (libc 2.35)
+          - os: ubuntu-22.04
+            target: x86_64
+            manylinux: manylinux_2_35
+            python-versions: '["3.11", "3.12"]'
+          # Ubuntu 24.04 (libc 2.38) 
+          - os: ubuntu-24.04
+            target: x86_64
+            manylinux: manylinux_2_38
+            python-versions: '["3.11", "3.12"]'
     steps:
     - uses: actions/checkout@v4
     - uses: actions/setup-python@v5
@@ -23,40 +33,67 @@ jobs:
       uses: actions/cache@v4
       with:
         path: third_party/opencv-static
-        key: opencv-static-4.12.0-manylinux-linux-${{ runner.os }}-${{ runner.arch }}
+        key: opencv-static-4.12.0-no-itt-linux-${{ matrix.os }}-${{ runner.arch }}-${{ matrix.manylinux }}
 
     - name: Install build dependencies
       run: |
+        # Completely remove needrestart to eliminate hanging prompts
+        sudo apt-get remove -y needrestart || true
+        export DEBIAN_FRONTEND=noninteractive
+        
         sudo apt-get update
-        # Install LLVM for opencv-rust bindings codegen (no need for system OpenCV anymore)
-        sudo apt-get install -y clang libclang-dev llvm-dev cmake curl
-        sudo apt-get install -y llvm-18 llvm-18-dev llvm-18-tools libclang1-18 libclang-cpp18
-        # Set environment variables for LLVM 18
-        echo "LIBCLANG_PATH=/usr/lib/llvm-18/lib" >> $GITHUB_ENV
-        echo "LLVM_CONFIG_PATH=/usr/bin/llvm-config-18" >> $GITHUB_ENV
-        echo "LD_LIBRARY_PATH=/usr/lib/llvm-18/lib:$LD_LIBRARY_PATH" >> $GITHUB_ENV
+        # Install basic LLVM for opencv-rust bindings codegen
+        sudo apt-get install -y clang libclang-dev llvm-dev cmake curl wget software-properties-common
+        
+        # For Ubuntu 22.04, use the default LLVM 14 instead of PPA to avoid restart issues
+        if [ "${{ matrix.os }}" = "ubuntu-22.04" ]; then
+          echo "Using default LLVM 14 for Ubuntu 22.04"
+          sudo apt-get install -y llvm-14 llvm-14-dev llvm-14-tools libclang-14-dev
+          echo "LLVM_CONFIG_PATH=/usr/bin/llvm-config-14" >> $GITHUB_ENV
+        else
+          # Ubuntu 24.04 has LLVM 18 by default
+          sudo apt-get install -y llvm-18 llvm-18-dev llvm-18-tools libclang1-18 libclang-cpp18
+          echo "LLVM_CONFIG_PATH=/usr/bin/llvm-config-18" >> $GITHUB_ENV
+        fi
+        
+        # Find the correct libclang.so path and set environment variables (search only LLVM directories)
+        if [ "${{ matrix.os }}" = "ubuntu-22.04" ]; then
+          LIBCLANG_PATH="/usr/lib/llvm-14/lib"
+        else
+          LIBCLANG_PATH="/usr/lib/llvm-18/lib"
+        fi
+        
+        # Verify the file exists at the expected location
+        if [ ! -f "$LIBCLANG_PATH/libclang.so" ]; then
+          # Fallback to targeted search if expected location doesn't exist
+          LIBCLANG_PATH=$(find /usr/lib/llvm* -name "libclang.so" 2>/dev/null | head -1 | xargs dirname)
+        fi
+        
+        echo "LIBCLANG_PATH=$LIBCLANG_PATH" >> $GITHUB_ENV
+        echo "LD_LIBRARY_PATH=$LIBCLANG_PATH:$LD_LIBRARY_PATH" >> $GITHUB_ENV
         # Verify the key files exist
-        ls -la /usr/lib/llvm-18/lib/libclang.so
-        which llvm-config-18
+        echo "Using libclang.so at: $LIBCLANG_PATH/libclang.so"
+        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
 
-    - name: Build wheels
+    - name: Build wheels for multiple Python versions
       uses: PyO3/maturin-action@v1
       with:
         target: ${{ matrix.target }}
-        args: --release --out dist --find-interpreter --no-default-features --features python-bindings,simd,opencv
+        args: --release --out dist --no-default-features --features python-bindings,simd,opencv
         sccache: 'false'
         container: off
+        manylinux: ${{ matrix.manylinux }}
       env:
         # Use stable ABI for forward compatibility
         PYO3_USE_ABI3_FORWARD_COMPATIBILITY: '1'
         # LLVM for opencv-rust bindings (from earlier install step)
-        LIBCLANG_PATH: /usr/lib/llvm-18/lib
-        LLVM_CONFIG_PATH: /usr/bin/llvm-config-18
+        LIBCLANG_PATH: ${{ env.LIBCLANG_PATH }}
+        LLVM_CONFIG_PATH: ${{ env.LLVM_CONFIG_PATH }}
         # 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
@@ -66,7 +103,7 @@ jobs:
     - name: Upload wheels
       uses: actions/upload-artifact@v4
       with:
-        name: wheels-linux-${{ matrix.target }}
+        name: wheels-linux-${{ matrix.os }}-${{ matrix.target }}
         path: dist
 
 
@@ -86,7 +123,7 @@ jobs:
       uses: actions/cache@v4
       with:
         path: third_party/opencv-static
-        key: opencv-static-4.12.0-v2-macos-${{ runner.os }}-${{ runner.arch }}
+        key: opencv-static-4.12.0-no-itt-macos-${{ runner.os }}-${{ runner.arch }}
 
     - name: Install build dependencies
       run: |
@@ -147,6 +184,17 @@ jobs:
         pattern: wheels-*
         merge-multiple: true
         path: dist
+    - name: List built wheels
+      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: Publish to PyPI
       uses: pypa/gh-action-pypi-publish@v1.12.4
       with:

{trainingsample-0.2.2 → trainingsample-0.2.4}/Cargo.lock

@@ -1703,7 +1703,7 @@ dependencies = [
 
 [[package]]
 name = "trainingsample"
-version = "0.2.2"
+version = "0.2.4"
 dependencies = [
  "anyhow",
  "criterion",

{trainingsample-0.2.2 → trainingsample-0.2.4}/Cargo.toml

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

{trainingsample-0.2.2 → trainingsample-0.2.4}/PKG-INFO

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

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

trainingsample-0.2.4/rust-toolchain.toml

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

{trainingsample-0.2.2 → trainingsample-0.2.4}/scripts/build-opencv-static.sh

@@ -52,6 +52,7 @@ cmake -S "opencv-${OPENCV_VERSION}" \
       -DWITH_V4L=OFF \
       -DWITH_GTK=OFF \
       -DWITH_QT=OFF \
+      -DWITH_ITT=OFF \
       -DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}"
 
 # Build opencv_world (single unified library)

{trainingsample-0.2.2 → trainingsample-0.2.4}/src/opencv_ops.rs

@@ -3,7 +3,7 @@ use ndarray::{Array3, ArrayView3};
 
 #[cfg(feature = "opencv")]
 use opencv::{
-    core::Mat,
+    core::{AlgorithmHint, Mat},
     imgproc::{cvt_color, resize, COLOR_RGB2GRAY, INTER_LANCZOS4},
     prelude::*,
 };
@@ -169,23 +169,12 @@ impl OpenCVBatchProcessor {
 
         // Convert to grayscale using OpenCV's optimized implementation
         let mut gray_mat = Mat::default();
-        // Different OpenCV versions have different cvt_color signatures
-        #[cfg(target_os = "macos")]
         cvt_color(
             &src_mat,
             &mut gray_mat,
             COLOR_RGB2GRAY,
             0,
-            opencv::core::AlgorithmHint::ALGO_HINT_DEFAULT,
-        )?;
-
-        #[cfg(not(target_os = "macos"))]
-        cvt_color(
-            &src_mat,
-            &mut gray_mat,
-            COLOR_RGB2GRAY,
-            0,
-            opencv::core::AlgorithmHint::ALGO_HINT_DEFAULT,
+            AlgorithmHint::ALGO_HINT_ACCURATE,
         )?;
 
         // Calculate mean (luminance)

{trainingsample-0.2.2 → trainingsample-0.2.4}/src/true_batch_ops.rs

@@ -4,7 +4,7 @@ use rayon::prelude::*;
 
 #[cfg(feature = "opencv")]
 use opencv::{
-    core::Mat,
+    core::{AlgorithmHint, Mat},
     imgproc::{resize, INTER_CUBIC, INTER_LANCZOS4, INTER_LINEAR, INTER_NEAREST},
     prelude::*,
 };
@@ -273,21 +273,12 @@ impl TrueBatchProcessor {
             };
 
             // OpenCV writes directly into our result array!
-            #[cfg(target_os = "macos")]
             cvt_color(
                 &src_mats[i],
                 &mut dst_mat,
                 opencv_code,
                 0,
-                opencv::core::AlgorithmHint::ALGO_HINT_DEFAULT,
-            )?;
-            #[cfg(not(target_os = "macos"))]
-            cvt_color(
-                &src_mats[i],
-                &mut dst_mat,
-                opencv_code,
-                0,
-                opencv::core::AlgorithmHint::ALGO_HINT_DEFAULT,
+                AlgorithmHint::ALGO_HINT_ACCURATE,
             )?;
 
             results.push(result);