From 1717c6c507043a5cc960c2344dd556524804ce59 Mon Sep 17 00:00:00 2001 From: Yong He Date: Tue, 25 Apr 2023 18:32:45 -0700 Subject: Support recomputing phi params in bwd prop func. (#2841) --- source/slang/diff.meta.slang | 77 +++++++++++++++++++++++++++++++++++--------- 1 file changed, 62 insertions(+), 15 deletions(-) (limited to 'source/slang/diff.meta.slang') diff --git a/source/slang/diff.meta.slang b/source/slang/diff.meta.slang index cb87156f5..f8b36a3ac 100644 --- a/source/slang/diff.meta.slang +++ b/source/slang/diff.meta.slang @@ -362,6 +362,7 @@ extension Array : IDifferentiable __generic [ForceInline] [ForwardDerivativeOf(transpose)] +[PreferRecompute] DifferentialPair> __d_transpose(DifferentialPair> m) { return DifferentialPair>(transpose(m.p), transpose(m.d)); @@ -370,6 +371,7 @@ DifferentialPair> __d_transpose(DifferentialPair __generic [ForceInline] [BackwardDerivativeOf(transpose)] +[PreferRecompute] void __d_transpose(inout DifferentialPair> m, matrix.Differential dOut) { m = diffPair(m.p, transpose(dOut)); @@ -379,6 +381,7 @@ void __d_transpose(inout DifferentialPair> m, matrix.Di __generic [ForceInline] [ForwardDerivativeOf(mul)] +[PreferRecompute] DifferentialPair> mul(DifferentialPair> left, DifferentialPair> right) { let primal = mul(left.p, right.p); @@ -388,6 +391,7 @@ DifferentialPair> mul(DifferentialPair> left, Differen __generic [BackwardDerivativeOf(mul)] +[PreferRecompute] void __d_mul(inout DifferentialPair> left, inout DifferentialPair> right, vector.Differential dOut) { vector.Differential left_d_result; @@ -410,6 +414,7 @@ void __d_mul(inout DifferentialPair> left, inout DifferentialPair [ForceInline] [ForwardDerivativeOf(mul)] +[PreferRecompute] DifferentialPair> mul(DifferentialPair> left, DifferentialPair> right) { let primal = mul(left.p, right.p); @@ -419,6 +424,7 @@ DifferentialPair> mul(DifferentialPair> left, Differen __generic [BackwardDerivativeOf(mul)] +[PreferRecompute] void __d_mul(inout DifferentialPair> left, inout DifferentialPair> right, vector.Differential dOut) { matrix.Differential left_d_result; @@ -441,6 +447,7 @@ void __d_mul(inout DifferentialPair> left, inout DifferentialPai __generic [ForceInline] [ForwardDerivativeOf(mul)] +[PreferRecompute] DifferentialPair> mul(DifferentialPair> left, DifferentialPair> right) { let primal = mul(left.p, right.p); @@ -450,6 +457,7 @@ DifferentialPair> mul(DifferentialPair> left, Differ __generic [BackwardDerivativeOf(mul)] +[PreferRecompute] void mul(inout DifferentialPair> left, inout DifferentialPair> right, matrix.Differential dOut) { matrix.Differential left_d_result; @@ -480,6 +488,7 @@ void mul(inout DifferentialPair> left, inout DifferentialPair [ForwardDerivativeOf(dot)] +[PreferRecompute] DifferentialPair __d_dot(DifferentialPair> dpx, DifferentialPair> dpy) { T result = T(0); @@ -496,6 +505,7 @@ DifferentialPair __d_dot(DifferentialPair> dpx, DifferentialPair __generic [BackwardDerivativeOf(dot)] +[PreferRecompute] void __d_dot(inout DifferentialPair> dpx, inout DifferentialPair> dpy, T.Differential dOut) { vector.Differential x_d_result, y_d_result; @@ -512,6 +522,7 @@ void __d_dot(inout DifferentialPair> dpx, inout DifferentialPair [ForwardDerivativeOf(cross)] +[PreferRecompute] DifferentialPair> __d_cross(DifferentialPair> a, DifferentialPair> b) { /* @@ -539,6 +550,7 @@ DifferentialPair> __d_cross(DifferentialPair> a, Diffe __generic [BackwardDerivativeOf(cross)] +[PreferRecompute] void __d_cross(inout DifferentialPair> a, inout DifferentialPair> b, vector.Differential dOut) { /* @@ -560,7 +572,7 @@ void __d_cross(inout DifferentialPair> a, inout DifferentialPair \ - [BackwardDifferentiable] \ + [BackwardDifferentiable][PreferRecompute] \ [ForwardDerivativeOf(NAME)] \ DifferentialPair> __d_##NAME##_vector( \ DifferentialPair> dpx, DifferentialPair> dpy) \ @@ -578,7 +590,7 @@ void __d_cross(inout DifferentialPair> a, inout DifferentialPair>(result, d_result); \ } \ __generic \ - [BackwardDifferentiable] \ + [BackwardDifferentiable][PreferRecompute] \ [ForwardDerivativeOf(NAME)] \ DifferentialPair> __d_##NAME##_matrix( \ DifferentialPair> dpx, DifferentialPair> dpy) \ @@ -597,7 +609,7 @@ void __d_cross(inout DifferentialPair> a, inout DifferentialPair>(result, d_result); \ } \ __generic \ - [BackwardDifferentiable] \ + [BackwardDifferentiable][PreferRecompute] \ [BackwardDerivativeOf(NAME)] \ void __d_##NAME##_vector( \ inout DifferentialPair> dpx, \ @@ -617,7 +629,7 @@ void __d_cross(inout DifferentialPair> a, inout DifferentialPair \ - [BackwardDifferentiable] \ + [BackwardDifferentiable][PreferRecompute] \ [BackwardDerivativeOf(NAME)] \ void __d_##NAME##_matrix( \ inout DifferentialPair> dpx, \ @@ -640,7 +652,7 @@ void __d_cross(inout DifferentialPair> a, inout DifferentialPair \ - [BackwardDifferentiable] \ + [BackwardDifferentiable][PreferRecompute] \ [ForwardDerivativeOf(NAME)] \ DifferentialPair> __d_##NAME##_vector( \ DifferentialPair> dpx, \ @@ -661,7 +673,7 @@ void __d_cross(inout DifferentialPair> a, inout DifferentialPair>(result, d_result); \ } \ __generic \ - [BackwardDifferentiable] \ + [BackwardDifferentiable][PreferRecompute] \ [ForwardDerivativeOf(NAME)] \ DifferentialPair> __d_##NAME##_matrix( \ DifferentialPair> dpx, \ @@ -683,7 +695,7 @@ void __d_cross(inout DifferentialPair> a, inout DifferentialPair>(result, d_result); \ } \ __generic \ - [BackwardDifferentiable] \ + [BackwardDifferentiable][PreferRecompute] \ [BackwardDerivativeOf(NAME)] \ void __d_##NAME##_vector( \ inout DifferentialPair> dpx, \ @@ -708,7 +720,7 @@ void __d_cross(inout DifferentialPair> a, inout DifferentialPair \ - [BackwardDifferentiable] \ + [BackwardDifferentiable][PreferRecompute] \ [BackwardDerivativeOf(NAME)] \ void __d_##NAME##_matrix( \ inout DifferentialPair> dpx, \ @@ -736,7 +748,7 @@ void __d_cross(inout DifferentialPair> a, inout DifferentialPair \ - [BackwardDifferentiable] \ + [BackwardDifferentiable][PreferRecompute] \ [ForwardDerivativeOf(NAME)] \ DifferentialPair __d_##NAME(DifferentialPair dpx) \ { \ @@ -744,7 +756,7 @@ void __d_cross(inout DifferentialPair> a, inout DifferentialPair(NAME(dpx.p), FWD_DIFF_FUNC); \ } \ __generic \ - [BackwardDifferentiable] \ + [BackwardDifferentiable][PreferRecompute] \ [ForwardDerivativeOf(NAME)] \ DifferentialPair> __d_##NAME##_vector(DifferentialPair> dpx) \ { \ @@ -752,7 +764,7 @@ void __d_cross(inout DifferentialPair> a, inout DifferentialPair(NAME(dpx.p), FWD_DIFF_FUNC); \ } \ __generic \ - [BackwardDifferentiable] \ + [BackwardDifferentiable][PreferRecompute] \ [ForwardDerivativeOf(NAME)] \ DifferentialPair> __d_##NAME##_m(DifferentialPair> dpm) \ { \ @@ -763,10 +775,10 @@ void __d_cross(inout DifferentialPair> a, inout DifferentialPair \ - [BackwardDifferentiable] \ + [BackwardDifferentiable][PreferRecompute] \ [BackwardDerivativeOf(NAME)] \ void __d_##NAME(inout DifferentialPair dpx, T.Differential dOut) \ { \ @@ -774,7 +786,7 @@ void __d_cross(inout DifferentialPair> a, inout DifferentialPair \ - [BackwardDifferentiable] \ + [BackwardDifferentiable][PreferRecompute] \ [BackwardDerivativeOf(NAME)] \ void __d_##NAME##_vector( \ inout DifferentialPair> dpx, vector.Differential dOut) \ @@ -783,7 +795,7 @@ void __d_cross(inout DifferentialPair> a, inout DifferentialPair \ - [BackwardDifferentiable] \ + [BackwardDifferentiable][PreferRecompute] \ [BackwardDerivativeOf(NAME)] \ void __d_##NAME##_matrix( \ inout DifferentialPair> m, matrix.Differential mdOut) \ @@ -848,6 +860,7 @@ SIMPLE_UNARY_DERIVATIVE_IMPL(atan, T(1.0) / (T(1.0) + dpx.p * dpx.p)) // Atan2 __generic [BackwardDifferentiable] +[PreferRecompute] [ForwardDerivativeOf(atan2)] DifferentialPair __d_atan2(DifferentialPair dpy, DifferentialPair dpx) { @@ -860,6 +873,7 @@ DifferentialPair __d_atan2(DifferentialPair dpy, DifferentialPair dpx) __generic [BackwardDifferentiable] +[PreferRecompute] [BackwardDerivativeOf(atan2)] void __d_atan2(inout DifferentialPair dpy, inout DifferentialPair dpx, T.Differential dOut) { @@ -872,6 +886,7 @@ VECTOR_MATRIX_BINARY_DIFF_IMPL(atan2) // fmod __generic [BackwardDifferentiable] +[PreferRecompute] [ForwardDerivativeOf(fmod)] DifferentialPair __d_fmod(DifferentialPair x, DifferentialPair y) { @@ -879,6 +894,7 @@ DifferentialPair __d_fmod(DifferentialPair x, DifferentialPair y) } __generic [BackwardDifferentiable] +[PreferRecompute] [BackwardDerivativeOf(fmod)] void __d_fmod(inout DifferentialPair x, inout DifferentialPair y, T.Differential dOut) { @@ -890,6 +906,7 @@ VECTOR_MATRIX_BINARY_DIFF_IMPL(fmod) // Raise to a power __generic [BackwardDifferentiable] +[PreferRecompute] [ForwardDerivativeOf(pow)] DifferentialPair __d_pow(DifferentialPair dpx, DifferentialPair dpy) { @@ -910,6 +927,7 @@ DifferentialPair __d_pow(DifferentialPair dpx, DifferentialPair dpy) __generic [BackwardDifferentiable] +[PreferRecompute] [BackwardDerivativeOf(pow)] void __d_pow(inout DifferentialPair dpx, inout DifferentialPair dpy, T.Differential dOut) { @@ -936,6 +954,7 @@ VECTOR_MATRIX_BINARY_DIFF_IMPL(pow) // Maximum __generic [BackwardDifferentiable] +[PreferRecompute] [ForwardDerivativeOf(max)] DifferentialPair __d_max(DifferentialPair dpx, DifferentialPair dpy) { @@ -947,6 +966,7 @@ DifferentialPair __d_max(DifferentialPair dpx, DifferentialPair dpy) __generic [BackwardDifferentiable] +[PreferRecompute] [BackwardDerivativeOf(max)] void __d_max(inout DifferentialPair dpx, inout DifferentialPair dpy, T.Differential dOut) { @@ -959,6 +979,7 @@ VECTOR_MATRIX_BINARY_DIFF_IMPL(max) // Minimum __generic [BackwardDifferentiable] +[PreferRecompute] [ForwardDerivativeOf(min)] DifferentialPair __d_min(DifferentialPair dpx, DifferentialPair dpy) { @@ -970,6 +991,7 @@ DifferentialPair __d_min(DifferentialPair dpx, DifferentialPair dpy) __generic [BackwardDifferentiable] +[PreferRecompute] [BackwardDerivativeOf(min)] void __d_min(inout DifferentialPair dpx, inout DifferentialPair dpy, T.Differential dOut) { @@ -982,6 +1004,7 @@ VECTOR_MATRIX_BINARY_DIFF_IMPL(min) // Lerp __generic [BackwardDifferentiable] +[PreferRecompute] [ForwardDerivativeOf(lerp)] DifferentialPair __d_lerp(DifferentialPair dpx, DifferentialPair dpy, DifferentialPair dps) { @@ -992,6 +1015,7 @@ DifferentialPair __d_lerp(DifferentialPair dpx, DifferentialPair dpy, D } __generic [BackwardDifferentiable] +[PreferRecompute] [BackwardDerivativeOf(lerp)] void __d_lerp(inout DifferentialPair dpx, inout DifferentialPair dpy, inout DifferentialPair dps, T.Differential dOut) { @@ -1004,6 +1028,7 @@ VECTOR_MATRIX_TERNARY_DIFF_IMPL(lerp) // Clamp __generic [BackwardDifferentiable] +[PreferRecompute] [ForwardDerivativeOf(clamp)] DifferentialPair __d_clamp(DifferentialPair dpx, DifferentialPair dpMin, DifferentialPair dpMax) { @@ -1013,6 +1038,7 @@ DifferentialPair __d_clamp(DifferentialPair dpx, DifferentialPair dpMin } __generic [BackwardDifferentiable] +[PreferRecompute] [BackwardDerivativeOf(clamp)] void __d_clamp(inout DifferentialPair dpx, inout DifferentialPair dpMin, inout DifferentialPair dpMax, T.Differential dOut) { @@ -1025,6 +1051,7 @@ VECTOR_MATRIX_TERNARY_DIFF_IMPL(clamp) // fma [BackwardDifferentiable] [ForwardDerivativeOf(fma)] +[PreferRecompute] DifferentialPair __d_fma(DifferentialPair dpx, DifferentialPair dpy, DifferentialPair dpz) { return DifferentialPair( @@ -1033,6 +1060,7 @@ DifferentialPair __d_fma(DifferentialPair dpx, DifferentialPair< } [BackwardDifferentiable] [BackwardDerivativeOf(fma)] +[PreferRecompute] void __d_fma(inout DifferentialPair dpx, inout DifferentialPair dpy, inout DifferentialPair dpz, double dOut) { dpx = diffPair(dpx.p, dpy.p * dOut); @@ -1042,6 +1070,7 @@ void __d_fma(inout DifferentialPair dpx, inout DifferentialPair __generic [BackwardDifferentiable] [ForwardDerivativeOf(fma)] +[PreferRecompute] DifferentialPair> __d_fma_vector( DifferentialPair> dpx, DifferentialPair> dpy, @@ -1063,6 +1092,7 @@ DifferentialPair> __d_fma_vector( __generic [BackwardDifferentiable] [BackwardDerivativeOf(fma)] +[PreferRecompute] void __d_fma_vector( inout DifferentialPair> dpx, inout DifferentialPair> dpy, @@ -1089,6 +1119,7 @@ void __d_fma_vector( __generic [BackwardDifferentiable] [ForwardDerivativeOf(mad)] +[PreferRecompute] DifferentialPair __d_mad(DifferentialPair dpx, DifferentialPair dpy, DifferentialPair dpz) { return DifferentialPair( @@ -1098,6 +1129,7 @@ DifferentialPair __d_mad(DifferentialPair dpx, DifferentialPair dpy, Di __generic [BackwardDifferentiable] [BackwardDerivativeOf(mad)] +[PreferRecompute] void __d_mad(inout DifferentialPair dpx, inout DifferentialPair dpy, inout DifferentialPair dpz, T.Differential dOut) { dpx = diffPair(dpx.p, T.dmul(dpy.p, dOut)); @@ -1109,6 +1141,7 @@ VECTOR_MATRIX_TERNARY_DIFF_IMPL(mad) // Smoothstep __generic [BackwardDifferentiable] +[PreferRecompute] T __smoothstep_impl(T minVal, T maxVal, T x) { let t = saturate((x - minVal) / (maxVal - minVal)); @@ -1117,6 +1150,7 @@ T __smoothstep_impl(T minVal, T maxVal, T x) __generic [BackwardDifferentiable] [ForwardDerivativeOf(smoothstep)] +[PreferRecompute] DifferentialPair __d_smoothstep(DifferentialPair minVal, DifferentialPair maxVal, DifferentialPair x) { return __fwd_diff(__smoothstep_impl)(minVal, maxVal, x); @@ -1124,6 +1158,7 @@ DifferentialPair __d_smoothstep(DifferentialPair minVal, DifferentialPair< __generic [BackwardDifferentiable] [BackwardDerivativeOf(smoothstep)] +[PreferRecompute] void __d_smoothstep(inout DifferentialPair minVal, inout DifferentialPair maxVal, inout DifferentialPair x, T.Differential dOut) { __bwd_diff(__smoothstep_impl)(minVal, maxVal, x, dOut); @@ -1133,6 +1168,7 @@ VECTOR_MATRIX_TERNARY_DIFF_IMPL(smoothstep) // Vector length __generic [BackwardDifferentiable] +[PreferRecompute] T __length_impl(vector x) { T len = T(0.0); @@ -1147,6 +1183,7 @@ __generic [BackwardDifferentiable] [ForwardDerivativeOf(length)] [ForceInline] +[PreferRecompute] DifferentialPair __d_length(DifferentialPair> x) { return __fwd_diff(__length_impl)(x); @@ -1156,6 +1193,7 @@ __generic [BackwardDifferentiable] [BackwardDerivativeOf(length)] [ForceInline] +[PreferRecompute] void __d_length(inout DifferentialPair> x, T.Differential dOut) { return __bwd_diff(__length_impl)(x, dOut); @@ -1164,6 +1202,7 @@ void __d_length(inout DifferentialPair> x, T.Differential dOut) // Vector distance __generic [BackwardDifferentiable] +[PreferRecompute] T __distance_impl(vector x, vector y) { return length(y - x); @@ -1172,6 +1211,7 @@ __generic [BackwardDifferentiable] [ForwardDerivativeOf(distance)] [ForceInline] +[PreferRecompute] DifferentialPair __d_distance(DifferentialPair> x, DifferentialPair> y) { return __fwd_diff(__distance_impl)(x, y); @@ -1181,6 +1221,7 @@ __generic [BackwardDifferentiable] [BackwardDerivativeOf(distance)] [ForceInline] +[PreferRecompute] void __d_distance(inout DifferentialPair> x, inout DifferentialPair> y, T.Differential dOut) { return __bwd_diff(__distance_impl)(x, y, dOut); @@ -1189,6 +1230,7 @@ void __d_distance(inout DifferentialPair> x, inout DifferentialPair // Vector normalize __generic [BackwardDifferentiable] +[PreferRecompute] vector __normalize_impl(vector x) { let r = T(1.0) / length(x); @@ -1198,6 +1240,7 @@ __generic [BackwardDifferentiable] [ForwardDerivativeOf(normalize)] [ForceInline] +[PreferRecompute] DifferentialPair> __d_normalize(DifferentialPair> x) { return __fwd_diff(__normalize_impl)(x); @@ -1206,6 +1249,7 @@ __generic [BackwardDifferentiable] [BackwardDerivativeOf(normalize)] [ForceInline] +[PreferRecompute] void __d_distance(inout DifferentialPair> x, vector.Differential dOut) { return __bwd_diff(__normalize_impl)(x, dOut); @@ -1264,6 +1308,7 @@ void __d_refract(inout DifferentialPair> i, inout DifferentialPair< __generic [BackwardDifferentiable] [PrimalSubstituteOf(sincos)] +[PreferRecompute] void __sincos_impl(T x, out T s, out T c) { s = sin(x); @@ -1272,6 +1317,7 @@ void __sincos_impl(T x, out T s, out T c) __generic [BackwardDifferentiable] +[PreferRecompute] [PrimalSubstituteOf(sincos)] void __sincos_impl(vector x, out vector s, out vector c) { @@ -1282,6 +1328,7 @@ void __sincos_impl(vector x, out vector s, out vector c) __generic [BackwardDifferentiable] [PrimalSubstituteOf(sincos)] +[PreferRecompute] void __sincos_impl(matrix x, out matrix s, out matrix c) { s = sin(x); -- cgit v1.2.3