trainingsample 0.2.14__tar.gz → 0.2.16__tar.gz

{trainingsample-0.2.14 → trainingsample-0.2.16}/.github/workflows/ci.yml

@@ -2,9 +2,10 @@ name: CI
 
 on:
   push:
-    branches: [ main, develop ]
+    branches: [ main, develop, 'build/*' ]
   pull_request:
     branches: [ main ]
+  workflow_dispatch:
 
 env:
   CARGO_TERM_COLOR: always
@@ -375,3 +376,81 @@ jobs:
       with:
         name: wheels-${{ matrix.os }}
         path: dist/
+
+  build-wheels-aarch64:
+    name: Build wheels (Linux aarch64)
+    runs-on: ubuntu-24.04-arm
+    strategy:
+      matrix:
+        python-version: ["3.11", "3.12", "3.13"]
+
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Install OpenCV and LLVM dependencies
+      run: |
+        sudo apt-get update
+        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
+        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
+
+        # Build OpenCV 4.12 from source
+        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@master
+      with:
+        toolchain: 1.89
+
+    - name: Install maturin
+      run: pip install maturin[patchelf]
+
+    - name: Build wheels
+      run: maturin build --release --out dist --no-default-features --features python-bindings,simd,opencv
+
+    - name: Upload wheels
+      uses: actions/upload-artifact@v4
+      with:
+        name: wheels-linux-aarch64-py${{ matrix.python-version }}
+        path: dist/

{trainingsample-0.2.14 → trainingsample-0.2.16}/.github/workflows/publish.yml

@@ -131,6 +131,87 @@ jobs:
         path: dist
 
 
+  linux-aarch64:
+    runs-on: ubuntu-24.04-arm
+    strategy:
+      matrix:
+        python: ['3.11', '3.12', '3.13']
+    steps:
+    - uses: actions/checkout@v4
+    - uses: actions/setup-python@v5
+      with:
+        python-version: ${{ matrix.python }}
+
+    - name: Cache static OpenCV
+      id: cache-opencv
+      uses: actions/cache@v4
+      with:
+        path: third_party/opencv-static
+        key: opencv-static-4.12.0-codecs-jasper-ffmpeg-no-itt-no-openjpeg-linux-aarch64-${{ runner.arch }}-manylinux_2_39
+
+    - name: Install build dependencies
+      run: |
+        export DEBIAN_FRONTEND=noninteractive
+
+        sudo apt-get update
+        # Install basic LLVM for opencv-rust bindings codegen
+        sudo apt-get install -y clang libclang-dev llvm-dev cmake curl wget nasm yasm pkg-config
+
+        # 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
+
+        LIBCLANG_PATH="/usr/lib/llvm-18/lib"
+
+        # 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
+        echo "Using libclang.so at: $LIBCLANG_PATH/libclang.so"
+
+    - name: Build static OpenCV
+      run: |
+        ./scripts/build-opencv-static.sh
+
+    - name: Build wheels
+      uses: PyO3/maturin-action@v1
+      with:
+        target: aarch64
+        args: --release --out dist --no-default-features --features python-bindings,simd,opencv
+        sccache: 'false'
+        container: off
+        manylinux: manylinux_2_39
+      env:
+        # Use stable ABI for forward compatibility
+        PYO3_USE_ABI3_FORWARD_COMPATIBILITY: '1'
+        # LLVM for opencv-rust bindings (from earlier install step)
+        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
+        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-aarch64-py${{ matrix.python }}
+        path: dist
+
   macos:
     runs-on: macos-latest
     strategy:
@@ -205,7 +286,7 @@ jobs:
 
   smoketest:
     runs-on: ${{ matrix.os }}
-    needs: [linux, macos]
+    needs: [linux, linux-aarch64, macos]
     strategy:
       matrix:
         include:
@@ -214,43 +295,69 @@ jobs:
             target: x86_64
             manylinux: manylinux_2_35
             python: '3.11'
+            artifact_name: wheels-ubuntu-22.04-x86_64-py3.11
           - os: ubuntu-22.04
             target: x86_64
             manylinux: manylinux_2_35
             python: '3.12'
