Merge pull request #38 from gregszumel/rc8_upgrade

Upgrade to rc-8

Author: mortont

lib/ortex/util.ex

@@ -31,20 +31,5 @@ defmodule Ortex.Util do
     |> Enum.map(fn x ->
       File.cp!(x, Path.join([destination_dir, Path.basename(x)]))
     end)
-
-    # Currently ORT doesn't write the .so file we need (fix incoming https://github.com/pykeio/ort/commit/634e49ab7c960782cc2fb83d84cc219e7bb4ae1f),
-    # so we're hacking a fix here
-    onnx_runtime_filenames = Enum.map(onnx_runtime_paths, &Path.basename/1)
-
-    case "libonnxruntime.so.1.17.0" in onnx_runtime_filenames do
-      true ->
-        nil
-
-      false ->
-        File.cp!(
-          Path.join([destination_dir, "libonnxruntime.so"]),
-          Path.join([destination_dir, "libonnxruntime.so.1.17.0"])
-        )
-    end
   end
 end

native/ortex/Cargo.lock

@@ -11,8 +11,8 @@ crate-type = ["cdylib"]
 
 [dependencies]
 rustler = "0.29.0"
-ort = { version = "2.0.0-rc.0" }
-ndarray = "0.15.6"
+ort = { version = "2.0.0-rc.8" }
+ndarray = "0.16.1"
 half = "2.2.1"
 tracing-subscriber = { version = "0.3", features = [ "env-filter", "fmt" ] }
 num-traits = "0.2.15"

native/ortex/Cargo.toml

@@ -24,10 +24,9 @@ fn init(
     opt: i32,
 ) -> NifResult<ResourceArc<model::OrtexModel>> {
     let eps = utils::map_eps(env, eps);
-    Ok(ResourceArc::new(
-        model::init(model_path, eps, opt)
-            .map_err(|e| rustler::Error::Term(Box::new(e.to_string())))?,
-    ))
+    let model = model::init(model_path, eps, opt)
+        .map_err(|e| rustler::Error::Term(Box::new(e.to_string())))?;
+    Ok(ResourceArc::new(model))
 }
 
 #[rustler::nif]

native/ortex/src/lib.rs

@@ -10,9 +10,9 @@
 
 use crate::tensor::OrtexTensor;
 use crate::utils::map_opt_level;
-use std::convert::{Into, TryFrom};
+use std::convert::{TryFrom, TryInto};
 
-use ort::{Error, ExecutionProviderDispatch, Session, Value};
+use ort::{Error, ExecutionProviderDispatch, Session};
 use rustler::resource::ResourceArc;
 use rustler::Atom;
 
@@ -37,15 +37,11 @@ pub fn init(
 ) -> Result<OrtexModel, Error> {
     // TODO: send tracing logs to erlang/elixir _somehow_
     // tracing_subscriber::fmt::init();
-    ort::init()
-        .with_execution_providers(&eps)
-        .with_name("ortex-model")
-        .commit()?;
 
     let session = Session::builder()?
-        .with_execution_providers(&eps)?
         .with_optimization_level(map_opt_level(opt))?
-        .with_model_from_file(model_path)?;
+        .with_execution_providers(eps)?
+        .commit_from_file(model_path)?;
 
     let state = OrtexModel { session };
     Ok(state)
@@ -88,21 +84,22 @@ pub fn run(
     inputs: Vec<ResourceArc<OrtexTensor>>,
 ) -> Result<Vec<(ResourceArc<OrtexTensor>, Vec<usize>, Atom, usize)>, Error> {
     // TODO: can we handle an error more elegantly than just .unwrap()?
-    let final_input: Vec<Value> = inputs
-        .into_iter()
-        .map(|x| Value::try_from(&*x).unwrap())
-        .collect();
+
+    let mut ortified_inputs: Vec<ort::SessionInputValue> = Vec::new();
+    for input in inputs {
+        let derefed_input: &OrtexTensor = &input;
+        let v: ort::SessionInputValue = derefed_input.try_into()?;
+        ortified_inputs.push(v);
+    }
 
     // Grab the session and run a forward pass with it
-    let session = &model.session;
+    let session: &ort::Session = &model.session;
 
     // Construct a Vec of ModelOutput enums based on the DynOrtTensor data type
-    let outputs = session.run(&final_input[..])?;
-
+    let outputs = session.run(&ortified_inputs[..])?;
     outputs
         .iter()
         .map(|(_name, val)| {
-            let val: &Value = val;
             let ortextensor: OrtexTensor = OrtexTensor::try_from(val)?;
             let shape = ortextensor.shape();
             let (dtype, bits) = ortextensor.dtype();