Changingg expandAs, reduceAs to tileAs, sumAs

pavanky · umar456 · commit 1bfb22e1e76f · 2017-07-26T23:29:24.000-04:00
diff --git a/examples/autograd.cpp b/examples/autograd.cpp
@@ -128,11 +128,11 @@ void test_tanh()
     VERIFY(dx.array() - (1 + af::tanh(x.array())) * (1 - af::tanh(x.array())));
 }
 
-void test_expand()
+void test_tile()
 {
     auto x = Variable(af::randu(5), true);
     auto y = Variable(af::randu(5, 2), true);
-    auto z = y * expandAs(x, y);
+    auto z = y * tileAs(x, y);
     auto dz = Variable(af::constant(1.0, 5, 2), false);
     z.backward(dz);
     auto dy = y.grad();
@@ -141,11 +141,11 @@ void test_expand()
     VERIFY(dx.array() - af::sum(y.array(), 1));
 }
 
-void test_reduce()
+void test_sum()
 {
     auto x = Variable(af::randu(5), true);
     auto y = Variable(af::randu(5, 2), true);
-    auto z = x * reduceAs(y, x);
+    auto z = x * sumAs(y, x);
     auto dz = Variable(af::constant(1.0, 5), false);
     z.backward(dz);
     auto dy = y.grad();
@@ -166,7 +166,7 @@ int main()
     test_exp();
     test_sigmoid();
     test_tanh();
-    test_expand();
-    test_reduce();
+    test_tile();
+    test_sum();
     return 0;
 }
diff --git a/include/af/autograd/Functions.hpp b/include/af/autograd/Functions.hpp
@@ -7,6 +7,7 @@
  * http://arrayfire.com/licenses/BSD-3-Clause
  ********************************************************/
 #pragma once
