update

Signed-off-by: FL03 <jo3mccain@icloud.com>

core/Cargo.toml

@@ -12,8 +12,6 @@ version.workspace = true
 [features]
 default = []
 
-
-
 [lib]
 bench = false
 crate-type = ["cdylib", "rlib"]
@@ -26,7 +24,6 @@ test = true
 
 [dependencies]
 anyhow.workspace = true
-# daggy = { features = ["serde-1"], version = "0.8" }
 lazy_static = "1"
 num = "0.4"
 petgraph = { features = ["serde-1"], version = "0.6" }

core/src/ops/gradient.rs

@@ -15,3 +15,18 @@ pub trait Gradient<T> {
     fn grad(&self, args: T) -> Self::Gradient;
 }
 
+pub trait Grad<T> {
+    type Output;
+
+    /// Compute the gradient of a function at a given point, with respect to a given variable.
+    // TODO: Create a macro for generating parameter keys
+    fn grad(&self, at: T, wrt: &str) -> Self::Output;
+}
+
+pub trait Parameter {
+    type Key;
+    type Value;
+
+    fn key(&self) -> Self::Key;
+    fn value(&self) -> Self::Value;
+}

macros/Cargo.toml

@@ -20,7 +20,6 @@ test = true
 num = "0.4"
 proc-macro2 = { features = ["nightly", "span-locations"], version = "1" }
 quote = "1"
-
 syn = { features = ["extra-traits", "fold", "full"], version = "2" }
 
 [dev-dependencies]

macros/src/ast/gradient.rs

@@ -2,8 +2,8 @@
     Appellation: gradient <module>
     Contrib: FL03 <jo3mccain@icloud.com>
 */
-use syn::{Attribute, ItemFn};
 use syn::parse::{Parse, ParseStream, Result};
+use syn::{Attribute, ItemFn};
 
 pub struct GradientAst {
     pub attrs: Vec<Attribute>,

macros/src/diff/mod.rs

@@ -7,9 +7,9 @@
 
 pub mod handle;
 
+use crate::ast::partials::{PartialAst, PartialFn};
 use handle::expr::handle_expr;
 use handle::item::handle_item;
-use crate::ast::partials::{PartialAst, PartialFn};
 use proc_macro2::TokenStream;
 use syn::Ident;
 
@@ -24,4 +24,4 @@ fn handle_input(input: &PartialFn, var: &Ident) -> TokenStream {
         PartialFn::Expr(inner) => handle_expr(&inner, var),
         PartialFn::Item(inner) => handle_item(&inner.clone().into(), var),
     }
-}
+}

macros/src/grad/mod.rs

@@ -3,22 +3,17 @@
     Contrib: FL03 <jo3mccain@icloud.com>
 */
 
-
 use crate::ast::gradient::GradientAst;
 use crate::diff::handle::block::handle_block;
-use quote::quote;
 use proc_macro2::TokenStream;
+use quote::quote;
 use syn::{ItemFn, Signature};
 
 pub fn gradient(grad: &GradientAst) -> TokenStream {
     let GradientAst { attrs, item } = grad;
-    let attrs = attrs;
+    let _attrs = attrs;
     let item = item;
-    let output = quote! {
-        #(#attrs)*
-        #item
-    };
-    output
+    handle_item_fn(&item)
 }
 
 fn handle_item_fn(item: &ItemFn) -> TokenStream {
@@ -34,9 +29,12 @@ fn handle_item_fn(item: &ItemFn) -> TokenStream {
         }
     }
 
-    let grad = vars.iter().map(|var| handle_block(&block, &var)).collect::<Vec<_>>();
+    let grad = vars
+        .iter()
+        .map(|var| handle_block(&block, &var))
+        .collect::<Vec<_>>();
 
     quote! {
         [#(#grad)*]
     }
-}
+}

macros/src/lib.rs

@@ -8,7 +8,6 @@
 #![feature(proc_macro_span)]
 extern crate proc_macro;
 
-
 pub(crate) mod ast;
 pub(crate) mod cmp;
 pub(crate) mod diff;
@@ -64,7 +63,7 @@ pub fn autodiff(input: TokenStream) -> TokenStream {
 }
 
 #[proc_macro]
-pub fn grad(input: TokenStream) -> TokenStream {
+pub fn gradient(input: TokenStream) -> TokenStream {
     // Parse the input expression into a syntax tree
     let expr = parse_macro_input!(input as Expr);
 

macros/tests/gradient.rs

@@ -22,7 +22,7 @@ fn test_grad_addition() {
         [(y, 1.0)]
     );
     let z = 3.0;
-    let df = grad!(x + y + z);
+    let df = gradient!(x + y + z);
     assert_eq!(
         df.into_iter().filter(|(k, _v)| k == &x).collect::<Vec<_>>(),
         [(x, 1.0)]
@@ -50,7 +50,7 @@ fn test_grad_multiply() {
         df.into_iter().filter(|(k, _v)| k == &y).collect::<Vec<_>>(),
         [(y, 1.0)]
     );
-    let df = grad!(x * y + 3.0);
+    let df = gradient!(x * y + 3.0);
     assert_eq!(
         df.into_iter().filter(|(k, _v)| k == &x).collect::<Vec<_>>(),
         [(x, 2.0)]

tensor/src/lib.rs

@@ -6,6 +6,8 @@
 //!
 //!
 #![feature(array_chunks)]
+
+extern crate acme_core as acme;
 pub use self::{specs::*, tensor::*};
 
 pub(crate) mod specs;
@@ -16,8 +18,6 @@ pub mod ops;
 pub mod shape;
 pub mod store;
 
-pub(crate) use acme_core as core;
-
 pub mod prelude {
     pub use crate::specs::*;
 

tensor/src/ops/backprop.rs

@@ -2,6 +2,6 @@
     Appellation: backprop <mod>
     Contrib: FL03 <jo3mccain@icloud.com>
 */
-use crate::core::prelude::Ops;
+use acme::prelude::Ops;
 
 pub struct BackpropOp(Option<Ops>);

tensor/src/specs.rs

@@ -2,9 +2,9 @@
     Appellation: specs <mod>
     Contrib: FL03 <jo3mccain@icloud.com>
 */
-use crate::core::cmp::id::AtomicId;
 use crate::shape::{Rank, Shape};
 use crate::store::Layout;
+use acme::cmp::id::AtomicId;
 
 pub trait Affine<T> {
     type Output;

tensor/src/tensor.rs

@@ -2,10 +2,10 @@
     Appellation: tensor <mod>
     Contrib: FL03 <jo3mccain@icloud.com>
 */
-use crate::core::cmp::id::AtomicId;
 use crate::data::Scalar;
 use crate::shape::{IntoShape, Rank, Shape};
 use crate::store::Layout;
+use acme::cmp::id::AtomicId;
 // use std::ops::{Index, IndexMut};
 // use std::sync::{Arc, RwLock};