PyPI - trainingsample - Versions diffs - 0.2.2__tar.gz → 0.2.3__tar.gz - Mend

trainingsample 0.2.2tar.gz → 0.2.3tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (40) hide show

{trainingsample-0.2.2 → trainingsample-0.2.3}/.github/workflows/ci.yml RENAMED Viewed

@@ -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.3}/.github/workflows/publish.yml RENAMED Viewed

@@ -23,7 +23,7 @@ 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-${{ runner.os }}-${{ runner.arch }}
     - name: Install build dependencies
       run: |
@@ -86,7 +86,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: |

{trainingsample-0.2.2 → trainingsample-0.2.3}/Cargo.lock RENAMED Viewed

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

{trainingsample-0.2.2 → trainingsample-0.2.3}/Cargo.toml RENAMED Viewed

@@ -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.1"
 readme = "README.md"
 [profile.release]

{trainingsample-0.2.2 → trainingsample-0.2.3}/PKG-INFO RENAMED Viewed

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

{trainingsample-0.2.2 → trainingsample-0.2.3}/pyproject.toml RENAMED Viewed

@@ -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.3"
 [project.optional-dependencies]
 dev = ["pytest>=6.0", "pytest-benchmark", "maturin>=1.0,<2.0", "pre-commit"]

trainingsample-0.2.3/rust-toolchain.toml ADDED Viewed

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

{trainingsample-0.2.2 → trainingsample-0.2.3}/scripts/build-opencv-static.sh RENAMED Viewed

@@ -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.3}/src/opencv_ops.rs RENAMED Viewed

@@ -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.3}/src/true_batch_ops.rs RENAMED Viewed

@@ -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);