Merge pull request #20 from boydjohnson/feature/reorg

Reorganize tests, put primitives in primitives mod
boydjohnson · Jan 11, 2025 · 4227752 · 4227752
2 parents d01f380 + bb11623
commit 4227752
Show file tree

Hide file tree

Showing 17 changed files with 515 additions and 507 deletions.
diff --git a/benches/binary.rs b/benches/binary.rs
@@ -12,11 +12,8 @@ use {
             format_tag::x,
             Memory,
         },
-        primitive::{
-            attributes::PrimitiveAttributes,
-            config::binary::{Binary, ForwardBinary, ForwardBinaryConfig},
-            ExecArg, Primitive, PropForwardInference,
-        },
+        primitive::{attributes::PrimitiveAttributes, ExecArg, Primitive, PropForwardInference},
+        primitives::binary::{Binary, ForwardBinary, ForwardBinaryConfig},
         set_primitive_cache_capacity,
         stream::Stream,
     },

diff --git a/src/lib.rs b/src/lib.rs
@@ -2,6 +2,7 @@ pub mod engine;
 pub mod error;
 pub mod memory;
 pub mod primitive;
+pub mod primitives;
 pub mod stream;
 
 use error::DnnlError;

diff --git a/src/primitive.rs b/src/primitive.rs
@@ -125,10 +125,9 @@ impl Primitive {
     ///         engine::Engine,
     ///         memory::{descriptor::MemoryDescriptor, format_tag::x},
     ///         primitive::{
-    ///             attributes::PrimitiveAttributes,
-    ///             config::binary::{ForwardBinary, ForwardBinaryConfig},
-    ///             Forward, Primitive, PropForwardInference,
+    ///             attributes::PrimitiveAttributes, Forward, Primitive, PropForwardInference,
     ///         },
+    ///         primitives::binary::{ForwardBinary, ForwardBinaryConfig},
     ///     },
     ///     onednnl_sys::{dnnl_alg_kind_t, dnnl_data_type_t::dnnl_f32},
     /// };

diff --git a/src/primitive/config.rs b/src/primitive/config.rs
@@ -4,15 +4,6 @@ use {
     std::sync::Arc,
 };
 
-pub mod au_gru;
-pub mod batch_norm;
-pub mod binary;
-pub mod eltwise;
-pub mod inner_product;
-pub mod matmul;
-pub mod prelu;
-pub mod reduction;
-
 pub trait PrimitiveConfig<'a, D: Direction, P: PropType<D>> {
     fn create_primitive_desc(&self, engine: Arc<Engine>) -> Result<PrimitiveDescriptor, DnnlError>;
 }
