fix

Author: panyx0718

go/CMakeLists.txt

@@ -20,4 +20,4 @@ add_subdirectory(master/c)
 add_subdirectory(master)
 add_subdirectory(pserver)
 add_subdirectory(pserver/client)
-add_subdirectory(legacy/utils/networkhelper)
+add_subdirectory(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/legacy/utils/networkhelper"
+	"github.com/PaddlePaddle/Paddle/go/utils/networkhelper"
 	"github.com/coreos/etcd/clientv3"
 	"github.com/coreos/etcd/clientv3/concurrency"
 	log "github.com/inconshreveable/log15"

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/legacy/utils/singleton.h"
+#include "paddle/fluid/inference/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/legacy/utils/singleton.h"
+#include "paddle/fluid/inference/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/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/legacy/trainer/tests/test_Compare.cpp

@@ -23,7 +23,7 @@ using namespace paddle;  // NOLINT
 using namespace std;     // NOLINT
 
 static const string& configFile =
-    "./legacy/trainer/tests/sample_trainer_config.conf";
+    "legacy/trainer/tests/sample_trainer_config.conf";
 
 DECLARE_int32(gpu_id);
 DECLARE_bool(use_gpu);