CI test が失敗しているのを修正した (#5)

* osxがx86_64になったのに対応した

* Windows gpuのダウンロードに対応した

* code生成時に変化がなくても成功するようにした

* 一つの環境でcpu,gpuの複数ビルドが失敗する状態だったので失敗しないように修正

* successを復活した

* 生成後にgit add --allするようにしてWindowsでの改行のみの変更を含めないようにした

* Clippy errorを修正した

* if: success() は不要のため削除

* ORT_OUT_DIRに出力されたファイルに変更や削除が入るとbuild scriptをrerunするようにした　

depsに出力されているファイルが削除されることがあるようなので、テストが失敗することがあるのでそれを解消するため

* version up onnxruntime-sys

Author: qwerty2501

.github/actions/auto_gen_bind_pr/action.yaml

@@ -22,13 +22,9 @@ runs:
         # cargoのキャシュが原因でテストが失敗してることが考えられる場合はバージョン部分を変更する
         key: "v1-cargo-test-cache-${{ inputs.triple }}"
     - name: gen bind
-      run: cargo build --target ${{ inputs.triple }} --features generate-bindings
-      shell: bash
-    - name: check
-      run: git status -s | grep -E "M|A"
+      run: cargo build --target ${{ inputs.triple }} --features generate-bindings && git add --all
       shell: bash
     - name: create_pr
-      if: success()
       id: cpr
       uses: peter-evans/create-pull-request@v4
       with:

.github/workflows/general.yml

@@ -53,7 +53,7 @@ jobs:
           command: build
           args: --target x86_64-apple-darwin
       - name: Verify prebuilt archive downloaded (CPU, x86_64-apple-darwin)
-        run: ls -lh target/x86_64-apple-darwin/debug/build/onnxruntime-sys-*/out/onnxruntime-osx-x64-1.*.tgz
+        run: ls -lh target/x86_64-apple-darwin/debug/build/onnxruntime-sys-*/out/onnxruntime-osx-x86_64-1.*.tgz
       # ******************************************************************
       - name: Download prebuilt archive (CPU, i686-pc-windows-msvc)
         uses: actions-rs/cargo@v1
@@ -89,7 +89,7 @@ jobs:
           command: build
           args: --target x86_64-pc-windows-msvc
       - name: Verify prebuilt archive downloaded (GPU, x86_64-pc-windows-msvc)
-        run: ls -lh target/x86_64-pc-windows-msvc/debug/build/onnxruntime-sys-*/out/onnxruntime-win-gpu-x64-1.*.zip
+        run: ls -lh target/x86_64-pc-windows-msvc/debug/build/onnxruntime-sys-*/out/onnxruntime-win-x64-gpu-1.*.zip
 
   rust-test:
     strategy:
@@ -122,7 +122,9 @@ jobs:
         with:
           # cargoのキャシュが原因でテストが失敗してることが考えられる場合はバージョン部分を変更する
           key: "v1-cargo-test-cache-${{ matrix.os }}"
-      - run: cargo test
+      - name: Run cargo test
+        shell: bash
+        run: cargo test
 
   clippy:
     name: Clippy
@@ -151,13 +153,6 @@ jobs:
         with:
           toolchain: stable
           override: true
-      - name: Build (required to download libonnxruntime)
-        uses: actions-rs/cargo@v1
-        with:
-          command: build
-          args: --package onnxruntime-sys
-      - name: Copy libonnxruntime.*.dylib to /usr/lib/
-        run: sudo cp -r target/debug/build/onnxruntime-sys-*/out/onnxruntime/onnxruntime-*/lib/libonnxruntime.* /usr/lib/
       - name: Run cargo-tarpaulin
         uses: actions-rs/[email protected]
         with:

onnxruntime-sys/Cargo.toml

@@ -2,7 +2,7 @@
 authors = ["Nicolas Bigaouette <[email protected]>"]
 edition = "2018"
 name = "onnxruntime-sys"
-version = "0.0.24"
+version = "0.0.25"
 
 description = "Unsafe wrapper around Microsoft's ONNX Runtime"
 documentation = "https://docs.rs/onnxruntime-sys"

onnxruntime-sys/build.rs

@@ -92,7 +92,17 @@ fn main() {
         (export_include_dir, export_lib_dir)
     };
     if let Ok(ort_lib_out_dir) = env::var(ORT_ENV_OUT_DIR) {
-        output_onnxruntime_library(&lib_dir, ort_lib_out_dir);
+        output_onnxruntime_library(&lib_dir, &ort_lib_out_dir);
+        for entry in lib_dir.read_dir().unwrap().flat_map(|e| e.ok()) {
+            let path = entry.path();
+            if path.is_file() {
+                let file_name = path.file_name().unwrap().to_str().unwrap();
+                println!(
+                    "cargo:rerun-if-changed={}",
+                    Path::new(&ort_lib_out_dir).join(file_name).display()
+                );
+            }
+        }
     }
 
     println!("Include directory: {:?}", include_dir);
@@ -259,7 +269,7 @@ fn extract_zip(filename: &Path, outpath: &Path) {
         let mut file = archive.by_index(i).unwrap();
         #[allow(deprecated)]
         let outpath = outpath.join(file.sanitized_name());
-        if !(&*file.name()).ends_with('/') {
+        if !file.name().ends_with('/') {
             println!(
                 "File {} extracted to \"{}\" ({} bytes)",
                 i,
@@ -469,7 +479,20 @@ fn prepare_libort_dir_prebuilt() -> PathBuf {
     let (prebuilt_archive, prebuilt_url) = prebuilt_archive_url();
 
     let out_dir = PathBuf::from(env::var("OUT_DIR").unwrap());
-    let extract_dir = out_dir.join(&format!("{}_{}", ORT_PREBUILT_EXTRACT_DIR, ORT_VERSION));
+    let extract_dir = out_dir.join(&format!(
+        "{}_{}_{}",
+        ORT_PREBUILT_EXTRACT_DIR,
+        ORT_VERSION,
+        if matches!(TRIPLET.accelerator, Accelerator::Gpu) {
+            "gpu"
+        } else {
+            #[cfg(not(feature = "directml"))]
+            let accelerator = "cpu";
+            #[cfg(feature = "directml")]
+            let accelerator = "directml";
+            accelerator
+        }
+    ));
     let downloaded_file = out_dir.join(&prebuilt_archive);
 
     println!("cargo:rerun-if-changed={}", downloaded_file.display());

onnxruntime/Cargo.toml

@@ -2,7 +2,7 @@
 authors = ["Nicolas Bigaouette <[email protected]>"]
 edition = "2018"
 name = "onnxruntime"
-version = "0.0.29"
+version = "0.0.30"
 
 description = "Wrapper around Microsoft's ONNX Runtime"
 documentation = "https://docs.rs/onnxruntime"
@@ -19,7 +19,7 @@ name = "integration_tests"
 required-features = ["model-fetching"]
 
 [dependencies]
-onnxruntime-sys = { path = "../onnxruntime-sys", version = "0.0.24" }
+onnxruntime-sys = { path = "../onnxruntime-sys", version = "0.0.25" }
 
 lazy_static = "1.4"
 ndarray = "0.15"