v2.0

.github/workflows/code-quality.yml

@@ -12,15 +12,22 @@ on:
       - '.cargo/**/*'
       - 'tests/**/*'
       - 'codecov.yml'
+      - 'ort-sys/build.rs'
+      - 'ort-sys/src/**/*.rs'
+      - 'ort-sys/wrapper.h'
+      - 'ort-sys/Cargo.toml'
   pull_request:
     paths:
       - '.github/workflows/code-quality.yml'
       - 'src/**/*.rs'
-      - 'build.rs'
       - 'Cargo.toml'
       - '.cargo/**/*'
       - 'tests/**/*'
       - 'codecov.yml'
+      - 'ort-sys/build.rs'
+      - 'ort-sys/src/**/*.rs'
+      - 'ort-sys/wrapper.h'
+      - 'ort-sys/Cargo.toml'
 env:
   RUST_BACKTRACE: 1
   CARGO_INCREMENTAL: 0
@@ -40,7 +47,7 @@ jobs:
       - name: Check fmt
         run: cargo fmt --all -- --check
       - name: Run clippy
-        run: cargo clippy --all-targets --features fetch-models
+        run: cargo clippy -p ort --all-targets --workspace --features fetch-models
   coverage:
     name: Code coverage
     runs-on: ubuntu-latest
@@ -64,8 +71,8 @@ jobs:
         run: cargo install cargo-tarpaulin
       - name: Generate code coverage
         run: |
-          cargo tarpaulin --features fetch-models --verbose --timeout 120 --out xml
+          cargo tarpaulin -p ort --features fetch-models --verbose --timeout 120 --out xml
       - name: Upload to codecov.io
         uses: codecov/codecov-action@v2
         with:
-          fail_ci_if_error: true
+          fail_ci_if_error: false

.github/workflows/test.yml

@@ -26,7 +26,14 @@ env:
 jobs:
   test:
     name: Run tests
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.platform.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        platform:
+          - os: ubuntu-latest
+          - os: windows-latest
+          - os: macos-latest
     steps:
       - uses: actions/checkout@v4
       - name: Install stable Rust toolchain
@@ -35,25 +42,19 @@ jobs:
           toolchain: stable
       - uses: Swatinem/rust-cache@v1
       - name: Run tests
-        # do not run doctests until rust-lang/cargo#10469 is merged
         run: |
-          cargo test --verbose --lib --features fetch-models
+          cargo test -p ort --verbose --features fetch-models -- --test-threads 1
   cross-compile:
     name: Cross-platform compile
     runs-on: ${{ matrix.platform.os }}
     needs: [test]
     strategy:
+      fail-fast: false
       matrix:
         platform:
-          - target: x86_64-unknown-linux-gnu
-            os: ubuntu-latest
-            command: test
           - target: aarch64-unknown-linux-gnu
             os: ubuntu-latest
             command: test
-          - target: x86_64-apple-darwin
-            os: macos-latest
-            command: test
     steps:
       - uses: actions/checkout@v4
       - name: Fix ring dependency for Windows ARM64
@@ -73,6 +74,4 @@ jobs:
         with:
           command: ${{ matrix.platform.command }}
           target: ${{ matrix.platform.target }}
-          args: "--features fetch-models"
-        env:
-          LC_ALL: C
+          args: "-p ort --features fetch-models"

.gitignore