+            artifact_name: wheels-ubuntu-22.04-x86_64-py3.12
           - os: ubuntu-22.04
             target: x86_64
             manylinux: manylinux_2_35
             python: '3.13'
+            artifact_name: wheels-ubuntu-22.04-x86_64-py3.13
           # Ubuntu 24.04 (libc 2.39)
           - os: ubuntu-24.04
             target: x86_64
             manylinux: manylinux_2_39
             python: '3.11'
+            artifact_name: wheels-ubuntu-24.04-x86_64-py3.11
           - os: ubuntu-24.04
             target: x86_64
             manylinux: manylinux_2_39
             python: '3.12'
+            artifact_name: wheels-ubuntu-24.04-x86_64-py3.12
           - os: ubuntu-24.04
             target: x86_64
             manylinux: manylinux_2_39
             python: '3.13'
+            artifact_name: wheels-ubuntu-24.04-x86_64-py3.13
+          # Linux aarch64 (DGX Spark / GB10)
+          - os: ubuntu-24.04-arm
+            target: aarch64
+            manylinux: manylinux_2_39
+            python: '3.11'
+            artifact_name: wheels-linux-aarch64-py3.11
+          - os: ubuntu-24.04-arm
+            target: aarch64
+            manylinux: manylinux_2_39
+            python: '3.12'
+            artifact_name: wheels-linux-aarch64-py3.12
+          - os: ubuntu-24.04-arm
+            target: aarch64
+            manylinux: manylinux_2_39
+            python: '3.13'
+            artifact_name: wheels-linux-aarch64-py3.13
+          # macOS aarch64
           - os: macos-latest
             target: aarch64
             manylinux: ''
             python: '3.11'
+            artifact_name: wheels-macos-latest-aarch64-py3.11
           - os: macos-latest
             target: aarch64
             manylinux: ''
             python: '3.12'
+            artifact_name: wheels-macos-latest-aarch64-py3.12
           - os: macos-latest
             target: aarch64
             manylinux: ''
             python: '3.13'
+            artifact_name: wheels-macos-latest-aarch64-py3.13
     steps:
     - uses: actions/download-artifact@v4
       with:
-        pattern: wheels-${{ matrix.os }}-${{ matrix.target }}-py${{ matrix.python }}
+        pattern: ${{ matrix.artifact_name }}
         path: dist
     - uses: actions/setup-python@v5
       with:

{trainingsample-0.2.14 → trainingsample-0.2.16}/Cargo.lock

@@ -1748,7 +1748,7 @@ dependencies = [
 
 [[package]]
 name = "trainingsample"
-version = "0.2.14"
+version = "0.2.16"
 dependencies = [
  "anyhow",
  "criterion",
@@ -2096,9 +2096,9 @@ dependencies = [
 
 [[package]]
 name = "zmij"
-version = "1.0.15"
+version = "1.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94f63c051f4fe3c1509da62131a678643c5b6fbdc9273b2b79d4378ebda003d2"
+checksum = "dfcd145825aace48cff44a8844de64bf75feec3080e0aa5cdbde72961ae51a65"
 
 [[package]]
 name = "zune-core"

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

{trainingsample-0.2.14 → trainingsample-0.2.16}/PKG-INFO

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

{trainingsample-0.2.14 → trainingsample-0.2.16}/pyproject.toml

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

{trainingsample-0.2.14 → trainingsample-0.2.16}/scripts/build-opencv-static.sh

@@ -179,8 +179,10 @@ CMAKE_ARGS=(
     -DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}"
 )
 
-if [[ "$(uname)" == "Darwin" ]]; then
-    echo "Detected macOS host; disabling Carotene to avoid linking issue."
+# Disable Carotene (ARM NEON optimizations) to avoid undefined symbol errors
+# when statically linking. Carotene requires runtime library that isn't bundled.
+if [[ "$(uname)" == "Darwin" ]] || [[ "$(uname -m)" == "aarch64" ]] || [[ "$(uname -m)" == "arm64" ]]; then
+    echo "Detected ARM host; disabling Carotene to avoid linking issue."
     CMAKE_ARGS+=(
         -DWITH_CAROTENE=OFF
     )