directml用コードのコード生成を行った (#6)

Author: qwerty2501

.github/actions/auto_gen_bind_pr/action.yaml

@@ -4,6 +4,9 @@ inputs:
   triple:
     description: "cargo build target"
     required: true
+  additional_features:
+    description: "additional features"
+    required: false
 runs:
   using: "composite"
   steps:
@@ -22,15 +25,15 @@ runs:
         # cargoのキャシュが原因でテストが失敗してることが考えられる場合はバージョン部分を変更する
         key: "v1-cargo-test-cache-${{ inputs.triple }}"
     - name: gen bind
-      run: cargo build --target ${{ inputs.triple }} --features generate-bindings && git add --all
+      run: cargo build -p onnxruntime-sys --target ${{ inputs.triple }} --features generate-bindings,${{ inputs.additional_features }} && git add --all
       shell: bash
     - name: create_pr
       id: cpr
       uses: peter-evans/create-pull-request@v4
       with:
         commit-message: Automated generate bindings for ${{ inputs.triple }}
-        branch: ${{ steps.extract_branch.outputs.branch }}_auto_gen_bindings_${{ inputs.triple }}
+        branch: ${{ steps.extract_branch.outputs.branch }}_auto_gen_bindings_${{ inputs.triple }}_${{ inputs.additional_features }}
         delete-branch: true
-        title: Automated generate bindings for ${{ inputs.triple }}
+        title: Automated generate bindings for ${{ inputs.triple }} ${{ inputs.additional_features }}
         body: |
-          Automated generate bindings for ${{ inputs.triple }}
+          Automated generate bindings for ${{ inputs.triple }} ${{ inputs.additional_features }}

.github/workflows/gen_bind.yaml

@@ -6,50 +6,30 @@ on:
       - ".github/workflows/gen_bind.yaml"
       - ".github/actions/auto_gen_bind_pr/action.yaml"
 jobs:
-  generate_bind_x86_64_linux:
-    runs-on: ubuntu-latest
+  generate_bind:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: ubuntu-latest
+            triple: x86_64-unknown-linux-gnu
+          - os: windows-latest
+            triple: x86_64-pc-windows-msvc
+          - os: windows-latest
+            triple: x86_64-pc-windows-msvc
+            additional_features: directml
+          - os: windows-latest
+            triple: i686-pc-windows-msvc
+          - os: macos-latest
+            triple: x86_64-apple-darwin
+          - os: macos-latest
+            triple: aarch64-apple-darwin
+    runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3
         with:
           ref: ${{ github.head_ref }}
       - uses: ./.github/actions/auto_gen_bind_pr
         with:
-          triple: x86_64-unknown-linux-gnu
-  generate_bind_x86_64_windows:
-    runs-on: windows-latest
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          ref: ${{ github.head_ref }}
-      - name: x86_64_windows
-        uses: ./.github/actions/auto_gen_bind_pr
-        with:
-          triple: x86_64-pc-windows-msvc
-  generate_bind_x86_windows:
-    runs-on: windows-latest
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          ref: ${{ github.head_ref }}
-      - name: x86_windows
-        uses: ./.github/actions/auto_gen_bind_pr
-        with:
-          triple: i686-pc-windows-msvc
-  generate_bind_x86_64_mac:
-    runs-on: macos-latest
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          ref: ${{ github.head_ref }}
-      - uses: ./.github/actions/auto_gen_bind_pr
-        with:
-          triple: x86_64-apple-darwin
-  generate_bind_arm64_mac:
-    runs-on: macos-latest
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          ref: ${{ github.head_ref }}
-      - uses: ./.github/actions/auto_gen_bind_pr
-        with:
-          triple: aarch64-apple-darwin
+          triple: ${{ matrix.triple }}
+          additional_features: ${{ matrix.additional_features }}

.github/workflows/general.yml

@@ -98,6 +98,10 @@ jobs:
         include:
           - os: windows-2019
           - os: windows-2022
+          - os: windows-2019
+            features: directml
+          - os: windows-2022
+            features: directml
           - os: macos-10.15
           - os: macos-11
           - os: macos-12
@@ -124,7 +128,7 @@ jobs:
           key: "v1-cargo-test-cache-${{ matrix.os }}"
       - name: Run cargo test
         shell: bash
-        run: cargo test
+        run: cargo test --features ,${{ matrix.features }}
 
   clippy:
     name: Clippy

onnxruntime-sys/Cargo.toml

@@ -18,7 +18,7 @@ keywords = ["neuralnetworks", "onnx", "bindings"]
 
 [build-dependencies]
 once_cell = "1.13.0"
-bindgen = { version = "0.59", optional = true }
+bindgen = { version = "0.60.1", optional = true }
 ureq = "2.1"
 
 # Used on Windows

onnxruntime-sys/build.rs

@@ -179,19 +179,26 @@ fn generate_bindings(include_dir: &Path) {
                 .join("session")
                 .display()
         ),
+        #[cfg(feature = "directml")]
+        format!("-D{}", "USE_DML"),
     ];
 