@@ -188,3 +188,6 @@ WixTools/
 **/*.ort
 !tests/data/*.onnx
 !tests/data/*.ort
+
+# IDEA
+.idea

Cargo.toml

@@ -1,19 +1,32 @@
+[workspace]
+members = [
+	'ort-sys',
+	'examples/gpt2',
+	'examples/yolov8'
+]
+default-members = [
+	'.',
+	'examples/gpt2',
+	'examples/yolov8'
+]
+
 [package]
 name = "ort"
-description = "A Rust wrapper for ONNX Runtime 1.15 - Optimize and Accelerate Machine Learning Inferencing"
-version = "1.15.2"
+description = "A safe Rust wrapper for ONNX Runtime 1.16 - Optimize and Accelerate Machine Learning Inferencing"
+version = "2.0.0-alpha.0"
 edition = "2021"
 rust-version = "1.70"
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 repository = "https://github.com/pykeio/ort"
+documentation = "https://ort.pyke.io/"
 readme = "README.md"
 keywords = [ "machine-learning", "ai", "ml" ]
-categories = [ "algorithms", "mathematics", "science" ]
+categories = [ "algorithms", "mathematics", "science", "science" ]
 authors = [
 	"pyke.io <[email protected]>",
 	"Nicolas Bigaouette <[email protected]>"
 ]
-include = [ "src/", "examples/", "tests/", "toolchains/", "build.rs", "LICENSE", "README.md" ]
+include = [ "src/", "examples/", "tests/", "LICENSE-APACHE", "LICENSE-MIT", "README.md" ]
 
 [profile.release]
 opt-level = 3
@@ -22,37 +35,29 @@ strip = true
 codegen-units = 1
 
 [package.metadata.docs.rs]
-features = [ "half", "fetch-models", "copy-dylibs" ]
-
-[[example]]
-name = "gpt"
-required-features = ["fetch-models"]
+features = [ "ndarray", "half", "profiling", "custom-ops", "fetch-models", "copy-dylibs" ]
+rustdoc-args = [ "--cfg", "docsrs" ]
 
 [features]
-default = [ "half", "download-binaries", "copy-dylibs" ]
+default = [ "ndarray", "half", "download-binaries", "copy-dylibs" ]
 
 profiling = [ "widestring" ]
+custom-ops = [ "libc", "winapi" ]
 
 fetch-models = [ "ureq" ]
-download-binaries = [ "ureq", "zip" ]
-load-dynamic = [ "libloading" ]
-copy-dylibs = []
-
-minimal-build = []
-experimental = []
-mimalloc = []
-compile-static = []
+download-binaries = [ "ort-sys/download-binaries" ]
+load-dynamic = [ "libloading", "ort-sys/load-dynamic" ]
+copy-dylibs = [ "ort-sys/copy-dylibs" ]
 
-cuda = []
-tensorrt = []
+cuda = [ "ort-sys/cuda" ]
+tensorrt = [ "ort-sys/tensorrt" ]
 openvino = []
 onednn = []
 directml = []
-snpe = []
 nnapi = []
 coreml = []
 xnnpack = []
-rocm = []
+rocm = [ "ort-sys/rocm" ]
 acl = []
 armnn = []
 tvm = []
@@ -63,20 +68,21 @@ cann = []
 qnn = []
 
 [dependencies]
-ndarray = "0.15"
+ndarray = { version = "0.15", optional = true }
 thiserror = "1.0"
-libloading = { version = "0.7", optional = true }
+ort-sys = { version = "2.0.0-alpha.0", path = "ort-sys" }
+libloading = { version = "0.8", optional = true }
 
 ureq = { version = "2.1", optional = true, default-features = false, features = [ "tls" ] }
-lazy_static = "1.4"
+once_cell = "1.18"
 tracing = "0.1"
 half = { version = "2.1", optional = true }
 
 [target.'cfg(unix)'.dependencies]
-libc = "0.2"
+libc = { version = "0.2", optional = true }
 
 [target.'cfg(windows)'.dependencies]
-winapi = { version = "0.3", features = [ "std", "libloaderapi" ] }
+winapi = { version = "0.3", optional = true, features = [ "std", "libloaderapi" ] }
 widestring = { version = "1.0", optional = true }
 
 [dev-dependencies]
@@ -85,16 +91,3 @@ ureq = "2.1"
 image = "0.24"
 test-log = { version = "0.2", default-features = false, features = [ "trace" ] }
 tracing-subscriber = { version = "0.3", default-features = false, features = [ "env-filter", "fmt" ] }
-tokenizers = { version = ">=0.13.4", default-features = false, features = [ "onig" ] }
-rand = "0.8"
-
-[build-dependencies]
-ureq = { version = "2.1", optional = true, default-features = false, features = [ "tls" ] }
-zip = { version = "0.6", optional = true, default-features = false, features = [ "deflate" ] }
-
-[target.'cfg(not(target_os = "windows"))'.build-dependencies]
-flate2 = "1.0"
-tar = "0.4"
-
-[target.'cfg(target_os = "windows")'.build-dependencies]
-vswhom = "0.1"

LICENSE-MIT

@@ -0,0 +1,22 @@
+MIT License
+
+Copyright (c) 2023 pyke.io
+              2020 Nicolas Bigaouette
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.