From a00234388d1b4e14481067d030bf90031258b756 Mon Sep 17 00:00:00 2001 From: Tom Smeding Date: Wed, 26 Mar 2025 15:11:48 +0100 Subject: D2[Array] now has a Maybe instead of zero-size for zero Remaining problem: 'add' in Compile doesn't use the D2 stuff --- src/CHAD/Types/ToTan.hs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/CHAD/Types/ToTan.hs') diff --git a/src/CHAD/Types/ToTan.hs b/src/CHAD/Types/ToTan.hs index a75fdb8..f843206 100644 --- a/src/CHAD/Types/ToTan.hs +++ b/src/CHAD/Types/ToTan.hs @@ -29,14 +29,14 @@ toTan typ primal der = case typ of (Right p, Right d') -> Right (toTan t2 p d') _ -> error "Primal and cotangent disagree on Either alternative" STMaybe t -> liftA2 (toTan t) primal der - STArr _ t - | shapeSize (arrayShape der) == 0 -> - arrayMap (zeroTan t) primal - | arrayShape primal == arrayShape der -> - arrayGenerateLin (arrayShape primal) $ \i -> - toTan t (arrayIndexLinear primal i) (arrayIndexLinear der i) - | otherwise -> - error "Primal and cotangent disagree on array shape" + STArr _ t -> case der of + Nothing -> arrayMap (zeroTan t) primal + Just d + | arrayShape primal == arrayShape d -> + arrayGenerateLin (arrayShape primal) $ \i -> + toTan t (arrayIndexLinear primal i) (arrayIndexLinear d i) + | otherwise -> + error "Primal and cotangent disagree on array shape" STScal sty -> case sty of STI32 -> der ; STI64 -> der ; STF32 -> der ; STF64 -> der ; STBool -> der STAccum{} -> error "Accumulators not allowed in input program" -- cgit v1.2.3-70-g09d2