refactor!: dyn compatible Operator

This commit is contained in:
Carson M.
2024-11-29 13:39:45 -06:00
parent 7b08bac58b
commit 393711eb56
5 changed files with 191 additions and 257 deletions

View File

@@ -10,95 +10,72 @@ use ort::{
};
struct CustomOpOne;
struct CustomOpOneKernel;
impl Operator for CustomOpOne {
type Kernel = CustomOpOneKernel;
fn name() -> &'static str {
fn name(&self) -> &str {
"CustomOpOne"
}
fn create_kernel(_: &KernelAttributes) -> ort::Result<Self::Kernel> {
Ok(CustomOpOneKernel)
}
fn inputs() -> Vec<OperatorInput> {
fn inputs(&self) -> Vec<OperatorInput> {
vec![OperatorInput::required(TensorElementType::Float32), OperatorInput::required(TensorElementType::Float32)]
}
fn outputs() -> Vec<OperatorOutput> {
fn outputs(&self) -> Vec<OperatorOutput> {
vec![OperatorOutput::required(TensorElementType::Float32)]
}
fn get_infer_shape_function() -> Option<Box<ort::operator::InferShapeFn>> {
Some(Box::new(|ctx| {
let inputs = ctx.inputs();
ctx.set_output(0, &inputs[0])?;
fn create_kernel(&self, _: &KernelAttributes) -> ort::Result<Box<dyn Kernel>> {
Ok(Box::new(|ctx: &KernelContext| {
let x = ctx.input(0)?.unwrap();
let y = ctx.input(1)?.unwrap();
let (x_shape, x) = x.try_extract_raw_tensor::<f32>()?;
let (y_shape, y) = y.try_extract_raw_tensor::<f32>()?;
let mut z = ctx.output(0, x_shape.to_vec())?.unwrap();
let (_, z_ref) = z.try_extract_raw_tensor_mut::<f32>()?;
for i in 0..y_shape.iter().copied().reduce(|acc, e| acc * e).unwrap() as usize {
if i % 2 == 0 {
z_ref[i] = x[i];
} else {
z_ref[i] = y[i];
}
}
Ok(())
}))
}
}
impl Kernel for CustomOpOneKernel {
fn compute(&mut self, ctx: &KernelContext) -> ort::Result<()> {
let x = ctx.input(0)?.unwrap();
let y = ctx.input(1)?.unwrap();
let (x_shape, x) = x.try_extract_raw_tensor::<f32>()?;
let (y_shape, y) = y.try_extract_raw_tensor::<f32>()?;
let mut z = ctx.output(0, x_shape.to_vec())?.unwrap();
let (_, z_ref) = z.try_extract_raw_tensor_mut::<f32>()?;
for i in 0..y_shape.iter().copied().reduce(|acc, e| acc * e).unwrap() as usize {
if i % 2 == 0 {
z_ref[i] = x[i];
} else {
z_ref[i] = y[i];
}
}
Ok(())
}
}
struct CustomOpTwo;
struct CustomOpTwoKernel;
impl Operator for CustomOpTwo {
type Kernel = CustomOpTwoKernel;
fn name() -> &'static str {
fn name(&self) -> &str {
"CustomOpTwo"
}
fn create_kernel(_: &KernelAttributes) -> ort::Result<Self::Kernel> {
Ok(CustomOpTwoKernel)
}
fn inputs() -> Vec<OperatorInput> {
fn inputs(&self) -> Vec<OperatorInput> {
vec![OperatorInput::required(TensorElementType::Float32)]
}
fn outputs() -> Vec<OperatorOutput> {
fn outputs(&self) -> Vec<OperatorOutput> {
vec![OperatorOutput::required(TensorElementType::Int32)]
}
}
impl Kernel for CustomOpTwoKernel {
fn compute(&mut self, ctx: &KernelContext) -> ort::Result<()> {
let x = ctx.input(0)?.unwrap();
let (x_shape, x) = x.try_extract_raw_tensor::<f32>()?;
let mut z = ctx.output(0, x_shape.to_vec())?.unwrap();
let (_, z_ref) = z.try_extract_raw_tensor_mut::<i32>()?;
for i in 0..x_shape.iter().copied().reduce(|acc, e| acc * e).unwrap() as usize {
z_ref[i] = (x[i] * i as f32) as i32;
}
Ok(())
fn create_kernel(&self, _: &KernelAttributes) -> ort::Result<Box<dyn Kernel>> {
Ok(Box::new(|ctx: &KernelContext| {
let x = ctx.input(0)?.unwrap();
let (x_shape, x) = x.try_extract_raw_tensor::<f32>()?;
let mut z = ctx.output(0, x_shape.to_vec())?.unwrap();
let (_, z_ref) = z.try_extract_raw_tensor_mut::<i32>()?;
for i in 0..x_shape.iter().copied().reduce(|acc, e| acc * e).unwrap() as usize {
z_ref[i] = (x[i] * i as f32) as i32;
}
Ok(())
}))
}
}
fn main() -> ort::Result<()> {
let session = Session::builder()?
.with_operators(OperatorDomain::new("test.customop")?.add::<CustomOpOne>()?.add::<CustomOpTwo>()?)?
.with_operators(OperatorDomain::new("test.customop")?.add(CustomOpOne)?.add(CustomOpTwo)?)?
.commit_from_file("tests/data/custom_op_test.onnx")?;
let values = session.run(ort::inputs![Array2::<f32>::zeros((3, 5)), Array2::<f32>::ones((3, 5))]?)?;