Merge pull request #70 from supertone-inc/fix-win32-build

Fix win32 build

Author: nbigaouette

.github/workflows/general.yml

@@ -54,14 +54,14 @@ jobs:
           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
-      # # ******************************************************************
-      # - name: Download prebuilt archive (CPU, i686-pc-windows-msvc)
-      #   uses: actions-rs/cargo@v1
-      #   with:
-      #     command: build
-      #     args: --target i686-pc-windows-msvc
-      # - name: Verify prebuilt archive downloaded (CPU, i686-pc-windows-msvc)
-      #   run: ls -lh target/i686-pc-windows-msvc/debug/build/onnxruntime-sys-*/out/onnxruntime-win-x86-1.*.zip
+      # ******************************************************************
+      - name: Download prebuilt archive (CPU, i686-pc-windows-msvc)
+        uses: actions-rs/cargo@v1
+        with:
+          command: build
+          args: --target i686-pc-windows-msvc
+      - name: Verify prebuilt archive downloaded (CPU, i686-pc-windows-msvc)
+        run: ls -lh target/i686-pc-windows-msvc/debug/build/onnxruntime-sys-*/out/onnxruntime-win-x86-1.*.zip
       # ******************************************************************
       - name: Download prebuilt archive (CPU, x86_64-pc-windows-msvc)
         uses: actions-rs/cargo@v1
@@ -97,20 +97,22 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [
-          ubuntu-latest,
-          macos-latest,
-          windows-latest
-        ]
+        target:
+          [
+            x86_64-unknown-linux-gnu,
+            x86_64-apple-darwin,
+            x86_64-pc-windows-msvc,
+            i686-pc-windows-msvc,
+          ]
         include:
-          - os: ubuntu-latest
-            target: x86_64-unknown-linux-gnu
-          - os: macos-latest
-            target: x86_64-apple-darwin
-          - os: windows-latest
-            target: x86_64-pc-windows-msvc
-          # - os: windows-latest
-          #   target: i686-pc-windows-msvc
+          - target: x86_64-unknown-linux-gnu
+            os: ubuntu-latest
+          - target: x86_64-apple-darwin
+            os: macos-latest
+          - target: x86_64-pc-windows-msvc
+            os: windows-latest
+          - target: i686-pc-windows-msvc
+            os: windows-latest
     env:
       CARGO_BUILD_TARGET: ${{ matrix.target }}
     steps:

onnxruntime-sys/build.rs

@@ -94,6 +94,8 @@ fn generate_bindings(include_dir: &Path) {
         // Tell cargo to invalidate the built crate whenever any of the
         // included header files changed.
         .parse_callbacks(Box::new(bindgen::CargoCallbacks))
+        // Set `size_t` to be translated to `usize` for win32 compatibility.
+        .size_t_is_usize(true)
         // Format using rustfmt
         .rustfmt_bindings(true)
         .rustified_enum("*")

onnxruntime-sys/examples/c_api_sample.rs

@@ -103,7 +103,7 @@ fn main() {
     assert_ne!(allocator_ptr, std::ptr::null_mut());
 
     // print number of model input nodes
-    let mut num_input_nodes: onnxruntime_sys::size_t = 0;
+    let mut num_input_nodes: usize = 0;
     let status = unsafe {
         g_ort.as_ref().unwrap().SessionGetInputCount.unwrap()(session_ptr, &mut num_input_nodes)
     };
@@ -255,7 +255,7 @@ fn main() {
             .unwrap()(
             memory_info_ptr,
             input_tensor_values_ptr,
-            (input_tensor_size * std::mem::size_of::<f32>()) as onnxruntime_sys::size_t,
+            input_tensor_size * std::mem::size_of::<f32>(),
             shape,
             4,
             ONNXTensorElementDataType::ONNX_TENSOR_ELEMENT_DATA_TYPE_FLOAT,