Add decrypt_vv_model

qryxip · May 2, 2024 · 05c0fe1 · 05c0fe1
1 parent 34122aa
commit 05c0fe1
Showing 1 changed file with 64 additions and 22 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -36,7 +36,7 @@ jobs:
         include:
           - artifact_name: onnxruntime-win-x64
             os: windows-2022
-            build_opts: --cmake_extra_defines CMAKE_SYSTEM_NAME=Windows CMAKE_SYSTEM_PROCESSOR=x86_64 --config Release --parallel --compile_no_warning_as_error --update --build --build_shared_lib
+            build_opts: --cmake_extra_defines CMAKE_SYSTEM_NAME=Windows CMAKE_SYSTEM_PROCESSOR=x86_64 Rust_CARGO_TARGET=x86_64-pc-windows-msvc --config Release --parallel --compile_no_warning_as_error --update --build --build_shared_lib
             result_dir: build/Release
             release_config: Release
           - artifact_name: onnxruntime-win-x64-gpu
@@ -45,25 +45,25 @@ jobs:
             # Windowsの場合デフォルトのパッケージ群では不十分であるため、必要そうなパッケージを指定する。ただしいくつかは不要かもしれない
             cuda_sub_packages: '["cudart", "cuobjdump", "nvcc", "nvdisasm", "thrust", "cublas_dev", "cufft_dev", "curand_dev", "cusolver_dev", "cusparse_dev", "visual_studio_integration"]'
             cudnn_url: https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/windows-x86_64/cudnn-windows-x86_64-8.9.2.26_cuda12-archive.zip
-            build_opts: --cmake_extra_defines CMAKE_SYSTEM_NAME=Windows CMAKE_SYSTEM_PROCESSOR=x86_64 --config Release --parallel --compile_no_warning_as_error --update --build --build_shared_lib --use_dml --use_cuda --cuda_version 12.2
+            build_opts: --cmake_extra_defines CMAKE_SYSTEM_NAME=Windows CMAKE_SYSTEM_PROCESSOR=x86_64 Rust_CARGO_TARGET=x86_64-pc-windows-msvc --config Release --parallel --compile_no_warning_as_error --update --build --build_shared_lib --use_dml --use_cuda --cuda_version 12.2
             result_dir: build/Release
             release_config: Release
           - artifact_name: onnxruntime-win-x86
             os: windows-2022
-            build_opts: --x86 --cmake_extra_defines CMAKE_SYSTEM_NAME=Windows CMAKE_SYSTEM_PROCESSOR=x86 --config Release --parallel --compile_no_warning_as_error --update --build --build_shared_lib
+            build_opts: --x86 --cmake_extra_defines CMAKE_SYSTEM_NAME=Windows CMAKE_SYSTEM_PROCESSOR=x86 Rust_CARGO_TARGET=i686-pc-windows-msvc --config Release --parallel --compile_no_warning_as_error --update --build --build_shared_lib
             result_dir: build/Release
             release_config: Release
           - artifact_name: onnxruntime-linux-x64
             os: ubuntu-20.04
-            build_opts: --cmake_extra_defines CMAKE_SYSTEM_NAME=Linux CMAKE_SYSTEM_PROCESSOR=x86_64 --config Release --parallel --compile_no_warning_as_error --update --build --build_shared_lib
+            build_opts: --cmake_extra_defines CMAKE_SYSTEM_NAME=Linux CMAKE_SYSTEM_PROCESSOR=x86_64 Rust_CARGO_TARGET=x86_64-unknown-linux-gnu --config Release --parallel --compile_no_warning_as_error --update --build --build_shared_lib
             result_dir: build
             release_config: Release
           - artifact_name: onnxruntime-linux-x64-gpu
             os: ubuntu-20.04
             cuda_version: 12.2.2
             cuda_sub_packages: "[]" # デフォルト
             cudnn_url: https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.9.2.26_cuda12-archive.tar.xz
