V0.3.2 dev #1 (#82)

FL03 · Dec 3, 2024 · ee0b91f · ee0b91f
2 parents d5d6d99 + 3f47aaf
commit ee0b91f
Show file tree

Hide file tree

Showing 152 changed files with 938 additions and 9,150 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -29,6 +29,6 @@ updates:
     schedule:
       interval: daily
   - package-ecosystem: cargo
-    directory: /tensor
+    directory: /math
     schedule:
-      interval: daily
+      interval: daily
diff --git a/.github/workflows/crates.yml b/.github/workflows/crates.yml
@@ -31,7 +31,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        features: [ derive, graphs, macros, tensor ]
+        features: [ derive, graphs, macros, math ]
     env:
       CARGO_PACKAGE_NAME: ${{ github.event.repository.name }}-${{ matrix.features }}
     steps:

diff --git a/Cargo.toml b/Cargo.toml
@@ -17,22 +17,22 @@ default-members = [
 ]
 
 exclude = [ 
-    "exp/container",
 ]
 
 members = [
     "acme", 
     "core",
     "derive",
     "graphs",
-    "macros",
-    "tensor",
+    "macros", 
+    "math",
 
 ]
 resolver = "2"
 
 [workspace.dependencies]
 paste = "1"
+scsys = "0.2.1"
 strum = { features = ["derive"], version = "0.26" }
 smart-default = "0.7"
 

diff --git a/acme/Cargo.toml b/acme/Cargo.toml
@@ -14,15 +14,14 @@ version.workspace = true
 [features]
 default = [
     "core",
-    "tensor",
+    "math",
+    "graph",
 ]
 
 full = [
-    "core",
+    "default",
     "derive",
-    "graph",
     "serde",
-    "tensor",
     "trace",
 ]
 
@@ -37,34 +36,39 @@ graph = [
     "dep:acme-graphs"
 ]
 
-io = [
-    "acme-tensor/io"
-]
-
 macros = [
     "dep:acme-macros"
 ]
 
+math = [
+    "dep:acme-math"
+]
+
 serde = [
     "acme-core/serde",
     "acme-graphs/serde",
-    "acme-tensor/serde"
 ]
 
 std = [
     "acme-core/std",
-    "acme-tensor/std"
+    "acme-graphs/std",
 ]
 
-tensor = [
-    "dep:acme-tensor"
-]
 
 trace = [
     "acme-core/trace",
     "acme-graphs/trace",
 ]
 
+wasi = [
+    "acme-core/wasi",
+    "acme-graphs/wasi",
+]
+
+wasm = [
+    "acme-core/wasm",
+    "acme-graphs/wasm",
+]
 
 
 
@@ -74,9 +78,6 @@ crate-type = ["cdylib", "rlib"]
 doctest = true
 test = true
 
-[[bench]]
-name = "tensor"
-required-features = ["tensor"]
 
 [[example]]
 doc = true
@@ -104,12 +105,13 @@ acme-core = { path = "../core", version = "0.3.2" }
 acme-derive = { optional = true, path = "../derive", version = "0.3.2" }
 acme-graphs = { optional = true, path = "../graphs", version = "0.3.2" }
 acme-macros = { optional = true, path = "../macros", version = "0.3.2" }
-acme-tensor = { optional = true, path = "../tensor", version = "0.3.2" }
+acme-math = { optional = true, path = "../math", version = "0.3.2" }
+
 # acme-core = { path = "../core", version = "0.3.2-nightly" }
 # acme-derive = { optional = true, path = "../derive", version = "0.3.2-nightly" }
 # acme-graphs = { optional = true, path = "../graphs", version = "0.3.2-nightly" }
 # acme-macros = { optional = true, path = "../macros", version = "0.3.2-nightly" }
-# acme-tensor = { optional = true, path = "../tensor", version = "0.3.2-nightly" }
+# acme-math = { optional = true, path = "../math", version = "0.3.2-nightly" }
 
 [dev-dependencies]
 approx = "0.5"

