Add files via upload

Глеб Брыкин · web-flow · commit ff4217aa075e · 2021-03-22T20:29:17.000+03:00
diff --git a/Implementation/src/MKL/Ops/Backward/dAvgPool2d.cs b/Implementation/src/MKL/Ops/Backward/dAvgPool2d.cs
@@ -3,7 +3,7 @@
 //* The code is available under the Apache-2.0 license. Read the License for details.
 //***************************************************************************************************
 
-//-> Latest commit: Brykin Gleb, 21.03.2021
+//-> Latest commit: Brykin Gleb, 22.03.2021
 
 using System;
 using System.Threading;
@@ -51,7 +51,7 @@ public static void dAvgPool2d(Half[] dx, int[] x_shape, System.Tuple<int, int> k
                             for(int oy = 0; oy < y_height; oy++)
                             {
                                 var iy_ = oy * stride_y - padding_y;
-                                Half grad = dy[((oy * y_width + ox) * y_channel + c) * y_batch + b] / norm;
+                                Half grad = dy[((c * y_batch + b) * y_height + oy) * y_width + ox] / norm;
                                 for(int fx = 0; fx < kernel_width; fx++)
                                 {
                                     var ix = ix_ + fx * dilation_x;
@@ -66,7 +66,7 @@ public static void dAvgPool2d(Half[] dx, int[] x_shape, System.Tuple<int, int> k
                                         {
                                             continue;
                                         }
-                                        dx[((iy * x_width + ix) * x_channel + c) * x_batch + b] += grad;
+                                        dx[((c * x_batch + b) * x_height + iy) * x_width + ix] += grad;
                                     }
                                 }
                             }
@@ -105,7 +105,7 @@ public static void dAvgPool2d(float[] dx, int[] x_shape, System.Tuple<int, int>
                             for(int oy = 0; oy < y_height; oy++)
                             {
                                 var iy_ = oy * stride_y - padding_y;
-                                float grad = dy[((oy * y_width + ox) * y_channel + c) * y_batch + b] / norm;
+                                float grad = dy[((c * y_batch + b) * y_height + oy) * y_width + ox] / norm;
                                 for(int fx = 0; fx < kernel_width; fx++)
                                 {
                                     var ix = ix_ + fx * dilation_x;
@@ -120,7 +120,7 @@ public static void dAvgPool2d(float[] dx, int[] x_shape, System.Tuple<int, int>
                                         {
                                             continue;
                                         }
-                                        dx[((iy * x_width + ix) * x_channel + c) * x_batch + b] += grad;
+                                        dx[((c * x_batch + b) * x_height + iy) * x_width + ix] += grad;
                                     }
                                 }
                             }
@@ -159,7 +159,7 @@ public static void dAvgPool2d(double[] dx, int[] x_shape, System.Tuple<int, int>
                             for(int oy = 0; oy < y_height; oy++)
                             {
                                 var iy_ = oy * stride_y - padding_y;
-                                double grad = dy[((oy * y_width + ox) * y_channel + c) * y_batch + b] / norm;
+                                double grad = dy[((c * y_batch + b) * y_height + oy) * y_width + ox] / norm;
                                 for(int fx = 0; fx < kernel_width; fx++)
                                 {
                                     var ix = ix_ + fx * dilation_x;
@@ -174,7 +174,7 @@ public static void dAvgPool2d(double[] dx, int[] x_shape, System.Tuple<int, int>
                                         {
                                             continue;
                                         }
-                                        dx[((iy * x_width + ix) * x_channel + c) * x_batch + b] += grad;
+                                        dx[((c * x_batch + b) * x_height + iy) * x_width + ix] += grad;
                                     }
                                 }
                             }
diff --git a/Implementation/src/MKL/Ops/Backward/dMaxPool2d.cs b/Implementation/src/MKL/Ops/Backward/dMaxPool2d.cs
@@ -3,7 +3,7 @@
 //* The code is available under the Apache-2.0 license. Read the License for details.
 //***************************************************************************************************
 
-//-> Latest commit: Brykin Gleb, 20.01.2021
+//-> Latest commit: Brykin Gleb, 22.03.2021
 
 using System;
 using System.Threading;
@@ -36,7 +36,7 @@ public static void dMaxPool2d(Half[] dx, long[] indices, Half[] dy, int[] y_shap
                         {
                             for(int oy = 0; oy < y_height; oy++)
                             {
-                                var i = ((oy * y_width + ox) * y_channel + c) * y_batch + b;
+                                var i = ((c * y_batch + b) * y_height + oy) * y_width + ox;
                                 dx[indices[i]] += dy[i];
                             }
                         }
@@ -59,7 +59,7 @@ public static void dMaxPool2d(float[] dx, long[] indices, float[] dy, int[] y_sh
                         {
                             for(int oy = 0; oy < y_height; oy++)
                             {
-                                var i = ((oy * y_width + ox) * y_channel + c) * y_batch + b;
+                                var i = ((c * y_batch + b) * y_height + oy) * y_width + ox;
                                 dx[indices[i]] += dy[i];
                             }
                         }
@@ -82,7 +82,7 @@ public static void dMaxPool2d(double[] dx, long[] indices, double[] dy, int[] y_
                         {
                             for(int oy = 0; oy < y_height; oy++)
                             {
-                                var i = ((oy * y_width + ox) * y_channel + c) * y_batch + b;
+                                var i = ((c * y_batch + b) * y_height + oy) * y_width + ox;
                                 dx[indices[i]] += dy[i];
                             }
                         }

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`//* The code is available under the Apache-2.0 license. Read the License for details.`
`4`	`4`	`//***************************************************************************************************`
`5`	`5`
`6`		`-//-> Latest commit: Brykin Gleb, 21.03.2021`
	`6`	`+//-> Latest commit: Brykin Gleb, 22.03.2021`
`7`	`7`
`8`	`8`	`using System;`
`9`	`9`	`using System.Threading;`
`@@ -51,7 +51,7 @@ public static void dAvgPool2d(Half[] dx, int[] x_shape, System.Tuple<int, int> k`
`51`	`51`	`for(int oy = 0; oy < y_height; oy++)`
`52`	`52`	`{`
`53`	`53`	`var iy_ = oy * stride_y - padding_y;`
`54`		`- Half grad = dy[((oy * y_width + ox) * y_channel + c) * y_batch + b] / norm;`
	`54`	`+ Half grad = dy[((c * y_batch + b) * y_height + oy) * y_width + ox] / norm;`
`55`	`55`	`for(int fx = 0; fx < kernel_width; fx++)`
`56`	`56`	`{`
`57`	`57`	`var ix = ix_ + fx * dilation_x;`
`@@ -66,7 +66,7 @@ public static void dAvgPool2d(Half[] dx, int[] x_shape, System.Tuple<int, int> k`
`66`	`66`	`{`
`67`	`67`	`continue;`
`68`	`68`	`}`
`69`		`- dx[((iy * x_width + ix) * x_channel + c) * x_batch + b] += grad;`
	`69`	`+ dx[((c * x_batch + b) * x_height + iy) * x_width + ix] += grad;`
`70`	`70`	`}`
`71`	`71`	`}`
`72`	`72`	`}`
`@@ -105,7 +105,7 @@ public static void dAvgPool2d(float[] dx, int[] x_shape, System.Tuple<int, int>`
`105`	`105`	`for(int oy = 0; oy < y_height; oy++)`
`106`	`106`	`{`
`107`	`107`	`var iy_ = oy * stride_y - padding_y;`
`108`		`- float grad = dy[((oy * y_width + ox) * y_channel + c) * y_batch + b] / norm;`
	`108`	`+ float grad = dy[((c * y_batch + b) * y_height + oy) * y_width + ox] / norm;`
`109`	`109`	`for(int fx = 0; fx < kernel_width; fx++)`
`110`	`110`	`{`
`111`	`111`	`var ix = ix_ + fx * dilation_x;`
`@@ -120,7 +120,7 @@ public static void dAvgPool2d(float[] dx, int[] x_shape, System.Tuple<int, int>`
`120`	`120`	`{`
`121`	`121`	`continue;`
`122`	`122`	`}`
`123`		`- dx[((iy * x_width + ix) * x_channel + c) * x_batch + b] += grad;`
	`123`	`+ dx[((c * x_batch + b) * x_height + iy) * x_width + ix] += grad;`
`124`	`124`	`}`
`125`	`125`	`}`
`126`	`126`	`}`
`@@ -159,7 +159,7 @@ public static void dAvgPool2d(double[] dx, int[] x_shape, System.Tuple<int, int>`
`159`	`159`	`for(int oy = 0; oy < y_height; oy++)`
`160`	`160`	`{`
`161`	`161`	`var iy_ = oy * stride_y - padding_y;`
`162`		`- double grad = dy[((oy * y_width + ox) * y_channel + c) * y_batch + b] / norm;`
	`162`	`+ double grad = dy[((c * y_batch + b) * y_height + oy) * y_width + ox] / norm;`
`163`	`163`	`for(int fx = 0; fx < kernel_width; fx++)`
`164`	`164`	`{`
`165`	`165`	`var ix = ix_ + fx * dilation_x;`
`@@ -174,7 +174,7 @@ public static void dAvgPool2d(double[] dx, int[] x_shape, System.Tuple<int, int>`
`174`	`174`	`{`
`175`	`175`	`continue;`
`176`	`176`	`}`
`177`		`- dx[((iy * x_width + ix) * x_channel + c) * x_batch + b] += grad;`
	`177`	`+ dx[((c * x_batch + b) * x_height + iy) * x_width + ix] += grad;`
`178`	`178`	`}`
`179`	`179`	`}`
`180`	`180`	`}`