diff options
| author | Sai Praveen Bangaru <31557731+saipraveenb25@users.noreply.github.com> | 2024-07-10 13:53:35 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-10 10:53:35 -0700 |
| commit | 4a247244715e35872ab2359e9bc7cd55b5ea27d4 (patch) | |
| tree | ad5402cf83cd17cd923ad410a734d968c60def1b /tests | |
| parent | 8ed0f49d337338426c05aa643106098e755b8d9d (diff) | |
Various fixes around differentiable member associations `[DerivativeMember(<diff-member>)]` (#4525)
* Add diagnostic for missing diff-member associations
+ Automatically create diff member associations if differential type is the same as the primal type.
+ Move diff-member attribute checking to conformance-checking phase to avoid circularity issues.
Fixes #4103
* Update slang-check-decl.cpp
---------
Co-authored-by: Yong He <yonghe@outlook.com>
Diffstat (limited to 'tests')
5 files changed, 86 insertions, 1 deletions
diff --git a/tests/autodiff/diff-make-struct-with-associations.slang b/tests/autodiff/diff-make-struct-with-associations.slang new file mode 100644 index 000000000..371e03216 --- /dev/null +++ b/tests/autodiff/diff-make-struct-with-associations.slang @@ -0,0 +1,36 @@ +//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 Foo : IDifferentiable +{ + typealias Differential = Foo; + float x[3]; +}; + +[Differentiable] +Foo getFoo(float x) +{ + return { { x, x, x } }; +} + +[Differentiable] +float foobar(float x) +{ + int i = 3 * int(floor(x)); + Foo foo = getFoo(x); + return foo.x[i] * foo.x[i]; +} + +[numthreads(1, 1, 1)] +void computeMain(uint3 dispatchThreadID: SV_DispatchThreadID) +{ + { + float a = 0.5; + var d = fwd_diff(foobar)(diffPair(a, 1.0)).d; + outputBuffer[0] = d; + } +}
\ No newline at end of file diff --git a/tests/autodiff/diff-make-struct-with-associations.slang.expected.txt b/tests/autodiff/diff-make-struct-with-associations.slang.expected.txt new file mode 100644 index 000000000..97de29f1f --- /dev/null +++ b/tests/autodiff/diff-make-struct-with-associations.slang.expected.txt @@ -0,0 +1,5 @@ +type: float +1.000000 +0.000000 +0.000000 +0.000000 diff --git a/tests/autodiff/generic-impl-jvp.slang b/tests/autodiff/generic-impl-jvp.slang index 4e28eeaf8..e5999b4ae 100644 --- a/tests/autodiff/generic-impl-jvp.slang +++ b/tests/autodiff/generic-impl-jvp.slang @@ -12,6 +12,7 @@ __generic<T : IDifferentiable, let N : int> struct dvector : IDifferentiable { typedef dvector<T.Differential, N> Differential; + [DerivativeMember(Differential.values)] T values[N]; }; diff --git a/tests/autodiff/getter-setter.slang b/tests/autodiff/getter-setter.slang index 1b0b8232e..68c0b30c7 100644 --- a/tests/autodiff/getter-setter.slang +++ b/tests/autodiff/getter-setter.slang @@ -17,7 +17,7 @@ struct A : IDifferentiable [DerivativeMember(B.z)] float x; - float y; + no_diff float y; [__unsafeForceInlineEarly] static Differential dzero() diff --git a/tests/autodiff/struct-without-diff-associations.slang b/tests/autodiff/struct-without-diff-associations.slang new file mode 100644 index 000000000..dea7b9630 --- /dev/null +++ b/tests/autodiff/struct-without-diff-associations.slang @@ -0,0 +1,43 @@ +//TEST:SIMPLE(filecheck=CHECK): -target hlsl -line-directive-mode none -entry computeMain -stage compute + +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer +RWStructuredBuffer<float> outputBuffer; + +struct Foo2 : IDifferentiable +{ + float dx[3]; +} + +struct Foo : IDifferentiable +{ + typealias Differential = Foo2; + + float x[3]; + // CHECK: tests/autodiff/struct-without-diff-associations.slang(15): error 30102: differentiable member 'x' should have a corresponding field in 'Foo2'. Use [DerivativeMember(Foo2.<field-name>)] or mark as no_diff + // CHECK-NEXT: float x[3]; + // CHECK-NEXT: ^ +}; + +[Differentiable] +Foo getFoo(float x) +{ + return { { x, x, x } }; +} + +[Differentiable] +float foobar(float x) +{ + int i = 3 * int(floor(x)); + Foo foo = getFoo(x); + return foo.x[i] * foo.x[i]; +} + +[numthreads(1, 1, 1)] +void computeMain(uint3 dispatchThreadID: SV_DispatchThreadID) +{ + { + float a = 0.5; + var d = fwd_diff(foobar)(diffPair(a, 1.0)).d; + outputBuffer[0] = d; + } +}
\ No newline at end of file |