+    #[cfg(not(feature = "directml"))]
+    let header_name = "wrapper.h";
+    #[cfg(feature = "directml")]
+    let header_name = "wrapper_directml.h";
+
     // Tell cargo to invalidate the built crate whenever the wrapper changes
-    println!("cargo:rerun-if-changed=wrapper.h");
+    println!("cargo:rerun-if-changed={}", header_name);
     println!("cargo:rerun-if-changed=src/generated/bindings.rs");
 
     // The bindgen::Builder is the main entry point
     // to bindgen, and lets you build up options for
     // the resulting bindings.
-    let bindings = bindgen::Builder::default()
+    let mut bind_builder = bindgen::Builder::default()
         // The input header we would like to generate
         // bindings for.
-        .header("wrapper.h")
+        .header(header_name)
         // The current working directory is 'onnxruntime-sys'
         .clang_args(clang_args)
         // Tell cargo to invalidate the built crate whenever any of the
@@ -201,19 +208,28 @@ fn generate_bindings(include_dir: &Path) {
         .size_t_is_usize(true)
         // Format using rustfmt
         .rustfmt_bindings(true)
-        .rustified_enum("*")
-        // Finish the builder and generate the bindings.
+        .rustified_enum("*");
+
+    for entry in include_dir.read_dir().unwrap().filter_map(|e| e.ok()) {
+        let path = entry.path();
+        let file_name = path.file_name().unwrap().to_str().unwrap().to_string();
+        bind_builder =
+            bind_builder.allowlist_file(format!(".*{}", file_name.replace(".h", "\\.h")));
+    }
+    let bindings = bind_builder
         .generate()
-        // Unwrap the Result and panic on failure.
         .expect("Unable to generate bindings");
 
     // Write the bindings to (source controlled) src/generated/<os>/<arch>/bindings.rs
     let generated_file = PathBuf::from(env::var("CARGO_MANIFEST_DIR").unwrap())
         .join("src")
         .join("generated")
         .join(env::var("CARGO_CFG_TARGET_OS").unwrap())
-        .join(env::var("CARGO_CFG_TARGET_ARCH").unwrap())
-        .join("bindings.rs");
+        .join(env::var("CARGO_CFG_TARGET_ARCH").unwrap());
+    #[cfg(not(feature = "directml"))]
+    let generated_file = generated_file.join("bindings.rs");
+    #[cfg(feature = "directml")]
+    let generated_file = generated_file.join("bindings_directml.rs");
     println!("cargo:rerun-if-changed={:?}", generated_file);
     bindings
         .write_to_file(&generated_file)

onnxruntime-sys/src/generated/bindings.rs

@@ -22,8 +22,18 @@ include!(concat!(
     "/src/generated/windows/x86/bindings.rs"
 ));
 
-#[cfg(all(target_os = "windows", target_arch = "x86_64"))]
+#[cfg(all(
+    target_os = "windows",
+    target_arch = "x86_64",
+    not(feature = "directml")
+))]
 include!(concat!(
     env!("CARGO_MANIFEST_DIR"),
     "/src/generated/windows/x86_64/bindings.rs"
 ));
+
+#[cfg(all(target_os = "windows", target_arch = "x86_64", feature = "directml"))]
+include!(concat!(
+    env!("CARGO_MANIFEST_DIR"),
+    "/src/generated/windows/x86_64/bindings_directml.rs"
+));