+#include <arrayfire.h>
 
 namespace af {
     namespace autograd {
@@ -50,18 +51,18 @@ namespace af {
         Variable cos(const Variable &input);
         Variable tanh(const Variable &input);
         Variable sigmoid(const Variable &input);
-      
+
         Variable max(const Variable &lhs, const Variable &rhs);
         Variable max(const Variable &lhs, const double &rhs);
         Variable max(const double &lhs, const Variable &rhs);
-      
+
         Variable min(const Variable &lhs, const Variable &rhs);
         Variable min(const Variable &lhs, const double &rhs);
         Variable min(const double &lhs, const Variable &rhs);
-      
+
         Variable transpose(const Variable &input);
-        Variable expandAs(const Variable &input, const Variable &reference);
-        Variable reduceAs(const Variable &input, const Variable &reference);
+        Variable tileAs(const Variable &input, const Variable &reference);
+        Variable sumAs(const Variable &input, const Variable &reference);
 
         Variable matmul(const Variable &lhs, const Variable &rhs);
         Variable matmulTN(const Variable &lhs, const Variable &rhs);
diff --git a/src/autograd/Functions.cpp b/src/autograd/Functions.cpp
@@ -54,7 +54,7 @@ namespace af {
             };
             return Variable(result, {lhs, rhs}, grad_func);
         }
-      
+
         Variable operator >(const Variable &lhs, const Variable &rhs)
         {
             auto result = lhs.array() > rhs.array();
@@ -116,7 +116,7 @@ namespace af {
             auto result = !input.array();
             return Variable(result, false);
         }
-          
+
         Variable max(const Variable &lhs, const Variable &rhs)
         {
             auto mask = lhs > rhs;
@@ -165,7 +165,7 @@ namespace af {
       INSTANTIATE_FUNCTION(min);
 
 #undef INSTANTIATE_FUNCTION
-      
+
       Variable negate(const Variable &input)
         {
             auto result = 0.0 - input.array();
@@ -241,31 +241,31 @@ namespace af {
             return Variable(result, {input}, grad_func);
         }
 
-        Variable expandAs(const Variable &input, const Variable &reference)
+        Variable tileAs(const Variable &input, const Variable &reference)
         {
             dim4 dims(1,1,1,1);
-            dim4 idims = input.array().dims();
-            dim4 rdims = reference.array().dims();
+            dim4 rdims = reference.dims();
+            dim4 idims = input.dims();
             for (int i = 0; i < 4; i++) {
                 dims[i] = rdims[i] / idims[i];
             }
             auto result = tile(input.array(), dims);
             auto grad_func = [](std::vector<Variable> &inputs, const Variable &grad_output) {
-                inputs[0].addGrad(reduceAs(grad_output, inputs[0]));
+                inputs[0].addGrad(sumAs(grad_output, inputs[0]));
             };
             return Variable(result, {input}, grad_func);
         }
 
-        Variable reduceAs(const Variable &input, const Variable &reference)
+        Variable sumAs(const Variable &input, const Variable &reference)
         {
-            dim4 idims = input.array().dims();
-            dim4 rdims = reference.array().dims();
+            dim4 rdims = reference.dims();
+            dim4 idims = input.dims();
             auto result = input.array();
             for (int i = 0; i < 4; i++) {
                 if (idims[i] != rdims[i]) result = sum(result, i);
             }
             auto grad_func = [](std::vector<Variable> &inputs, const Variable &grad_output) {
-                inputs[0].addGrad(expandAs(grad_output, inputs[0]));
+                inputs[0].addGrad(tileAs(grad_output, inputs[0]));
             };
             return Variable(result, {input}, grad_func);
         }
diff --git a/src/nn/Modules/Activations.cpp b/src/nn/Modules/Activations.cpp
@@ -61,7 +61,7 @@ namespace af
         Variable PReLU::forward(const Variable &input)
         {
             auto mask = input >= 0.0;
-            return (input * mask) + (input * !mask * expandAs(m_parameters[0],input));
+            return (input * mask) + (input * !mask * tileAs(m_parameters[0], input));
         }
 
         ELU::ELU(double alpha) :
@@ -85,6 +85,5 @@ namespace af
             auto mask = input >= m_threshold;
             return input * mask;
         }
-      
     }
 }
diff --git a/src/nn/Modules/Linear.cpp b/src/nn/Modules/Linear.cpp
@@ -51,7 +51,7 @@ namespace af
         {
             auto res = matmul(m_parameters[0], input);
             if (m_bias) {
-                res = res + expandAs(m_parameters[1], res);
+                res = res + tileAs(m_parameters[1], res);
             }
             return res;
         }

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ namespace af {`
`54`	`54`	`};`
`55`	`55`	`return Variable(result, {lhs, rhs}, grad_func);`
`56`	`56`	`}`
`57`		`-`
	`57`	`+`
`58`	`58`	`Variable operator >(const Variable &lhs, const Variable &rhs)`
`59`	`59`	`{`
`60`	`60`	`auto result = lhs.array() > rhs.array();`
`@@ -116,7 +116,7 @@ namespace af {`
`116`	`116`	`auto result = !input.array();`
`117`	`117`	`return Variable(result, false);`
`118`	`118`	`}`
`119`		`-`
	`119`	`+`
`120`	`120`	`Variable max(const Variable &lhs, const Variable &rhs)`
`121`	`121`	`{`
`122`	`122`	`auto mask = lhs > rhs;`
`@@ -165,7 +165,7 @@ namespace af {`
`165`	`165`	`INSTANTIATE_FUNCTION(min);`
`166`	`166`
`167`	`167`	`#undef INSTANTIATE_FUNCTION`
`168`		`-`
	`168`	`+`
`169`	`169`	`Variable negate(const Variable &input)`
`170`	`170`	`{`
`171`	`171`	`auto result = 0.0 - input.array();`
`@@ -241,31 +241,31 @@ namespace af {`
`241`	`241`	`return Variable(result, {input}, grad_func);`
`242`	`242`	`}`
`243`	`243`
`244`		`- Variable expandAs(const Variable &input, const Variable &reference)`
	`244`	`+ Variable tileAs(const Variable &input, const Variable &reference)`
`245`	`245`	`{`
`246`	`246`	`dim4 dims(1,1,1,1);`
`247`		`- dim4 idims = input.array().dims();`
`248`		`- dim4 rdims = reference.array().dims();`
	`247`	`+ dim4 rdims = reference.dims();`
	`248`	`+ dim4 idims = input.dims();`
`249`	`249`	`for (int i = 0; i < 4; i++) {`
`250`	`250`	`dims[i] = rdims[i] / idims[i];`
`251`	`251`	`}`
`252`	`252`	`auto result = tile(input.array(), dims);`
`253`	`253`	`auto grad_func = [](std::vector<Variable> &inputs, const Variable &grad_output) {`
`254`		`- inputs[0].addGrad(reduceAs(grad_output, inputs[0]));`
	`254`	`+ inputs[0].addGrad(sumAs(grad_output, inputs[0]));`
`255`	`255`	`};`
`256`	`256`	`return Variable(result, {input}, grad_func);`
`257`	`257`	`}`
`258`	`258`
`259`		`- Variable reduceAs(const Variable &input, const Variable &reference)`
	`259`	`+ Variable sumAs(const Variable &input, const Variable &reference)`
`260`	`260`	`{`
`261`		`- dim4 idims = input.array().dims();`
`262`		`- dim4 rdims = reference.array().dims();`
	`261`	`+ dim4 rdims = reference.dims();`
	`262`	`+ dim4 idims = input.dims();`
`263`	`263`	`auto result = input.array();`
`264`	`264`	`for (int i = 0; i < 4; i++) {`
`265`	`265`	`if (idims[i] != rdims[i]) result = sum(result, i);`
`266`	`266`	`}`
`267`	`267`	`auto grad_func = [](std::vector<Variable> &inputs, const Variable &grad_output) {`
`268`		`- inputs[0].addGrad(expandAs(grad_output, inputs[0]));`
	`268`	`+ inputs[0].addGrad(tileAs(grad_output, inputs[0]));`
`269`	`269`	`};`
`270`	`270`	`return Variable(result, {input}, grad_func);`
`271`	`271`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ namespace af`
`61`	`61`	`Variable PReLU::forward(const Variable &input)`
`62`	`62`	`{`
`63`	`63`	`auto mask = input >= 0.0;`
`64`		`- return (input * mask) + (input * !mask * expandAs(m_parameters[0],input));`
	`64`	`+ return (input * mask) + (input * !mask * tileAs(m_parameters[0], input));`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`ELU::ELU(double alpha) :`
`@@ -85,6 +85,5 @@ namespace af`
`85`	`85`	`auto mask = input >= m_threshold;`
`86`	`86`	`return input * mask;`
`87`	`87`	`}`
`88`		`-`
`89`	`88`	`}`
`90`	`89`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ namespace af`
`51`	`51`	`{`
`52`	`52`	`auto res = matmul(m_parameters[0], input);`
`53`	`53`	`if (m_bias) {`
`54`		`- res = res + expandAs(m_parameters[1], res);`
	`54`	`+ res = res + tileAs(m_parameters[1], res);`
`55`	`55`	`}`
`56`	`56`	`return res;`
`57`	`57`	`}`