Merge branch 'main' into cleaner-operator-syntax

# Conflicts:
#	dynamic_expressions/tests/test_math_wrappers_coverage.rs
#	dynamic_expressions/tests/test_opset_macro_panics.rs
#	symbolic_regression/src/prelude.rs

Author: MilesCranmer

.github/workflows/publish-crates.yml

@@ -11,6 +11,13 @@ on:
       CARGO_REGISTRY_TOKEN:
         required: true
 
+  workflow_dispatch:
+    inputs:
+      git_ref:
+        description: Git ref to publish from (tag, SHA, or branch)
+        required: true
+        type: string
+
 env:
   CARGO_TERM_COLOR: always
 
@@ -21,46 +28,47 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
         with:
-          ref: ${{ inputs.git_ref }}
+          ref: ${{ inputs.git_ref || github.event.inputs.git_ref }}
 
       - name: Install Rust
         uses: actions-rust-lang/setup-rust-toolchain@v1
 
       - name: Rust cache
         uses: Swatinem/rust-cache@v2
 
-      - name: Publish dynamic_expressions
+      - name: Publish crates
         shell: bash
+        env:
+          CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
         run: |
           set -euo pipefail
-          CRATE=dynamic_expressions
-          VERSION=$(cargo metadata --no-deps --format-version 1 | python3 -c 'import json,sys; d=json.load(sys.stdin); print([p["version"] for p in d["packages"] if p["name"]=="dynamic_expressions"][0])')
-          if curl -sSf "https://crates.io/api/v1/crates/$CRATE" | grep -q "\"num\":\"$VERSION\""; then
-            echo "$CRATE $VERSION already exists on crates.io – skipping publish."
-          else
-            cargo publish -p "$CRATE" --verbose --no-verify --token "${{ secrets.CARGO_REGISTRY_TOKEN }}"
-          fi
 
-      - name: Publish symbolic_regression
-        shell: bash
-        run: |
-          set -euo pipefail
-          CRATE=symbolic_regression
-          VERSION=$(cargo metadata --no-deps --format-version 1 | python3 -c 'import json,sys; d=json.load(sys.stdin); print([p["version"] for p in d["packages"] if p["name"]=="symbolic_regression"][0])')
-          if curl -sSf "https://crates.io/api/v1/crates/$CRATE" | grep -q "\"num\":\"$VERSION\""; then
-            echo "$CRATE $VERSION already exists on crates.io – skipping publish."
-          else
-            cargo publish -p "$CRATE" --verbose --no-verify --token "${{ secrets.CARGO_REGISTRY_TOKEN }}"
-          fi
+          publish_or_skip_if_exists() {
+            local crate="$1"
+            echo "::group::cargo publish -p ${crate}"
+            set +e
+            out="$(cargo publish -p "$crate" --verbose --no-verify 2>&1)"
+            code=$?
+            set -e
+            echo "$out"
+            echo "::endgroup::"
 
-      - name: Publish symbolic_regression_wasm
-        shell: bash
-        run: |
-          set -euo pipefail
-          CRATE=symbolic_regression_wasm
-          VERSION=$(cargo metadata --no-deps --format-version 1 | python3 -c 'import json,sys; d=json.load(sys.stdin); print([p["version"] for p in d["packages"] if p["name"]=="symbolic_regression_wasm"][0])')
-          if curl -sSf "https://crates.io/api/v1/crates/$CRATE" | grep -q "\"num\":\"$VERSION\""; then
-            echo "$CRATE $VERSION already exists on crates.io – skipping publish."
-          else
-            cargo publish -p "$CRATE" --verbose --no-verify --token "${{ secrets.CARGO_REGISTRY_TOKEN }}"
-          fi
+            if [ "$code" -eq 0 ]; then
+              echo "${crate}: published"
+              return 0
+            fi
+
+            if echo "$out" | grep -q "already exists on crates.io index"; then
+              echo "${crate}: already published, skipping"
+              return 0
+            fi
+
+            echo "${crate}: publish failed"
+            exit "$code"
+          }
+
+          publish_or_skip_if_exists dynamic_expressions
+          sleep 15
+          publish_or_skip_if_exists symbolic_regression
+          sleep 15
+          publish_or_skip_if_exists symbolic_regression_wasm

.release-please-manifest.json

@@ -1,5 +1,5 @@
 {
   "dynamic_expressions": "0.9.1",
-  "symbolic_regression": "0.11.0",
-  "web/wasm": "0.7.1"
+  "symbolic_regression": "0.12.0",
+  "web/wasm": "0.7.2"
 }

dynamic_expressions/src/evaluate.rs

@@ -2,7 +2,7 @@ use ndarray::{Array2, ArrayView2};
 use num_traits::Float;
 
 use crate::compile::{EvalPlan, build_node_hash, compile_plan};
-use crate::dispatch::{EvalKernelCtx, GradRef, SrcRef};
+use crate::dispatch::{EvalKernelCtx, SrcRef};
 use crate::expression::PostfixExpr;
 use crate::node::Src;
 use crate::traits::{OpId, OperatorSet};
@@ -111,76 +111,6 @@ pub(crate) fn resolve_val_src<'a, T: Float>(
     }
 }
 
-pub(crate) fn resolve_der_src<'a, T: Float>(
-    src: Src,
-    direction: usize,
-    dst_slot: usize,
-    before: &'a [T],
-    after: &'a [T],
-    n_rows: usize,
-) -> SrcRef<'a, T> {
-    match src {
-        Src::Var(f) => {
-            if f as usize == direction {
-                SrcRef::Const(T::one())
-            } else {
-                SrcRef::Const(T::zero())
-            }
-        }
-        Src::Const(_) => SrcRef::Const(T::zero()),
-        Src::Slot(s) => {
-            let slot = s as usize;
-            if slot < dst_slot {
-                let start = slot * n_rows;
-                SrcRef::Slice(&before[start..start + n_rows])
-            } else if slot > dst_slot {
-                let start = (slot - dst_slot - 1) * n_rows;
-                SrcRef::Slice(&after[start..start + n_rows])
-            } else {
-                panic!("source references dst slot");
-            }
-        }
-    }
-}
-
-pub(crate) fn resolve_grad_src<'a, T: Float>(
-    src: Src,
-    variable: bool,
-    dst_slot: usize,
-    before: &'a [T],
-    after: &'a [T],
-    slot_stride: usize,
-) -> GradRef<'a, T> {
-    match src {
-        Src::Var(f) => {
-            if variable {
-                GradRef::Basis(f as usize)
-            } else {
-                GradRef::Zero
-            }
-        }
-        Src::Const(c) => {
-            if variable {
-                GradRef::Zero
-            } else {
-                GradRef::Basis(c as usize)
-            }
-        }
-        Src::Slot(s) => {
-            let slot = s as usize;
-            if slot < dst_slot {
-                let start = slot * slot_stride;
-                GradRef::Slice(&before[start..start + slot_stride])
-            } else if slot > dst_slot {
-                let start = (slot - dst_slot - 1) * slot_stride;
-                GradRef::Slice(&after[start..start + slot_stride])
-            } else {
-                panic!("source references dst slot");
-            }
-        }
-    }
-}
-
 pub fn eval_tree_array<T, Ops, const D: usize>(
     expr: &PostfixExpr<T, Ops, D>,
     x_columns: ArrayView2<'_, T>,