V0.3.1 dev

.github/workflows/crates.yml

@@ -5,7 +5,7 @@ concurrency:
   cancel-in-progress: false
 
 env:
-  CARGO_PREFIX: ${{ github.event.repository.name }}
+  BASENAME: ${{ github.event.repository.name }}
   CARGO_TERM_COLOR: always
 
 on:
@@ -20,13 +20,13 @@ jobs:
     name: Publish (core)
     runs-on: ubuntu-latest
     env:
-      CARGO_PACKAGE_NAME: ${{ github.event.repository.name }}-core
+      CARGO_PACKAGE_NAME: ${{ github.env.BASENAME }}-core
     steps:
       - uses: actions/checkout@v4
       - name: Publish (${{ env.CARGO_PACKAGE_NAME }})
         run: cargo publish --all-features -v -p ${{ env.CARGO_PACKAGE_NAME }} --token ${{ secrets.CARGO_REGISTRY_TOKEN }}
   features:
-    name: Publish (sdk)
+    name: Publish Features
     needs: core
     runs-on: ubuntu-latest
     strategy:
@@ -39,10 +39,12 @@ jobs:
       - name: Publish (${{ env.CARGO_PACKAGE_NAME }})
         run: cargo publish --all-features -v -p ${{ env.CARGO_PACKAGE_NAME }} --token ${{ secrets.CARGO_REGISTRY_TOKEN }}
   publish:
-    name: Publish (${{ github.repository.name }})
+    env:
+      CARGO_PACKAGE_NAME: ${{ github.event.repository.name }}
+    name: Publish SDK
     needs: features
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Publish (${{ github.event.repository.name }})
-        run: cargo publish --all-features -v -p ${{ github.event.repository.name }} --token ${{ secrets.CARGO_REGISTRY_TOKEN }}
+      - name: Publish (${{ env.CARGO_PACKAGE_NAME }})
+        run: cargo publish --all-features -v -p ${{ env.CARGO_PACKAGE_NAME }} --token ${{ secrets.CARGO_REGISTRY_TOKEN }}

.gitignore

@@ -51,8 +51,10 @@
 /**/venv/
 
 # Rust
-/**/debug/
-/**/target/
+**/debug/
+**/target/
+
+rustc-ice-**.txt
 
 # Svelte
 /**/.DS_STORE/

Cargo.toml

@@ -15,21 +15,24 @@ version = "0.3.1"
 default-members = [
     "acme"
 ]
+
 exclude = [ 
-
+    "exp/container",
 ]
+
 members = [
     "acme", 
     "core",
     "derive",
     "graphs",
     "macros",
     "tensor",
-    "exp/ndtensor",
+
 ]
 resolver = "2"
 
 [workspace.dependencies]
+paste = "1"
 strum = { features = ["derive"], version = "0.26" }
 smart-default = "0.7"
 

acme/Cargo.toml

@@ -13,7 +13,7 @@ version.workspace = true
 
 [features]
 default = [
-    "core", 
+    "core",
     "tensor",
 ]
 
@@ -22,7 +22,8 @@ full = [
     "derive",
     "graph",
     "serde",
-    "tensor"
+    "tensor",
+    "trace",
 ]
 
 core = []
@@ -59,6 +60,11 @@ tensor = [
     "dep:acme-tensor"
 ]
 
+trace = [
+    "acme-core/trace",
+    "acme-graphs/trace",
+]
+
 
 
 
@@ -81,6 +87,11 @@ required-features = ["macros"]
 name = "graph"
 required-features = ["graph"]
 
+[[example]]
+name = "macros"
+required-features = ["macros"]
+
+
 [[test]]
 name = "macros"
 required-features = ["macros"]

acme/benches/default.rs

