diff options
| author | Sai Praveen Bangaru <31557731+saipraveenb25@users.noreply.github.com> | 2024-02-26 18:22:16 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-26 15:22:16 -0800 |
| commit | ceb87b25b387411dbb7978caf04ecd9e948493e3 (patch) | |
| tree | 62b8eb42661498354e1f92043672da0de85c14d2 | |
| parent | d7bb80673a3ef91ec904ca487dcc71315054c654 (diff) | |
AD: Handle case where struct is created with `no_diff`-wrapped operands. (#3629)
* Handle case where struct is created with `no_diff`-wrapped operands.
* Add test to reproduce crash upon initializing a struct with `no_diff`-wrapped operand type
* Add expected result for test
| -rw-r--r-- | source/slang/slang-ir-autodiff-fwd.cpp | 19 | ||||
| -rw-r--r-- | tests/autodiff/make-struct-non-diff-operand.slang | 30 | ||||
| -rw-r--r-- | tests/autodiff/make-struct-non-diff-operand.slang.expected.txt | 5 |
3 files changed, 51 insertions, 3 deletions
diff --git a/source/slang/slang-ir-autodiff-fwd.cpp b/source/slang/slang-ir-autodiff-fwd.cpp index 2f61dfa72..334d4e678 100644 --- a/source/slang/slang-ir-autodiff-fwd.cpp +++ b/source/slang/slang-ir-autodiff-fwd.cpp @@ -498,9 +498,22 @@ InstPair ForwardDiffTranscriber::transcribeMakeStruct(IRBuilder* builder, IRInst { auto operandDataType = origMakeStruct->getOperand(ii)->getDataType(); auto diffOperandType = differentiateType(builder, operandDataType); - SLANG_RELEASE_ASSERT(diffOperandType); - operandDataType = (IRType*)findOrTranscribePrimalInst(builder, operandDataType); - diffOperands.add(getDifferentialZeroOfType(builder, operandDataType)); + + if (diffOperandType) + { + operandDataType = (IRType*)findOrTranscribePrimalInst(builder, operandDataType); + diffOperands.add(getDifferentialZeroOfType(builder, operandDataType)); + } + else + { + // This case is only hit if the field is of a differentiable type but the operand is of + // a non-differentiable type. This can happen if the operand is wrapped in no_diff. + // In this case, we use the derivative of the field type to synthesize the 0. + // + auto diffFieldOperandType = differentiateType(builder, field->getFieldType()); + SLANG_RELEASE_ASSERT(diffFieldOperandType); + diffOperands.add(getDifferentialZeroOfType(builder, (IRType*)diffFieldOperandType)); + } } ii++; } diff --git a/tests/autodiff/make-struct-non-diff-operand.slang b/tests/autodiff/make-struct-non-diff-operand.slang new file mode 100644 index 000000000..cdfb6b6bc --- /dev/null +++ b/tests/autodiff/make-struct-non-diff-operand.slang @@ -0,0 +1,30 @@ +//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], stride=4):out,name=outputBuffer +RWStructuredBuffer<float> outputBuffer; + +struct AggType : IDifferentiable +{ + float field1; + float field2; +} + +[BackwardDifferentiable] +AggType makeTypeWithNonDiffOps(no_diff float f1, float f2) +{ + AggType v = { f1, f2 }; + return v; +} + +[numthreads(1, 1, 1)] +void computeMain(uint3 dispatchThreadID: SV_DispatchThreadID) +{ + AggType v = { 0, 2.0 }; + AggType.Differential dv = { 1.3, 4.2 }; + + var f2pair = diffPair(2.0, 0.0); + + __bwd_diff(makeTypeWithNonDiffOps)(1.0, f2pair, dv); + outputBuffer[0] = f2pair.d; +}
\ No newline at end of file diff --git a/tests/autodiff/make-struct-non-diff-operand.slang.expected.txt b/tests/autodiff/make-struct-non-diff-operand.slang.expected.txt new file mode 100644 index 000000000..0f62dd9c7 --- /dev/null +++ b/tests/autodiff/make-struct-non-diff-operand.slang.expected.txt @@ -0,0 +1,5 @@ +type: float +4.200000 +0.000000 +0.000000 +0.000000 |
