T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make WASI-NN classes send and/or sync (#5077)

Browse Source 
* Make send and remove wrapper around WasiNnCtx·

This removes the wrapper around WasiNnCtx and no longer requires borrow_mut(). Once send/sync
changes in OpenVINO crate are merged in it will allow·use by frameworks that requires this trait.

* Bump openvino to compatible version.

* BackendExecutionContext should be Send and Sync

* Fix rust format issues.

* Update Cargo.lock for openvino

* Audit changes to openvino crates.
This commit is contained in:
Matthew Tamayo-Rios
2022-10-28 00:52:23 +02:00
committed by GitHub
parent 2702619427
commit f082756643
7 changed files with 43 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
crates/wasi-nn/src/impl.rs
View File

@@ -32,23 +32,23 @@ impl<'a> WasiEphemeralNn for WasiNnCtx {
target: ExecutionTarget,
) -> Result<Graph> {
let encoding_id: u8 = encoding.into();
let graph = if let Some(backend) = self.ctx.borrow_mut().backends.get_mut(&encoding_id) {
let graph = if let Some(backend) = self.backends.get_mut(&encoding_id) {
backend.load(builders, target)?
} else {
return Err(UsageError::InvalidEncoding(encoding).into());
};
let graph_id = self.ctx.borrow_mut().graphs.insert(graph);
let graph_id = self.graphs.insert(graph);
Ok(graph_id)
}
fn init_execution_context(&mut self, graph_id: Graph) -> Result<GraphExecutionContext> {
let exec_context = if let Some(graph) = self.ctx.borrow_mut().graphs.get_mut(graph_id) {
let exec_context = if let Some(graph) = self.graphs.get_mut(graph_id) {
graph.init_execution_context()?
} else {
return Err(UsageError::InvalidGraphHandle.into());
};
let exec_context_id = self.ctx.borrow_mut().executions.insert(exec_context);
let exec_context_id = self.executions.insert(exec_context);
Ok(exec_context_id)
}
@@ -58,7 +58,7 @@ impl<'a> WasiEphemeralNn for WasiNnCtx {
index: u32,
tensor: &Tensor<'b>,
) -> Result<()> {
if let Some(exec_context) = self.ctx.borrow_mut().executions.get_mut(exec_context_id) {
if let Some(exec_context) = self.executions.get_mut(exec_context_id) {
Ok(exec_context.set_input(index, tensor)?)
} else {
Err(UsageError::InvalidGraphHandle.into())
@@ -66,7 +66,7 @@ impl<'a> WasiEphemeralNn for WasiNnCtx {
}
fn compute(&mut self, exec_context_id: GraphExecutionContext) -> Result<()> {
if let Some(exec_context) = self.ctx.borrow_mut().executions.get_mut(exec_context_id) {
if let Some(exec_context) = self.executions.get_mut(exec_context_id) {
Ok(exec_context.compute()?)
} else {
Err(UsageError::InvalidExecutionContextHandle.into())
@@ -81,7 +81,7 @@ impl<'a> WasiEphemeralNn for WasiNnCtx {
out_buffer_max_size: u32,
) -> Result<u32> {
let mut destination = out_buffer.as_array(out_buffer_max_size).as_slice_mut()?;
if let Some(exec_context) = self.ctx.borrow_mut().executions.get_mut(exec_context_id) {
if let Some(exec_context) = self.executions.get_mut(exec_context_id) {
Ok(exec_context.get_output(index, &mut destination)?)
} else {
Err(UsageError::InvalidGraphHandle.into())