move to optimizer lib. need to fill in the regularizer

PaddlePaddle · May 19, 2017 · 92a5d16 · 92a5d16
1 parent 0a03b9d
commit 92a5d16
Show file tree

Hide file tree

Showing 14 changed files with 43 additions and 20 deletions.
diff --git a/paddle/lib/CMakeLists.txt → paddle/optimizer/CMakeLists.txt b/paddle/lib/CMakeLists.txt → paddle/optimizer/CMakeLists.txt
diff --git a/paddle/lib/Tensor.h → paddle/optimizer/Tensor.h b/paddle/lib/Tensor.h → paddle/optimizer/Tensor.h
diff --git a/paddle/lib/optimizer.cc → paddle/optimizer/optimizer.cc b/paddle/lib/optimizer.cc → paddle/optimizer/optimizer.cc
@@ -2,15 +2,15 @@
 #include "optimizer_private.h"
 
 int32_t paddle_create_SGDOptimizer(paddle_optimizer* optimizer, double learning_rate) {
- optimizer->impl->create_SGDOptimizer(learning_rate)
- return LIB_SUCCESS;
+ optimizer->impl->create_SGDOptimizer(learning_rate);
+ return PADDLE_SUCCESS;
 }
 
 int32_t paddle_release_optimizer(paddle_optimizer* optimizer) {
  if(optimizer == nullptr)
- return LIB_SUCCESS;
+ return PADDLE_SUCCESS;
  optimizer->impl->destory();
- return LIB_SUCCESS;
+ return PADDLE_SUCCESS;
 }
 
 int32_t paddle_update_parameter(paddle_optimizer* optimizer, parameter* param, const gradient* grad,
@@ -19,5 +19,5 @@ int32_t paddle_update_parameter(paddle_optimizer* optimizer, parameter* param, c
  Tensor<datatype> Gradient(grad, num_bytes);
  /*! \brief real update hook */ 
  optimizer->impl->update(Parameter, Gradient, learning_rate);
- return LIB_SUCCESS;
+ return PADDLE_SUCCESS;
 }
diff --git a/paddle/lib/optimizer.h → paddle/optimizer/optimizer.h b/paddle/lib/optimizer.h → paddle/optimizer/optimizer.h
@@ -28,9 +28,8 @@ extern "C" {
  } paddle_element_type;
 
  /*! \brief execute status code */ 
- const int32_t LIB_SUCCESS = 0;
- const int32_t LIB_WARNING = 1;
- const int32_t LIB_ERROR = 2;
+ const int32_t PADDLE_SUCCESS = 0;
+ const int32_t PADDLE_ERROR = -1;
 
 
  typedef void* parameter;

diff --git a/paddle/lib/optimizer_factory.h → paddle/optimizer/optimizer_factory.h b/paddle/lib/optimizer_factory.h → paddle/optimizer/optimizer_factory.h
diff --git a/paddle/lib/optimizer_private.h → paddle/optimizer/optimizer_private.h b/paddle/lib/optimizer_private.h → paddle/optimizer/optimizer_private.h
@@ -8,5 +8,5 @@
 
 struct paddle_optimizer {
  /*! \brief optmizer in C++ side */ 
- ParameterOptimzier *impl;
+ paddle::optimizer::ParameterOptimzier *impl;
 };
diff --git a/paddle/lib/optimizer_test.cc → paddle/optimizer/optimizer_test.cc b/paddle/lib/optimizer_test.cc → paddle/optimizer/optimizer_test.cc
@@ -1,5 +1,8 @@
 #include "training_ops.h"
 
+namespace paddle {
+
+template<class T>
 class OpitmizerTests {
 
 private:
@@ -10,4 +13,4 @@ class OpitmizerTests {
 void applyGradientDescent_TEST() {
 
 }
-
+}
diff --git a/paddle/lib/parameter_optimizer.h → paddle/optimizer/parameter_optimizer.h b/paddle/lib/parameter_optimizer.h → paddle/optimizer/parameter_optimizer.h
@@ -7,7 +7,7 @@
 #include "Tensor.h"
 
 namespace paddle {
-namespace lib {
+namespace optimizer {
 
 class ParameterOptimizer {
 public:

diff --git a/paddle/lib/regularizer.h → paddle/optimizer/regularizer.h b/paddle/lib/regularizer.h → paddle/optimizer/regularizer.h
@@ -1,5 +1,8 @@
-#ifndef __PADDLE_LIB_REGULARIZER_H
-#define __PADDLE_LIB_REGULARIZER_H
+#ifndef PADDLE_LIB_REGULARIZER_H_
+#define PADDLE_LIB_REGULARIZER_H_
+
+namespace paddle {
+namespace optimizer {
 
 
 /*! \brief regularizer for L1, L2 */
@@ -31,5 +34,7 @@ class L1LrRegularizer : public Regularizer {
 
 };
 
+}
+}
 
 #endif
diff --git a/paddle/lib/regularizer_ops.h → paddle/optimizer/regularizer_ops.h b/paddle/lib/regularizer_ops.h → paddle/optimizer/regularizer_ops.h
@@ -1,5 +1,9 @@
-#ifndef PADDLE_LIB_REGULARIZER_OPS_H
-#define PADDLE_LIB_REGULARIZER_OPS_H
+#ifndef PADDLE_LIB_REGULARIZER_OPS_H_
+#define PADDLE_LIB_REGULARIZER_OPS_H_
+
+namespace paddle {
+namespace optimizer {
+
 
 /*! \brief L1 implement */
 template<class T>
@@ -11,4 +15,7 @@ void applyL1(Tensor<T> &parameter,
 
 }
 
+}
+}
+
 #endif
diff --git a/paddle/lib/sgd_optimizer.h → paddle/optimizer/sgd_optimizer.h b/paddle/lib/sgd_optimizer.h → paddle/optimizer/sgd_optimizer.h
@@ -4,8 +4,11 @@
 #include "parameter_optimizer.h"
 #include "training_ops.h"
 
+namespace paddle {
+namespace optimizer {
+
 class SGDOptimizer : public ParameterOptimizer {
- public:
+public:
  /*! \brief call the applySGD for example */
  void update(Tensor<T> &parameter,
  const Tensor<T> &gradient,
@@ -27,7 +30,8 @@ class MomentumOptimizer : public ParameterOptimizer {
  applyMomentum(parameter, gradient, momentum, learning_rate, mu, weight_decay);
  }
 
-}
-
+};
 
+}
+}
 #endif
diff --git a/paddle/lib/training_ops.cc → paddle/optimizer/training_ops.cc b/paddle/lib/training_ops.cc → paddle/optimizer/training_ops.cc
@@ -1,8 +1,11 @@
 #include "training_ops.h"
 
+namespace paddle {
+namespace optimizer {
+
 /*! \brief implement different update method
-e.g. applyGradientDescentAvx
- */
+ e.g. applyGradientDescentAvx
+*/
 
 template<typename T>
 void applyGradientDescent(Tensor<T> &parameter,
@@ -28,3 +31,5 @@ void applyMomentum(Tensor<T> &parameter,
  parameter[i] += momentum[i];
  }
 }
+}
+}
diff --git a/paddle/lib/training_ops.h → paddle/optimizer/training_ops.h b/paddle/lib/training_ops.h → paddle/optimizer/training_ops.h
diff --git a/paddle/lib/training_ops_test.cc → paddle/optimizer/training_ops_test.cc b/paddle/lib/training_ops_test.cc → paddle/optimizer/training_ops_test.cc