diff --git a/acme/benches/tensor.rs b/acme/benches/tensor.rs
diff --git a/acme/examples/macros.rs b/acme/examples/macros.rs
@@ -9,7 +9,6 @@ use num::Float;
 
 fn main() -> acme::prelude::BoxResult {
     let x = 5f64;
-    let lex = sigmoid_lex();
     println!("{}", sigmoid(x));
     println!("{}", sigmoid_lex());
     let dx = sigmoid_prime(x);
@@ -19,7 +18,7 @@ fn main() -> acme::prelude::BoxResult {
     Ok(())
 }
 
-#[operator(lexical = sigmoid_lex)]
+#[operator(lex = sigmoid_lex)]
 pub fn sigmoid<T>(x: T) -> T
 where
     T: Float,

diff --git a/acme/examples/tensor.rs b/acme/examples/tensor.rs
diff --git a/acme/src/lib.rs b/acme/src/lib.rs
@@ -12,27 +12,26 @@
 #[doc(inline)]
 pub use acme_core::*;
 #[cfg(feature = "derive")]
+#[doc(inline)]
 pub use acme_derive::*;
 #[cfg(feature = "graph")]
 #[doc(inline)]
 pub use acme_graphs as graph;
 #[cfg(feature = "macros")]
+#[doc(inline)]
 pub use acme_macros::*;
-#[cfg(feature = "tensor")]
+#[cfg(feature = "math")]
 #[doc(inline)]
-pub use acme_tensor as tensor;
+pub use acme_math as math;
 
 pub mod prelude {
-    #[cfg(feature = "tensor")]
-    #[doc(inline)]
-    pub use crate::tensor::prelude::*;
-    #[doc(inline)]
     pub use acme_core::prelude::*;
     #[cfg(feature = "derive")]
     pub use acme_derive::*;
     #[cfg(feature = "graph")]
-    #[doc(inline)]
     pub use acme_graphs::prelude::*;
     #[cfg(feature = "macros")]
     pub use acme_macros::*;
+    #[cfg(feature = "math")]
+    pub use acme_math::prelude::*;
 }
diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -14,6 +14,17 @@ default = [
     "std",
 ]
 
+full = [
+    "default",
+    "approx",
+    "serde",
+    "trace"
+]
+
+approx = [
+    "dep:approx"
+]
+
 serde = [
     "dep:serde",
     "serde-ext",
@@ -29,6 +40,10 @@ trace = [
     "dep:tracing",
 ]
 
+wasi = []
+
+wasm = []
+
 [lib]
 bench = false
 crate-type = ["cdylib", "rlib"]
@@ -38,14 +53,17 @@ test = true
 [build-dependencies]
 
 [dependencies]
+approx = { optional = true, version = "0.5" }
 num = "0.4"
+paste.workspace = true
 serde = { optional = true, features = ["derive"], version = "1" }
 serde_json = { optional = true, version = "1" }
 smart-default.workspace = true
 strum.workspace = true
 tracing = { optional = true, version = "0.1" }
 
 [dev-dependencies]
+approx = "0.5"
 lazy_static = "1"
 
 [package.metadata.docs.rs]

diff --git a/core/src/ops/exp/operator.rs → core/src/exp/operator.rs b/core/src/ops/exp/operator.rs → core/src/exp/operator.rs
diff --git a/core/src/exp/structural.rs b/core/src/exp/structural.rs
@@ -0,0 +1,21 @@
+/*
+   Appellation: structural <mod>
+   Contrib: FL03 <jo3mccain@icloud.com>
+*/
+use crate::ops::{Op, Params};
+
+pub struct Adder<A, B = A> {
+    args: BinaryArgs<A, B>
+}
+
+impl<A, B> Adder<A, B> {
+    pub fn new(lhs: A, rhs: B) -> Self {
+        Self {
+            args: BinaryArgs::new(lhs, rhs)
+        }
+    }
+}
+
+pub trait StructuralFn {
+    type Output;
+}