Cleaning up internals of autograd::Variable

Author: pavanky

examples/FFNet.cpp

@@ -9,7 +9,6 @@
 
 #include <af/nn.h>
 
-using namespace af;
 using namespace af;
 using namespace af::nn;
 

include/af/autograd/Variable.hpp

@@ -33,8 +33,7 @@ namespace af {
             typedef std::vector<Variable> DAG_t;
 
         private:
-            class Shared {
-            public:
+            struct Shared {
                 Shared() :
                     m_data(),
                     m_inputs(),
@@ -56,48 +55,6 @@ namespace af {
                     m_backward(backward)
                 {}
 
-                af::array getData() const
-                {
-                    return m_data;
-                }
-
-                Variable getGrad() const
-                {
-                    if (m_grads.size() == 0) {
-                        throw std::runtime_error("Gradient hasn't been calculated");
-                    }
-                    return m_grads[0];
-                }
-
-                void addGrad(Variable grad)
-                {
-                    m_grads.push_back(grad);
-                }
-
-                std::vector<Variable> getInputs()
-                {
-                    return m_inputs;
-                }
-
-                void evalGrad()
-                {
-                    if (m_grads.size() == 1) return;
-                    Variable grad = m_grads[0];
-                    for (int i = 1; i < (int)m_grads.size(); i++) {
-                        grad = grad + m_grads[i];
-                    }
-                    grad.getData().eval();
-                    m_grads.clear();
-                    m_grads.push_back(grad);
-                }
-
-                void backward()
-                {
-                    this->evalGrad();
-                    if (m_backward) m_backward(m_inputs, m_grads[0]);
-                }
-
-            private:
                 af::array m_data;
                 std::vector<Variable> m_inputs;
                 std::vector<Variable> m_grads;
@@ -123,32 +80,45 @@ namespace af {
 
             af::array getData() const
             {
-                return m_shared->getData();
+                return m_shared->m_data;
             }
 
             Variable getGrad() const
             {
-                return m_shared->getGrad();
+                if (m_shared->m_grads.size() == 0) {
+                    throw std::runtime_error("Gradient hasn't been calculated");
+                }
+                return m_shared->m_grads[0];
             }
 
             void addGrad(Variable child_grad)
             {
-                m_shared->addGrad(child_grad);
+                m_shared->m_grads.push_back(child_grad);
             }
 
             std::vector<Variable> getInputs() const
             {
-                return m_shared->getInputs();
+                return m_shared->m_inputs;
             }
 
             void evalGrad()
             {
-                m_shared->evalGrad();
+                if (m_shared->m_grads.size() == 1) return;
+                Variable grad = m_shared->m_grads[0];
+                for (unsigned i = 1; i < m_shared->m_grads.size(); i++) {
+                    grad = grad + m_shared->m_grads[i];
+                }
+                grad.getData().eval();
+                m_shared->m_grads.clear();
+                m_shared->m_grads.push_back(grad);
             }
 
             void backward()
             {
-                m_shared->backward();
+                evalGrad();
+                if (m_shared->m_backward) {
+                    m_shared->m_backward(m_shared->m_inputs, m_shared->m_grads[0]);
+                }
             }
 
             DAG_t build()
@@ -165,7 +135,7 @@ namespace af {
                 if (cache.find(id) != cache.end()) {
                     return;
                 }
-                for (auto input : m_shared->getInputs()) {
+                for (auto input : m_shared->m_inputs) {
                     input.buildGraph(cache, dag);
                 }
                 cache[id] = true;