@@ -20,7 +20,7 @@ fn recursive_fibonacci(b: &mut Bencher) {
 
 #[bench]
 fn iterative_fibonacci(b: &mut Bencher) {
-    b.iter(|| fib::Fibonacci::seq().take(BENCH_SIZE))
+    b.iter(|| fib::Fibonacci::seq().take(BENCH_SIZE).collect::<Vec<_>>())
 }
 
 pub mod fib {

acme/examples/autodiff.rs

@@ -3,7 +3,7 @@
     Contrib: FL03 <jo3mccain@icloud.com>
 */
 // #![cfg(feature = "macros")]
-
+#![allow(unused_variables)]
 extern crate acme;
 
 use acme::autodiff;

acme/examples/macros.rs

@@ -0,0 +1,35 @@
+/*
+    Appellation: autodiff <example>
+    Contrib: FL03 <jo3mccain@icloud.com>
+*/
+extern crate acme;
+
+use acme::{autodiff, operator};
+use num::Float;
+
+fn main() -> acme::prelude::BoxResult {
+    let x = 5f64;
+    let lex = sigmoid_lexical();
+    println!("{}", sigmoid(x));
+    println!("{}", sigmoid_lexical());
+    let dx = sigmoid_prime(x);
+    // assert_eq!(dx, autodiff!(x: SIGMOID_LEXICAL));
+    println!("{}", dx);
+
+    Ok(())
+}
+
+#[operator]
+pub fn sigmoid<T>(x: T) -> T
+where
+    T: Float,
+{
+    x.exp() / (T::one() + x.exp())
+}
+
+pub fn sigmoid_prime<T>(x: T) -> T
+where
+    T: Float,
+{
+    sigmoid(x) * (T::one() - sigmoid(x))
+}

acme/examples/simple.rs

@@ -8,9 +8,7 @@ use acme::prelude::{nested, BoxResult};
 
 fn main() -> BoxResult {
     nested!(
-        for i in 0..3,
-        for j in 0..3,
-        for k in 0..3 => {
+        i in 0..3 => j in 0..3 => k in 0..3 => {
         println!("({}, {}, {})", i, j, k)
     });
     Ok(())

acme/tests/macros.rs

@@ -2,63 +2,25 @@
     Appellation: macros <test>
     Contrib: FL03 <jo3mccain@icloud.com>
 */
-#![allow(unused)]
+#![allow(unused_variables)]
+#![feature(fn_traits, tuple_trait, unboxed_closures)]
 #![cfg(all(test, feature = "macros"))]
 
 extern crate acme;
 
 use acme::prelude::autodiff;
-use num::Float;
+use utils::*;
 
-pub fn sigmoid<T>(x: T) -> T
-where
-    T: Float,
-{
-    (T::one() + x.neg().exp()).recip()
-}
-
-pub trait Sigmoid {
-    fn sigmoid(self) -> Self;
-}
-
-impl<T> Sigmoid for T
-where
-    T: Float,
-{
-    fn sigmoid(self) -> Self {
-        (T::one() + self.neg().exp()).recip()
-    }
-}
-
-pub fn add<A, B, C>(a: A, b: B) -> C
-where
-    A: std::ops::Add<B, Output = C>,
-{
-    a + b
-}
-
-pub fn sigmoid_prime<T>(x: T) -> T
-where
-    T: Float,
-{
-    x.neg().exp() / (T::one() + x.neg().exp()).powi(2)
-}
-
-trait Square {
-    fn square(self) -> Self;
-}
-
-impl<T> Square for T
-where
-    T: Copy + std::ops::Mul<Output = T>,
-{
-    fn square(self) -> Self {
-        self * self
-    }
+#[test]
+#[ignore = "Custom function calls are not yet supported"]
+fn test_func_handler() {
+    let (x, y) = (1_f64, 2_f64);
+    assert_eq!(autodiff!(x: Sample(x)), 2.0 * x);
+    // assert_eq!(autodiff!(x: Sample::mul_item), y);
 }
 
-#[ignore = "Currently, support for function calls is not fully implemented"]
 #[test]
+#[ignore = "Custom function calls are not yet supported"]
 fn test_function_call() {
     let (x, y) = (1_f64, 2_f64);
     // differentiating a function call w.r.t. x
@@ -68,11 +30,92 @@ fn test_function_call() {
     assert_eq!(autodiff!(y: sigmoid::<f64>(y)), sigmoid_prime(y));
 }
 
-#[ignore = "Custom trait methods are not yet supported"]
 #[test]
+#[ignore = "Custom trait methods are not yet supported"]
 fn test_method() {
     let (x, y) = (1_f64, 2_f64);
-    assert_eq!(autodiff!(x: x.mul(y)), 2.0);
-    assert_eq!(autodiff!(x: x.square()), 2.0);
-    assert_eq!(autodiff!(x: x.sigmoid()), sigmoid_prime(x));
+    // assert_eq!(autodiff!(x: x.sigmoid()), sigmoid_prime(x));
+}
+
+#[allow(unused)]
+mod utils {
+    use core::ops::Mul;
+    use num::traits::{Float, Pow};
+    use std::ops::FnOnce;
+
+    pub fn sigmoid<T>(x: T) -> T
+    where
+        T: Float,
+    {
+        (T::one() + x.neg().exp()).recip()
+    }
+
+    pub trait Sigmoid {
+        fn sigmoid(self) -> Self;
+    }
+
+    impl<T> Sigmoid for T
+    where
+        T: Float,
+    {
+        fn sigmoid(self) -> Self {
+            (T::one() + self.neg().exp()).recip()
+        }
+    }
+
+    pub fn add<A, B, C>(a: A, b: B) -> C
+    where
+        A: std::ops::Add<B, Output = C>,
+    {
+        a + b
+    }
+
+    pub fn sigmoid_prime<T>(x: T) -> T
+    where
+        T: Float,
+    {
+        x.neg().exp() / (T::one() + x.neg().exp()).powi(2)
+    }
+
+    trait Square {
+        fn square(self) -> Self;
+    }
+
+    impl<T> Square for T
+    where
+        T: Pow<i32, Output = T>,
+    {
+        fn square(self) -> Self {
+            self.pow(2)
+        }
+    }
+
+    pub struct Sample;
+
+    impl Sample {
+        pub fn sqr<T>(x: T) -> T
+        where
+            T: Copy + Mul<T, Output = T>,
+        {
+            x * x
+        }
+
+        pub fn item_fn<T>(&self) -> fn(T) -> T
+        where
+            T: Copy + Mul<T, Output = T>,
+        {
+            Self::sqr
+        }
+    }
+
+    impl<T> FnOnce<(T,)> for Sample
+    where
+        T: Copy + Mul<T, Output = T>,
+    {
+        type Output = T;
+
+        extern "rust-call" fn call_once(self, args: (T,)) -> Self::Output {
+            Self::sqr(args.0)
+        }
+    }
 }

core/Cargo.toml

@@ -25,6 +25,10 @@ serde-ext = [
 
 std = []
 
+trace = [
+    "dep:tracing",
+]
+
 [lib]
 bench = false
 crate-type = ["cdylib", "rlib"]
@@ -33,15 +37,16 @@ test = true
 
 [build-dependencies]
 
-[dev-dependencies]
-
 [dependencies]
-lazy_static = "1"
 num = "0.4"
 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]
+lazy_static = "1"
 
 [package.metadata.docs.rs]
 all-features = true