-            build_opts: --cmake_extra_defines CMAKE_SYSTEM_NAME=Linux CMAKE_SYSTEM_PROCESSOR=x86_64 --config Release --parallel --compile_no_warning_as_error --update --build --build_shared_lib --use_cuda
+            build_opts: --cmake_extra_defines CMAKE_SYSTEM_NAME=Linux CMAKE_SYSTEM_PROCESSOR=x86_64 Rust_CARGO_TARGET=x86_64-unknown-linux-gnu --config Release --parallel --compile_no_warning_as_error --update --build --build_shared_lib --use_cuda
             result_dir: build
             release_config: Release
           - artifact_name: onnxruntime-linux-armhf
@@ -72,7 +72,7 @@ jobs:
             cxx_version: "10"
             linux_cross_arch: arm-linux-gnueabihf
             symlink_workaround: true
-            build_opts: --arm --cmake_extra_defines CMAKE_SYSTEM_NAME=Linux CMAKE_SYSTEM_PROCESSOR=armv7l --config Release --parallel --compile_no_warning_as_error --update --build --build_shared_lib
+            build_opts: --arm --cmake_extra_defines CMAKE_SYSTEM_NAME=Linux CMAKE_SYSTEM_PROCESSOR=armv7l Rust_CARGO_TARGET=armv7-unknown-linux-gnueabihf --config Release --parallel --compile_no_warning_as_error --update --build --build_shared_lib
             result_dir: build
             release_config: Release
           - artifact_name: onnxruntime-linux-arm64
@@ -81,45 +81,45 @@ jobs:
             cxx_version: "10"
             linux_cross_arch: aarch64-linux-gnu
             symlink_workaround: true
-            build_opts: --arm64 --cmake_extra_defines CMAKE_SYSTEM_NAME=Linux CMAKE_SYSTEM_PROCESSOR=aarch64 --config Release --parallel --compile_no_warning_as_error --update --build --build_shared_lib
+            build_opts: --arm64 --cmake_extra_defines CMAKE_SYSTEM_NAME=Linux CMAKE_SYSTEM_PROCESSOR=aarch64 Rust_CARGO_TARGET=aarch64-unknown-linux-gnu --config Release --parallel --compile_no_warning_as_error --update --build --build_shared_lib
             result_dir: build
             release_config: Release
           - artifact_name: onnxruntime-osx-arm64
             os: macos-11
-            build_opts: --cmake_extra_defines CMAKE_SYSTEM_NAME=Darwin CMAKE_OSX_ARCHITECTURES=arm64 --config Release --parallel --compile_no_warning_as_error --update --build --build_shared_lib
+            build_opts: --cmake_extra_defines CMAKE_SYSTEM_NAME=Darwin CMAKE_OSX_ARCHITECTURES=arm64 Rust_CARGO_TARGET=aarch64-apple-darwin --config Release --parallel --compile_no_warning_as_error --update --build --build_shared_lib
             result_dir: build
             release_config: Release
           - artifact_name: onnxruntime-osx-x86_64
             os: macos-11
-            build_opts: --cmake_extra_defines CMAKE_SYSTEM_NAME=Darwin CMAKE_OSX_ARCHITECTURES=x86_64 --config Release --parallel --compile_no_warning_as_error --update --build --build_shared_lib
+            build_opts: --cmake_extra_defines CMAKE_SYSTEM_NAME=Darwin CMAKE_OSX_ARCHITECTURES=x86_64 Rust_CARGO_TARGET=x86_64-apple-darwin --config Release --parallel --compile_no_warning_as_error --update --build --build_shared_lib
             result_dir: build
             release_config: Release
           - artifact_name: onnxruntime-android-x64
             os: ubuntu-20.04
