Skip to content

fix: unary plus tangent #144

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
martinjrobins merged 3 commits into from
Jul 13, 2026
Merged

fix: unary plus tangent #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c795ea5
fix: unary plus tangent
martinjrobins Jul 13, 2026
0fb93f6
fix: clippy
martinjrobins Jul 13, 2026
ff93284
fix: clippy
martinjrobins Jul 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions diffsl/src/ast/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -583,6 +583,7 @@ impl<'a> Ast<'a> {
},
AstKind::Monop(monop) => match monop.op {
'-' => Self::new_monop('-', monop.child.tangent()),
'+' => monop.child.tangent(),
_ => panic!("Tangent not implemented for operator {}", monop.op),
},
AstKind::Call(call) => {
Expand Down
2 changes: 1 addition & 1 deletion diffsl/src/continuous/builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ impl<'s> ModelInfo<'s> {
}
}

for (_, v_cell) in self.variables.iter() {
for v_cell in self.variables.values() {
// check all non-algebraic state variables have an initial condition
let v = v_cell.borrow();
if v.is_state() && v.has_equation() {
Expand Down
1 change: 1 addition & 0 deletions diffsl/src/execution/compiler.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3142,6 +3142,7 @@ mod tests {
state_and_const_grad3: "r_i { 2 * p, 3 }" expect "r" vec![2., 0.] ; vec![2.] ; vec![2., 0.] ; vec![2.],
state_and_const_grad4: "r_i { 3 * p, 2 * p }" expect "r" vec![3., 2.] ; vec![5.] ; vec![3., 2.] ; vec![5.],
pow_zero_grad: "r { pow(y - p, p) }" expect "r" vec![0.] ; vec![0.] ; vec![-1.] ; vec![-1.],
unary_plus_grad: "r { +y }" expect "r" vec![1.] ; vec![1.] ; vec![0.] ; vec![0.],
}

macro_rules! tensor_test_big_state {
Expand Down
13 changes: 7 additions & 6 deletions diffsl/src/execution/cranelift/codegen.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1382,6 +1382,7 @@ impl<'ctx, M: Module> CraneliftCodeGen<'ctx, M> {
self.jit_compile_expr(name, monop.child.as_ref(), index, elmt, expr_index)?;
match monop.op {
'-' => Ok(self.builder.ins().fneg(child)),
'+' => Ok(child),
unknown => Err(anyhow!("unknown monop op '{}'", unknown)),
}
}
Expand Down Expand Up @@ -1641,13 +1642,13 @@ impl<'ctx, M: Module> CraneliftCodeGen<'ctx, M> {
) -> Result<Value> {
let mut hasher = std::collections::hash_map::DefaultHasher::new();
if call.is_tangent {
std::hash::Hash::hash(&format!("{:?}", &call.args[0]), &mut hasher);
std::hash::Hash::hash(&format!("{:?}", &call.args[2]), &mut hasher);
std::hash::Hash::hash(&format!("{:?}", &call.args[4]), &mut hasher);
std::hash::Hash::hash(&format!("{:?}", call.args[0]), &mut hasher);
std::hash::Hash::hash(&format!("{:?}", call.args[2]), &mut hasher);
std::hash::Hash::hash(&format!("{:?}", call.args[4]), &mut hasher);
} else {
std::hash::Hash::hash(&format!("{:?}", &call.args[0]), &mut hasher);
std::hash::Hash::hash(&format!("{:?}", &call.args[1]), &mut hasher);
std::hash::Hash::hash(&format!("{:?}", &call.args[2]), &mut hasher);
std::hash::Hash::hash(&format!("{:?}", call.args[0]), &mut hasher);
std::hash::Hash::hash(&format!("{:?}", call.args[1]), &mut hasher);
std::hash::Hash::hash(&format!("{:?}", call.args[2]), &mut hasher);
}
let hash_key = std::hash::Hasher::finish(&hasher);
let info = self
Expand Down
6 changes: 3 additions & 3 deletions diffsl/src/execution/data_layout.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,9 +353,9 @@ impl DataLayout {
// deterministic hash from the call args (x, y, q)
// — must match codegen; only hash base args, never the full Call
let mut hasher = std::collections::hash_map::DefaultHasher::new();
format!("{:?}", &call.args[0]).hash(&mut hasher);
format!("{:?}", &call.args[1]).hash(&mut hasher);
format!("{:?}", &call.args[2]).hash(&mut hasher);
format!("{:?}", call.args[0]).hash(&mut hasher);
format!("{:?}", call.args[1]).hash(&mut hasher);
format!("{:?}", call.args[2]).hash(&mut hasher);
let hash_key = hasher.finish();

let info = Interp1dInfo {
Expand Down
13 changes: 7 additions & 6 deletions diffsl/src/execution/llvm/codegen.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3021,6 +3021,7 @@ impl<'ctx> CodeGen<'ctx> {
self.jit_compile_expr(name, monop.child.as_ref(), index, elmt, expr_index)?;
match monop.op {
'-' => Ok(self.builder.build_float_neg(child, name)?),
'+' => Ok(child),
unknown => Err(anyhow!("unknown monop op '{}'", unknown)),
}
}
Expand Down Expand Up @@ -3270,13 +3271,13 @@ impl<'ctx> CodeGen<'ctx> {
let mut hasher = std::collections::hash_map::DefaultHasher::new();
if call.is_tangent {
// tangent has doubled args: take original (x, y, q) at indices 0, 2, 4
std::hash::Hash::hash(&format!("{:?}", &call.args[0]), &mut hasher);
std::hash::Hash::hash(&format!("{:?}", &call.args[2]), &mut hasher);
std::hash::Hash::hash(&format!("{:?}", &call.args[4]), &mut hasher);
std::hash::Hash::hash(&format!("{:?}", call.args[0]), &mut hasher);
std::hash::Hash::hash(&format!("{:?}", call.args[2]), &mut hasher);
std::hash::Hash::hash(&format!("{:?}", call.args[4]), &mut hasher);
} else {
std::hash::Hash::hash(&format!("{:?}", &call.args[0]), &mut hasher);
std::hash::Hash::hash(&format!("{:?}", &call.args[1]), &mut hasher);
std::hash::Hash::hash(&format!("{:?}", &call.args[2]), &mut hasher);
std::hash::Hash::hash(&format!("{:?}", call.args[0]), &mut hasher);
std::hash::Hash::hash(&format!("{:?}", call.args[1]), &mut hasher);
std::hash::Hash::hash(&format!("{:?}", call.args[2]), &mut hasher);
}
let hash_key = std::hash::Hasher::finish(&hasher);
let info = self
Expand Down
Loading