fixing workflow configuration

fix apple gpu download bug

adding windows bindings

fixing apple no gpu problem

fixing workflow mistake

Author: haixuanTao

.github/workflows/general.yml

@@ -73,21 +73,17 @@ jobs:
       # ******************************************************************
       - name: Download prebuilt archive (GPU, x86_64-unknown-linux-gnu)
         uses: actions-rs/cargo@v1
-        env:
-          ORT_USE_CUDA: "yes"
         with:
           command: build
-          args: --target x86_64-unknown-linux-gnu
+          args: --target x86_64-unknown-linux-gnu --features cuda
       - name: Verify prebuilt archive downloaded (GPU, x86_64-unknown-linux-gnu)
         run: ls -lh target/x86_64-unknown-linux-gnu/debug/build/onnxruntime-sys-*/out/onnxruntime-linux-x64-gpu-1.*.tgz
       # ******************************************************************
       - name: Download prebuilt archive (GPU, x86_64-pc-windows-msvc)
         uses: actions-rs/cargo@v1
-        env:
-          ORT_USE_CUDA: "yes"
         with:
           command: build
-          args: --target x86_64-pc-windows-msvc
+          args: --target x86_64-pc-windows-msvc --features cuda
       - 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
 
@@ -141,7 +137,6 @@ jobs:
         uses: actions-rs/cargo@v1
         with:
           command: build
-          # Use --manifest-path instead of --package. See https://github.com/actions-rs/cargo/issues/86
           args: --manifest-path onnxruntime/Cargo.toml --features model-fetching
       - name: Test onnxruntime-sys
         uses: actions-rs/cargo@v1

README.md

@@ -242,7 +242,7 @@ Generate the bindings:
 ```sh
 ❯ docker exec -it --user "$(id -u)":"$(id -g)" rustbuilder /bin/bash
 ❯ cd onnxruntime-sys
-❯ cargo build --features generate-bindings
+❯ cargo build --features 'generate-bindings, cuda'
 ```
 
 ### Generating Bindings for Windows With Vagrant
@@ -255,8 +255,8 @@ Windows can build both x86 and x86_64 bindings:
 ```sh
 ❯ rustup target add i686-pc-windows-msvc x86_64-pc-windows-msvc
 ❯ cd onnxruntime-sys
-❯ cargo build --features generate-bindings --target i686-pc-windows-msvc
-❯ cargo build --features generate-bindings --target x86_64-pc-windows-msvc
+❯ cargo build --features 'generate-bindings, cuda' --target i686-pc-windows-msvc
+❯ cargo build --features 'generate-bindings, cuda' --target x86_64-pc-windows-msvc
 ```
 
 ## Conduct

onnxruntime-sys/examples/c_api_sample.rs

@@ -49,8 +49,6 @@ fn main() {
     };
 
     // Optionally add more execution providers via session_options
-    // E.g. for CUDA include cuda_provider_factory.h and uncomment the following line:
-    // OrtSessionOptionsAppendExecutionProvider_CUDA(sessionOptions, 0);
 
     //*************************************************************************
     // create session and load model into memory

onnxruntime-sys/src/generated/windows/x86_64/bindings.rs

@@ -476,7 +476,21 @@ extern "C" {
         _Alignment: usize,
     ) -> *mut ::std::os::raw::c_void;
 }
-pub type max_align_t = f64;
+extern "C" {
+    pub fn _errno() -> *mut ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn _set_errno(_Value: ::std::os::raw::c_int) -> errno_t;
+}
+extern "C" {
+    pub fn _get_errno(_Value: *mut ::std::os::raw::c_int) -> errno_t;
+}
+extern "C" {
+    pub fn __threadid() -> ::std::os::raw::c_ulong;
+}
+extern "C" {
+    pub fn __threadhandle() -> usize;
+}
 pub type _CoreCrtSecureSearchSortCompareFunction = ::std::option::Option<
     unsafe extern "C" fn(
         arg1: *mut ::std::os::raw::c_void,
@@ -975,15 +989,6 @@ extern "C" {
 extern "C" {
     pub fn _set_error_mode(_Mode: ::std::os::raw::c_int) -> ::std::os::raw::c_int;
 }
-extern "C" {
-    pub fn _errno() -> *mut ::std::os::raw::c_int;
-}
-extern "C" {
-    pub fn _set_errno(_Value: ::std::os::raw::c_int) -> errno_t;
-}
-extern "C" {
-    pub fn _get_errno(_Value: *mut ::std::os::raw::c_int) -> errno_t;
-}
 extern "C" {
     pub fn __doserrno() -> *mut ::std::os::raw::c_ulong;
 }
@@ -6626,6 +6631,18 @@ fn bindgen_test_layout_OrtCustomOp() {
         )
     );
 }
+extern "C" {
+    pub fn OrtSessionOptionsAppendExecutionProvider_CPU(
+        options: *mut OrtSessionOptions,
+        use_arena: ::std::os::raw::c_int,
+    ) -> OrtStatusPtr;
+}
+extern "C" {
+    pub fn OrtSessionOptionsAppendExecutionProvider_CUDA(
+        options: *mut OrtSessionOptions,
+        device_id: ::std::os::raw::c_int,
+    ) -> OrtStatusPtr;
+}
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct __crt_locale_data {

onnxruntime-sys/wrapper.h

@@ -1,5 +1,5 @@
 #include "onnxruntime_c_api.h"
-#include "cpu_provider_factory.h"
 #if !defined(__APPLE__)
+#include "cpu_provider_factory.h"
 #include "cuda_provider_factory.h"
-#endif
+#endif

onnxruntime/src/session.rs

@@ -131,15 +131,16 @@ impl<'a> SessionBuilder<'a> {
     }
 
     /// Set the session to use cpu
+    #[cfg(feature = "cuda")]
     pub fn use_cpu(self, use_arena: i32) -> Result<SessionBuilder<'a>> {
         unsafe {
             sys::OrtSessionOptionsAppendExecutionProvider_CPU(self.session_options_ptr, use_arena);
         }
         Ok(self)
     }
 
-    #[cfg(feature = "cuda")]
     /// Set the session to use cuda
+    #[cfg(feature = "cuda")]
     pub fn use_cuda(self, device_id: i32) -> Result<SessionBuilder<'a>> {
         unsafe {
             sys::OrtSessionOptionsAppendExecutionProvider_CUDA(self.session_options_ptr, device_id);