-            build_opts: --android_abi x86_64 --cmake_extra_defines CMAKE_SYSTEM_NAME=Android CMAKE_SYSTEM_PROCESSOR=x86_64 --config Release --parallel --compile_no_warning_as_error --update --build --build_shared_lib --android
+            build_opts: --android_abi x86_64 --cmake_generator Ninja --cmake_extra_defines CMAKE_SYSTEM_NAME=Android CMAKE_SYSTEM_PROCESSOR=x86_64 Rust_CARGO_TARGET=x86_64-linux-android --config Release --parallel --compile_no_warning_as_error --update --build --build_shared_lib --android
             result_dir: build
             release_config: Release
           - artifact_name: onnxruntime-android-arm64
             os: ubuntu-20.04
-            build_opts: --android_abi arm64-v8a --cmake_extra_defines CMAKE_SYSTEM_NAME=Android CMAKE_SYSTEM_PROCESSOR=aarch64 --config Release --parallel --compile_no_warning_as_error --update --build --build_shared_lib --android
+            build_opts: --android_abi arm64-v8a --cmake_generator Ninja --cmake_extra_defines CMAKE_SYSTEM_NAME=Android CMAKE_SYSTEM_PROCESSOR=aarch64 Rust_CARGO_TARGET=aarch64-linux-android --config Release --parallel --compile_no_warning_as_error --update --build --build_shared_lib --android
             result_dir: build
             release_config: Release
           - artifact_name: onnxruntime-ios-arm64
-            os: macos-12
-            build_opts: --config Release --parallel --compile_no_warning_as_error --update --build --build_shared_lib --skip_tests --use_xcode --ios --apple_sysroot iphoneos --osx_arch arm64 --apple_deploy_target 16.0
-            build_opts_workaround_protoc: --path_to_protoc_exe /usr/local/opt/protobuf@21/bin/protoc
+            os: macos-14
+            build_opts: --cmake_extra_defines CMAKE_SYSTEM_NAME=iOS Rust_CARGO_TARGET=aarch64-apple-ios --config Release --parallel --compile_no_warning_as_error --update --build --build_shared_lib --skip_tests --use_xcode --ios --apple_sysroot iphoneos --osx_arch arm64 --apple_deploy_target 16.0
+            build_opts_workaround_protoc: --path_to_protoc_exe /opt/homebrew/opt/protobuf@21/bin/protoc
             result_dir: build/Release
             release_config: Release-iphoneos
           - artifact_name: onnxruntime-ios-sim-arm64
-            os: macos-12
-            build_opts: --config Release --parallel --compile_no_warning_as_error --update --build --build_shared_lib --skip_tests --use_xcode --ios --apple_sysroot iphonesimulator --osx_arch arm64 --apple_deploy_target 16.0
-            build_opts_workaround_protoc: --path_to_protoc_exe /usr/local/opt/protobuf@21/bin/protoc
+            os: macos-14
+            build_opts: --cmake_extra_defines CMAKE_SYSTEM_NAME=iOS Rust_CARGO_TARGET=aarch64-apple-ios-sim --config Release --parallel --compile_no_warning_as_error --update --build --build_shared_lib --skip_tests --use_xcode --ios --apple_sysroot iphonesimulator --osx_arch arm64 --apple_deploy_target 16.0
+            build_opts_workaround_protoc: --path_to_protoc_exe /opt/homebrew/opt/protobuf@21/bin/protoc
             result_dir: build/Release
             release_config: Release-iphonesimulator
           - artifact_name: onnxruntime-ios-sim-x86_64
-            os: macos-12
-            build_opts: --config Release --parallel --compile_no_warning_as_error --update --build --build_shared_lib --skip_tests --use_xcode --ios --apple_sysroot iphonesimulator --osx_arch x86_64 --apple_deploy_target 16.0
-            build_opts_workaround_protoc: --path_to_protoc_exe /usr/local/opt/protobuf@21/bin/protoc
+            os: macos-14
+            build_opts: --cmake_extra_defines CMAKE_SYSTEM_NAME=iOS Rust_CARGO_TARGET=x86_64-apple-ios --config Release --parallel --compile_no_warning_as_error --update --build --build_shared_lib --skip_tests --use_xcode --ios --apple_sysroot iphonesimulator --osx_arch x86_64 --apple_deploy_target 16.0
+            build_opts_workaround_protoc: --path_to_protoc_exe /opt/homebrew/opt/protobuf@21/bin/protoc
             result_dir: build/Release
             release_config: Release-iphonesimulator
 
