trainingsample 0.2.0__tar.gz → 0.2.2__tar.gz

trainingsample-0.2.2/.cargo/config.toml

@@ -0,0 +1,7 @@
+# Cargo configuration for OpenCV linking
+#
+# Default: Uses system OpenCV (for CI and local development)
+# Release builds: Override with static linking via workflow env vars
+
+# This file is intentionally minimal - it lets opencv-rust probe the system.
+# The release workflow sets OPENCV_* env vars to force static linking.

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

@@ -4,6 +4,7 @@ on:
   push:
     tags:
       - 'v*'
+  workflow_dispatch:
 
 jobs:
   linux:
@@ -17,11 +18,18 @@ jobs:
       with:
         python-version: '3.11'
 
-    - name: Install OpenCV and LLVM dependencies
+    - name: Cache static OpenCV
+      id: cache-opencv
+      uses: actions/cache@v4
+      with:
+        path: third_party/opencv-static
+        key: opencv-static-4.12.0-manylinux-linux-${{ runner.os }}-${{ runner.arch }}
+
+    - name: Install build dependencies
       run: |
         sudo apt-get update
-        sudo apt-get install -y pkg-config libopencv-dev clang libclang-dev llvm-dev
-        # Install LLVM 18 which has the proper libclang.so symlink
+        # 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
@@ -31,16 +39,29 @@ jobs:
         ls -la /usr/lib/llvm-18/lib/libclang.so
         which llvm-config-18
 
+    - name: Build static OpenCV
+      if: steps.cache-opencv.outputs.cache-hit != 'true'
+      run: |
+        ./scripts/build-opencv-static.sh
+
     - name: Build wheels
       uses: PyO3/maturin-action@v1
       with:
         target: ${{ matrix.target }}
-        args: --release --out dist --find-interpreter --zig --no-default-features --features python-bindings,simd,opencv
-        sccache: 'true'
-        manylinux: auto
+        args: --release --out dist --find-interpreter --no-default-features --features python-bindings,simd,opencv
+        sccache: 'false'
+        container: off
       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
+        # 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_DISABLE_PROBES: pkg_config,cmake,vcpkg,vcpkg_cmake
 
     - name: Upload wheels
       uses: actions/upload-artifact@v4
@@ -60,28 +81,41 @@ jobs:
       with:
         python-version: '3.11'
 
-    - name: Install OpenCV (macOS)
+    - name: Cache static OpenCV
+      id: cache-opencv
+      uses: actions/cache@v4
+      with:
+        path: third_party/opencv-static
+        key: opencv-static-4.12.0-v2-macos-${{ runner.os }}-${{ runner.arch }}
+
+    - name: Install build dependencies
       run: |
-        # Install OpenCV and LLVM via Homebrew
-        brew install opencv llvm
+        # Install LLVM for opencv-rust bindings codegen (no need for system OpenCV anymore)
+        brew install llvm cmake
         # Set up LLVM environment for opencv-rust bindings (keg-only installation)
         echo "LIBCLANG_PATH=/opt/homebrew/opt/llvm/lib" >> $GITHUB_ENV
         echo "LLVM_CONFIG_PATH=/opt/homebrew/opt/llvm/bin/llvm-config" >> $GITHUB_ENV
         echo "DYLD_LIBRARY_PATH=/opt/homebrew/opt/llvm/lib:$DYLD_LIBRARY_PATH" >> $GITHUB_ENV
-        # Set up OpenCV environment
-        echo "OPENCV_LINK_LIBS=opencv_calib3d,opencv_core,opencv_dnn,opencv_features2d,opencv_flann,opencv_highgui,opencv_imgcodecs,opencv_imgproc,opencv_ml,opencv_objdetect,opencv_photo,opencv_stitching,opencv_video,opencv_videoio" >> $GITHUB_ENV
-        echo "OPENCV_LINK_PATHS=/opt/homebrew/lib" >> $GITHUB_ENV
-        echo "OPENCV_INCLUDE_PATHS=/opt/homebrew/include/opencv4" >> $GITHUB_ENV
+
+    - name: Build static OpenCV
+      if: steps.cache-opencv.outputs.cache-hit != 'true'
+      run: |
+        ./scripts/build-opencv-static.sh
 
     - name: Build wheels
       uses: PyO3/maturin-action@v1
       with:
         target: ${{ matrix.target }}
         args: --release --out dist --find-interpreter --no-default-features --features python-bindings,simd,opencv,metal
-        sccache: 'true'
+        sccache: 'false'
       env:
         # Use stable ABI for forward compatibility
         PYO3_USE_ABI3_FORWARD_COMPATIBILITY: '1'
+        # 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_DISABLE_PROBES: pkg_config,cmake,vcpkg,vcpkg_cmake
     - name: Upload wheels
       uses: actions/upload-artifact@v4
       with:

{trainingsample-0.2.0 → trainingsample-0.2.2}/.gitignore

@@ -49,6 +49,10 @@ Thumbs.db
 target/
 Cargo.lock
 
+# Static OpenCV bundle (built in CI, not committed)
+third_party/
+opencv-build-tmp/
+
 files.tbz
 */config/auth.json
 work