From 499b0253c224e68ceed6e5b6b1ee9cd7d65aad0f Mon Sep 17 00:00:00 2001 From: Yong He Date: Mon, 30 Jan 2023 19:24:09 -0800 Subject: Make ArrayExpressionType a DeclRefType and define its autodiff extension in stdlib. (#2615) * Allow array parameters in forward diff. * Use type canonicalization instead of coersion. * Reimplement array type. * Fix. * Update test case. --------- Co-authored-by: Yong He --- tests/autodiff/fwd-array-out-param.slang | 46 ++++++++++++++++++++++ .../fwd-array-out-param.slang.expected.txt | 6 +++ 2 files changed, 52 insertions(+) create mode 100644 tests/autodiff/fwd-array-out-param.slang create mode 100644 tests/autodiff/fwd-array-out-param.slang.expected.txt (limited to 'tests') diff --git a/tests/autodiff/fwd-array-out-param.slang b/tests/autodiff/fwd-array-out-param.slang new file mode 100644 index 000000000..26c77c976 --- /dev/null +++ b/tests/autodiff/fwd-array-out-param.slang @@ -0,0 +1,46 @@ +//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -shaderobj -output-using-type +//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -shaderobj -output-using-type + +//TEST_INPUT:ubuffer(data=[0 0 0 0 0], stride=4):out,name=outputBuffer +RWStructuredBuffer outputBuffer; + +struct D : IDifferentiable +{ + float n; + float m; +} + +[ForwardDifferentiable] +float f(D d, int i, out D outArray[1][2]) +{ + outArray[0][0].m = d.n; + outArray[0][0].n = d.m * 3.0f + 1.0; + + outArray[0][1].m = d.n * d.n; + outArray[0][1].n = d.m * 4.0f + 1.0; + + return outArray[0][0].m + outArray[0][1].n * 2.0; +} + +[numthreads(1, 1, 1)] +void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID) +{ + D d = { 1.0, 2.0 }; + D.Differential dd = { 1.0, 1.0 }; + + var dpd = diffPair(d, dd); + + D tmp[1][2] = { { { 1.0, 1.0 }, { 1.0, 1.0 } } }; + DifferentialPair dOut = diffPair(tmp); + var result = __fwd_diff(f)(dpd, 1, dOut).d; + + // dOut.d has type D[2][1].Differential. Verify that it can coerce to D.Differential[2][1]. + D.Differential darrCopy[1][2] = dOut.d; + + outputBuffer[0] = result; + outputBuffer[1] = dOut.d[0][0].n; + outputBuffer[2] = dOut.d[0][0].m; + outputBuffer[3] = darrCopy[0][1].n; + outputBuffer[4] = darrCopy[0][1].m; + +} diff --git a/tests/autodiff/fwd-array-out-param.slang.expected.txt b/tests/autodiff/fwd-array-out-param.slang.expected.txt new file mode 100644 index 000000000..7133763d0 --- /dev/null +++ b/tests/autodiff/fwd-array-out-param.slang.expected.txt @@ -0,0 +1,6 @@ +type: float +9.000000 +3.000000 +1.000000 +4.000000 +2.000000 -- cgit v1.2.3