refactor!: flatten operator module

examples/custom-ops/custom-ops.rs

@@ -1,9 +1,5 @@
 use ort::{
-	operator::{
+	operator::{Kernel, KernelAttributes, KernelContext, Operator, OperatorDomain, OperatorInput, OperatorOutput},
-		Operator, OperatorDomain,
-		io::{OperatorInput, OperatorOutput},
-		kernel::{Kernel, KernelAttributes, KernelContext}
-	},
 	session::Session,
 	value::{Tensor, TensorElementType}
 };

src/editor/mod.rs

@@ -9,7 +9,7 @@ use smallvec::SmallVec;
 
 use crate::{
 	AsPointer, Error, OnceLock, Result,
-	operator::attribute::Attribute,
+	operator::Attribute,
 	ortsys,
 	session::{Session, builder::SessionBuilder},
 	util::{with_cstr, with_cstr_ptr_array},
@@ -68,7 +68,7 @@ impl Node {
 	/// - `attributes` is an array of attributes used to configure the operator, e.g. `strides` for `Conv` nodes.
 	///
 	/// ```
-	/// # use ort::{editor::{Node, ONNX_DOMAIN}, operator::attribute::Attribute};
+	/// # use ort::{editor::{Node, ONNX_DOMAIN}, operator::Attribute};
 	/// # fn main() -> ort::Result<()> {
 	/// let node = Node::new(
 	/// 	"Conv",

src/logging.rs

@@ -210,7 +210,7 @@ impl<'a> AsPointer for Logger<'a> {
 /// Logs a message to a given [`Logger`].
 ///
 /// ```
-/// # use ort::operator::kernel::{Kernel, KernelContext};
+/// # use ort::operator::{Kernel, KernelContext};
 /// struct MyKernel;
 ///
 /// impl Kernel for MyKernel {

src/operator/mod.rs

@@ -3,18 +3,18 @@
 use alloc::{boxed::Box, ffi::CString, vec::Vec};
 use core::ptr::{self, NonNull};
 
-pub mod attribute;
+mod attribute;
 pub(crate) mod bound;
-pub mod io;
+mod io;
-pub mod kernel;
+mod kernel;
 #[cfg(test)]
 mod tests;
 
-use self::{
+use self::bound::BoundOperator;
-	attribute::FromOpAttr,
+pub use self::{
-	bound::BoundOperator,
+	attribute::{Attribute, FromKernelAttributes, FromOpAttr, ToAttribute},
-	io::{OperatorInput, OperatorOutput},
+	io::{InputOutputCharacteristic, OperatorInput, OperatorOutput},
-	kernel::{Kernel, KernelAttributes}
+	kernel::{Kernel, KernelAttributes, KernelContext, ScratchBuffer}
 };
 use crate::{
 	AsPointer, Error,
@@ -45,7 +45,7 @@ pub trait Operator: Send {
 	/// stream.
 	///
 	/// [`Tensor::data_ptr`]: crate::value::Tensor::data_ptr
-	/// [`KernelContext::compute_stream`]: crate::operator::kernel::KernelContext::compute_stream
+	/// [`KernelContext::compute_stream`]: crate::operator::KernelContext::compute_stream
 	fn execution_provider_type(&self) -> Option<&str> {
 		None
 	}

src/operator/tests.rs

@@ -1,10 +1,6 @@
 use crate::{
 	Result,
-	operator::{
+	operator::{Kernel, KernelAttributes, KernelContext, Operator, OperatorDomain, OperatorInput, OperatorOutput},
-		Operator, OperatorDomain,
-		io::{OperatorInput, OperatorOutput},
-		kernel::{Kernel, KernelAttributes, KernelContext}
-	},
 	session::Session,
 	value::{Tensor, TensorElementType}
 };

tests/leak-check/main.rs

@@ -1,11 +1,7 @@
 use ort::{
 	ep,
 	memory::{AllocationDevice, Allocator, AllocatorType, MemoryInfo, MemoryType},
-	operator::{
+	operator::{Kernel, KernelAttributes, KernelContext, Operator, OperatorDomain, OperatorInput, OperatorOutput},
-		Operator, OperatorDomain,
-		io::{OperatorInput, OperatorOutput},
-		kernel::{Kernel, KernelAttributes, KernelContext}
-	},
 	session::{Adapter, RunOptions, Session},
 	value::{Tensor, TensorElementType}
 };