hide utils to legacy

README.md

@@ -18,6 +18,8 @@ learning to many products at Baidu.
 Our vision is to enable deep learning for everyone via PaddlePaddle.
 Please refer to our [release announcement](https://github.com/PaddlePaddle/Paddle/releases) to track the latest feature of PaddlePaddle.
 
+### Lastest PaddlePaddle Version: [Fluid](https://github.com/PaddlePaddle/Paddle/tree/develop/paddle/fluid)
+
 ## Features
 
 - **Flexibility**

go/CMakeLists.txt

@@ -20,4 +20,4 @@ add_subdirectory(master/c)
 add_subdirectory(master)
 add_subdirectory(pserver)
 add_subdirectory(pserver/client)
-add_subdirectory(utils/networkhelper)
+add_subdirectory(legacy/utils/networkhelper)

go/cmd/master/master.go

@@ -28,8 +28,8 @@ import (
 	log "github.com/inconshreveable/log15"
 	"github.com/namsral/flag"
 
+	"github.com/PaddlePaddle/Paddle/go/legacy/utils/networkhelper"
 	"github.com/PaddlePaddle/Paddle/go/master"
-	"github.com/PaddlePaddle/Paddle/go/utils/networkhelper"
 )
 
 func main() {

go/pserver/etcd_client.go

@@ -21,7 +21,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/PaddlePaddle/Paddle/go/utils/networkhelper"
+	"github.com/PaddlePaddle/Paddle/go/legacy/utils/networkhelper"
 	"github.com/coreos/etcd/clientv3"
 	"github.com/coreos/etcd/clientv3/concurrency"
 	log "github.com/inconshreveable/log15"

paddle/CMakeLists.txt

@@ -1,7 +1,7 @@
 if(NOT WITH_FLUID_ONLY)
   add_subdirectory(legacy/cuda)
   add_subdirectory(legacy/function)
-  add_subdirectory(utils)
+  add_subdirectory(legacy/utils)
   add_subdirectory(legacy/math)
   add_subdirectory(legacy/gserver)
   add_subdirectory(legacy/parameter)

paddle/contrib/inference/paddle_inference_api_tensorrt_subgraph_engine.cc

@@ -15,7 +15,7 @@
 #include "paddle/contrib/inference/paddle_inference_api.h"
 #include "paddle/contrib/inference/paddle_inference_api_impl.h"
 #include "paddle/fluid/inference/analysis/analyzer.h"
-#include "paddle/fluid/inference/utils/singleton.h"
+#include "paddle/fluid/inference/legacy/utils/singleton.h"
 
 namespace paddle {
 

paddle/fluid/inference/tensorrt/convert/io_converter.h

@@ -17,7 +17,7 @@ limitations under the License. */
 #include <string>
 #include <unordered_map>
 #include "paddle/fluid/framework/lod_tensor.h"
-#include "paddle/fluid/inference/utils/singleton.h"
+#include "paddle/fluid/inference/legacy/utils/singleton.h"
 
 namespace paddle {
 namespace inference {

paddle/fluid/inference/tensorrt/convert/op_converter.h

@@ -19,8 +19,8 @@ limitations under the License. */
 #include "paddle/fluid/framework/block_desc.h"
 #include "paddle/fluid/framework/op_registry.h"
 #include "paddle/fluid/framework/scope.h"
+#include "paddle/fluid/inference/legacy/utils/singleton.h"
 #include "paddle/fluid/inference/tensorrt/engine.h"
-#include "paddle/fluid/inference/utils/singleton.h"
 
 namespace paddle {
 namespace inference {

paddle/fluid/inference/tensorrt/convert/ut_helper.h

@@ -25,9 +25,9 @@ limitations under the License. */
 #include "paddle/fluid/framework/lod_tensor.h"
 #include "paddle/fluid/framework/op_registry.h"
 #include "paddle/fluid/inference/analysis/helper.h"
+#include "paddle/fluid/inference/legacy/utils/singleton.h"
 #include "paddle/fluid/inference/tensorrt/convert/op_converter.h"
 #include "paddle/fluid/inference/tensorrt/engine.h"
-#include "paddle/fluid/inference/utils/singleton.h"
 
 namespace paddle {
 namespace inference {

paddle/fluid/inference/tensorrt/engine.h

@@ -20,8 +20,8 @@ limitations under the License. */
 #include <unordered_map>
 #include <vector>
 #include "paddle/fluid/inference/engine.h"
+#include "paddle/fluid/inference/legacy/utils/singleton.h"
 #include "paddle/fluid/inference/tensorrt/helper.h"
-#include "paddle/fluid/inference/utils/singleton.h"
 
 namespace paddle {
 namespace inference {

paddle/fluid/operators/positive_negative_pair_op.h

@@ -14,7 +14,7 @@ limitations under the License. */
 #include <vector>
 #include "paddle/fluid/framework/eigen.h"
 #include "paddle/fluid/framework/op_registry.h"
-#include "paddle/utils/Logging.h"
+#include "paddle/legacy/utils/Logging.h"
 
 namespace paddle {
 namespace operators {

paddle/fluid/operators/tensorrt_engine_op.cc

@@ -18,9 +18,9 @@
 #include <vector>
 
 #include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/inference/legacy/utils/singleton.h"
 #include "paddle/fluid/inference/tensorrt/convert/op_converter.h"
 #include "paddle/fluid/inference/tensorrt/engine.h"
-#include "paddle/fluid/inference/utils/singleton.h"
 #include "paddle/fluid/operators/tensorrt_engine_op.h"
 
 namespace paddle {

paddle/fluid/platform/float16_test.cu

@@ -15,7 +15,7 @@ limitations under the License. */
 
 #include "paddle/fluid/framework/lod_tensor.h"
 #include "paddle/fluid/framework/tensor_util.h"
-#include "paddle/utils/Logging.h"
+#include "paddle/legacy/utils/Logging.h"
 
 #define ARITHMETIC_KERNEL(op_type, sign)                                 \
   __global__ void op_type(const half* in1, const half* in2, half* out) { \

paddle/legacy/api/Paddle.i

@@ -198,5 +198,5 @@ namespace std {
 %ignore ParameterConfigPrivate;
 %ignore OptimizationConfigPrivate;
 %ignore ParameterTraverseCallbackPrivate;
-%include "utils/GlobalConstants.h"
+%include "legacy/utils/GlobalConstants.h"
 %include "legacy/api/PaddleAPI.h"

paddle/legacy/api/PaddleAPI.h

@@ -20,8 +20,8 @@ limitations under the License. */
 #include <string>
 #include <vector>
 #include "paddle/legacy/gserver/gradientmachines/GradientMachine.h"
-#include "paddle/utils/Common.h"
-#include "paddle/utils/GlobalConstants.h"
+#include "paddle/legacy/utils/Common.h"
+#include "paddle/legacy/utils/GlobalConstants.h"
 
 /// Import PaddlePaddle's enumeration into global namespace.
 using namespace paddle::enumeration_wrapper;  // NOLINT

paddle/legacy/api/SequenceGenerator.cpp

@@ -19,7 +19,7 @@ limitations under the License. */
 #include "PaddleAPI.h"
 #include "paddle/legacy/gserver/gradientmachines/GradientMachine.h"
 #include "paddle/legacy/parameter/Argument.h"
-#include "paddle/utils/Flags.h"
+#include "paddle/legacy/utils/Flags.h"
 
 // used to represent partial sequence
 struct Path {

paddle/legacy/api/Trainer.cpp

@@ -23,7 +23,7 @@ limitations under the License. */
 #include "paddle/legacy/trainer/ParamUtil.h"
 #include "paddle/legacy/trainer/Trainer.h"
 #include "paddle/legacy/trainer/TrainerInternal.h"
-#include "paddle/utils/Flags.h"
+#include "paddle/legacy/utils/Flags.h"
 
 using paddle::real;
 

paddle/legacy/api/Util.cpp

@@ -15,10 +15,10 @@ limitations under the License. */
 #include "PaddleAPI.h"
 
 #include "paddle/legacy/parameter/Parameter.h"
-#include "paddle/utils/Common.h"
-#include "paddle/utils/Flags.h"
-#include "paddle/utils/PythonUtil.h"
-#include "paddle/utils/Util.h"
+#include "paddle/legacy/utils/Common.h"
+#include "paddle/legacy/utils/Flags.h"
+#include "paddle/legacy/utils/PythonUtil.h"
+#include "paddle/legacy/utils/Util.h"
 
 #include <algorithm>
 #include <iostream>

paddle/legacy/capi/Main.cpp

@@ -19,8 +19,8 @@ limitations under the License. */
 #include "capi_private.h"
 #include "main.h"
 #include "paddle/legacy/trainer/TrainerConfigHelper.h"
-#include "paddle/utils/Excepts.h"
-#include "paddle/utils/PythonUtil.h"
+#include "paddle/legacy/utils/Excepts.h"
+#include "paddle/legacy/utils/PythonUtil.h"
 
 static void initPaddle(int argc, char** argv) {
   paddle::initMain(argc, argv);

paddle/legacy/capi/tests/test_Arguments.cpp

@@ -15,7 +15,7 @@ limitations under the License. */
 #include <functional>
 #include "capi.h"
 #include "gtest/gtest.h"
-#include "paddle/utils/ThreadLocal.h"
+#include "paddle/legacy/utils/ThreadLocal.h"
 
 static std::vector<paddle_real> randomBuffer(size_t bufSize) {
   auto& eng = paddle::ThreadLocalRandomEngine::get();

paddle/legacy/capi/tests/test_GradientMachine.cpp

@@ -19,7 +19,7 @@ limitations under the License. */
 #include <string.h>
 #include <type_traits>
 #include "capi.h"
-#include "paddle/utils/ThreadLocal.h"
+#include "paddle/legacy/utils/ThreadLocal.h"
 
 static std::vector<paddle_real> randomBuffer(size_t bufSize) {
   auto& eng = paddle::ThreadLocalRandomEngine::get();

paddle/legacy/cuda/include/hl_base.h

@@ -208,7 +208,7 @@ typedef struct {
 
 #include <cuda_runtime.h>
 #include "paddle/legacy/cuda/include/hl_cuda.h"
-#include "paddle/utils/Logging.h"
+#include "paddle/legacy/utils/Logging.h"
 
 extern __thread bool g_sync_flag;
 extern __thread cudaStream_t default_stream;

paddle/legacy/cuda/include/hl_gpu_gru.cuh

@@ -18,7 +18,7 @@ limitations under the License. */
 
 #ifdef __NVCC__
 
-#include "paddle/utils/Logging.h"
+#include "paddle/legacy/utils/Logging.h"
 
 /*
  * threads(framePerBlock, batchPerBlock)

paddle/legacy/cuda/include/hl_gpu_lstm.cuh

@@ -18,7 +18,7 @@ limitations under the License. */
 
 #ifdef __NVCC__
 
-#include "paddle/utils/Logging.h"
+#include "paddle/legacy/utils/Logging.h"
 #include "hl_device_functions.cuh"
 
 /*

paddle/legacy/cuda/include/hl_gpu_matrix_kernel.cuh

@@ -18,7 +18,7 @@ limitations under the License. */
 #define HL_GPU_MATRIX_KERNEL_CUH_
 
 #include <algorithm>
-#include "paddle/utils/Logging.h"
+#include "paddle/legacy/utils/Logging.h"
 #include "hl_base.h"
 
 #ifdef __NVCC__