@@ -149,9 +149,9 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
         with:
-          repository: microsoft/onnxruntime
+          repository: qryxip/onnxruntime
           submodules: true
-          ref: v${{ env.ONNXRUNTIME_VERSION }}
+          ref: a8f514cf765ed9648d93bc4c6ac35c7abef8f182
       - name: Checkout builder
         uses: actions/checkout@v4
         with:
@@ -174,6 +174,14 @@ jobs:
           key: ${{ matrix.artifact_name }}-v${{ env.ONNXRUNTIME_VERSION }}-cache-${{ hashFiles('matrix.json') }}
 
 
+      - name: Free Disk Space
+        uses: jlumbroso/free-disk-space@main
+        if: steps.cache-build-result.outputs.cache-hit != 'true' && runner.os == 'Linux'
+        with:
+          tool-cache: false
+          large-packages: false
+          swap-storage: false
+
       - name: Install tree
         if: steps.cache-build-result.outputs.cache-hit != 'true' && runner.os == 'Windows'
         uses: msys2/setup-msys2@v2
@@ -202,6 +210,13 @@ jobs:
           # Workaround for protoc https://github.com/microsoft/onnxruntime/issues/16238#issuecomment-1590398821
           brew install protobuf@21
 
+      - name: Install build dependencies on android
+        if: steps.cache-build-result.outputs.cache-hit != 'true' && startsWith(matrix.artifact_name, 'onnxruntime-android')
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y \
+              ninja-build
+
       # ONNX Runtime v1.16.1 requires CMake 3.27 or higher.
       - name: Install CMake
         if: steps.cache-build-result.outputs.cache-hit != 'true' && startsWith(matrix.os, 'ubuntu')
@@ -247,6 +262,21 @@ jobs:
 
           echo "CUDNN_HOME=$cudnn_path" >> "$GITHUB_ENV"
 
+      - name: Extract Rust toolchain and target triple
+        id: rust-toolchain-and-target-triple
+        if: steps.cache-build-result.outputs.cache-hit != 'true'
+        run: |
+          echo "toolchain=$(cat ./rust-toolchain)" >> "$GITHUB_OUTPUT"
+          # shellcheck disable=SC2001
+          echo "target=$(sed -E 's/.*Rust_CARGO_TARGET=([a-z0-9_-]+).*/\1/' <<< '${{ matrix.build_opts }}')" >> "$GITHUB_OUTPUT"
+
+      - name: Set up Rust
+        if: steps.cache-build-result.outputs.cache-hit != 'true'
+        uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: ${{ steps.rust-toolchain-and-target-triple.outputs.toolchain }}
+          targets: ${{ steps.rust-toolchain-and-target-triple.outputs.target }}
+
       - name: Configure build environment for non-x86_64 Linux
         if: steps.cache-build-result.outputs.cache-hit != 'true' && startsWith(matrix.os, 'ubuntu') && matrix.linux_cross_arch
         run: |
@@ -271,6 +301,18 @@ jobs:
           # https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2004-Readme.md#environment-variables-2
           echo "ANDROID_NDK_HOME=$ANDROID_NDK_LATEST_HOME" >> "$GITHUB_ENV"
 
+      - name: Set `$DYLD_LIBRARY_PATH` for iOS
+        if: steps.cache-build-result.outputs.cache-hit != 'true' && startsWith(matrix.artifact_name, 'onnxruntime-ios')
+        run: |
+          ls -l /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/lib || true
+          echo "DYLD_LIBRARY_PATH=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/lib:$DYLD_LIBRARY_PATH"
+
+      - name: CMake version
+        if: steps.cache-build-result.outputs.cache-hit != 'true'
+        run: |
+          type cmake
+          cmake --version
+
       - name: Build ONNX Runtime
         if: steps.cache-build-result.outputs.cache-hit != 'true'
         run: |