diff --git a/src/primitive/descriptor.rs b/src/primitive/descriptor.rs
@@ -20,11 +20,10 @@ impl PrimitiveDescriptor {
     ///         engine::Engine,
     ///         memory::{descriptor::MemoryDescriptor, format_tag::x},
     ///         primitive::{
-    ///             attributes::PrimitiveAttributes,
-    ///             config::binary::{ForwardBinary, ForwardBinaryConfig},
-    ///             descriptor::PrimitiveDescriptor,
-    ///             Forward, PropForwardInference,
+    ///             attributes::PrimitiveAttributes, descriptor::PrimitiveDescriptor, Forward,
+    ///             PropForwardInference,
     ///         },
+    ///         primitives::binary::{ForwardBinary, ForwardBinaryConfig},
     ///     },
     ///     onednnl_sys::{dnnl_alg_kind_t, dnnl_data_type_t::dnnl_f32},
     /// };

diff --git a/src/primitives.rs b/src/primitives.rs
@@ -0,0 +1,8 @@
+pub mod au_gru;
+pub mod batch_norm;
+pub mod binary;
+pub mod eltwise;
+pub mod inner_product;
+pub mod matmul;
+pub mod prelu;
+pub mod reduction;
diff --git a/src/primitive/config/au_gru.rs → src/primitives/au_gru.rs b/src/primitive/config/au_gru.rs → src/primitives/au_gru.rs
@@ -1,12 +1,11 @@
 use {
-    super::PrimitiveConfig,
     crate::{
         engine::Engine,
         error::DnnlError,
         memory::descriptor::MemoryDescriptor,
         primitive::{
-            attributes::PrimitiveAttributes, descriptor::PrimitiveDescriptor, Backward, Forward,
-            Operation, OperationType, PropType,
+            attributes::PrimitiveAttributes, config::PrimitiveConfig,
+            descriptor::PrimitiveDescriptor, Backward, Forward, Operation, OperationType, PropType,
         },
     },
     onednnl_sys::{

diff --git a/src/primitive/config/batch_norm.rs → src/primitives/batch_norm.rs b/src/primitive/config/batch_norm.rs → src/primitives/batch_norm.rs
@@ -2,16 +2,14 @@ use {
     crate::{
         memory::descriptor::MemoryDescriptor,
         primitive::{
-            attributes::PrimitiveAttributes, descriptor::PrimitiveDescriptor, Forward, Operation,
-            OperationType, PropType,
+            attributes::PrimitiveAttributes, config::PrimitiveConfig,
+            descriptor::PrimitiveDescriptor, Forward, Operation, OperationType, PropType,
         },
     },
     onednnl_sys::{dnnl_batch_normalization_forward_primitive_desc_create, dnnl_status_t},
     std::ffi::c_uint,
 };
 
-use super::PrimitiveConfig;
-
 pub struct ForwardBatchNormConfig<'a> {
     src_desc: &'a MemoryDescriptor,
     dst_desc: &'a MemoryDescriptor,

diff --git a/src/primitive/config/binary.rs → src/primitives/binary.rs b/src/primitive/config/binary.rs → src/primitives/binary.rs
@@ -1,10 +1,10 @@
 use {
-    super::PrimitiveConfig,
     crate::{
         memory::descriptor::MemoryDescriptor,
         primitive::{
-            attributes::PrimitiveAttributes, descriptor::PrimitiveDescriptor, Forward, Operation,
-            OperationType, PropForwardInference, PropType,
+            attributes::PrimitiveAttributes, config::PrimitiveConfig,
+            descriptor::PrimitiveDescriptor, Forward, Operation, OperationType,
+            PropForwardInference, PropType,
         },
     },
     onednnl_sys::{dnnl_alg_kind_t, dnnl_binary_primitive_desc_create, dnnl_status_t},

diff --git a/src/primitive/config/eltwise.rs → src/primitives/eltwise.rs b/src/primitive/config/eltwise.rs → src/primitives/eltwise.rs
@@ -1,10 +1,9 @@
 use {
-    super::PrimitiveConfig,
     crate::{
         memory::descriptor::MemoryDescriptor,
         primitive::{
-            attributes::PrimitiveAttributes, descriptor::PrimitiveDescriptor, Backward, Forward,
-            Operation, OperationType, PropType,
+            attributes::PrimitiveAttributes, config::PrimitiveConfig,
+            descriptor::PrimitiveDescriptor, Backward, Forward, Operation, OperationType, PropType,
         },
     },
     onednnl_sys::{

diff --git a/src/primitive/config/inner_product.rs → src/primitives/inner_product.rs b/src/primitive/config/inner_product.rs → src/primitives/inner_product.rs
@@ -1,10 +1,10 @@
 use {
-    super::PrimitiveConfig,
     crate::{
         memory::descriptor::MemoryDescriptor,
         primitive::{
-            attributes::PrimitiveAttributes, descriptor::PrimitiveDescriptor, Backward, Forward,
-            Operation, OperationType, PropBackwardData, PropBackwardWeights, PropType,
+            attributes::PrimitiveAttributes, config::PrimitiveConfig,
+            descriptor::PrimitiveDescriptor, Backward, Forward, Operation, OperationType,
+            PropBackwardData, PropBackwardWeights, PropType,
         },
     },
     onednnl_sys::{

diff --git a/src/primitive/config/matmul.rs → src/primitives/matmul.rs b/src/primitive/config/matmul.rs → src/primitives/matmul.rs
@@ -1,10 +1,9 @@
 use {
-    super::PrimitiveConfig,
     crate::{
         memory::descriptor::MemoryDescriptor,
         primitive::{
-            attributes::PrimitiveAttributes, descriptor::PrimitiveDescriptor, Forward, Operation,
-            OperationType, PropType,
+            attributes::PrimitiveAttributes, config::PrimitiveConfig,
+            descriptor::PrimitiveDescriptor, Forward, Operation, OperationType, PropType,
         },
     },
     onednnl_sys::{dnnl_matmul_primitive_desc_create, dnnl_status_t},

diff --git a/src/primitive/config/prelu.rs → src/primitives/prelu.rs b/src/primitive/config/prelu.rs → src/primitives/prelu.rs
@@ -1,12 +1,9 @@
-use {
-    super::PrimitiveConfig,
-    crate::{
-        memory::descriptor::MemoryDescriptor,
-        onednnl_sys::{dnnl_prelu_forward_primitive_desc_create, dnnl_status_t},
-        primitive::{
-            attributes::PrimitiveAttributes, descriptor::PrimitiveDescriptor, Forward, Operation,
-            OperationType, PropType,
-        },
+use crate::{
+    memory::descriptor::MemoryDescriptor,
+    onednnl_sys::{dnnl_prelu_forward_primitive_desc_create, dnnl_status_t},
+    primitive::{
+        attributes::PrimitiveAttributes, config::PrimitiveConfig, descriptor::PrimitiveDescriptor,
+        Forward, Operation, OperationType, PropType,
     },
 };
 

diff --git a/src/primitive/config/reduction.rs → src/primitives/reduction.rs b/src/primitive/config/reduction.rs → src/primitives/reduction.rs
@@ -1,10 +1,10 @@
 use {
-    super::PrimitiveConfig,
     crate::{
         memory::descriptor::MemoryDescriptor,
         primitive::{
-            attributes::PrimitiveAttributes, descriptor::PrimitiveDescriptor, Forward, Operation,
-            OperationType, PropForwardInference,
+            attributes::PrimitiveAttributes, config::PrimitiveConfig,
+            descriptor::PrimitiveDescriptor, Forward, Operation, OperationType,
+            PropForwardInference,
         },
     },
     onednnl_sys::{dnnl_alg_kind_t, dnnl_reduction_primitive_desc_create, dnnl_status_t},