diff --git a/go/CMakeLists.txt b/go/CMakeLists.txt index 839b75a25921c4a83e042ce774daf20be3690e9d..f3a9296c2c66cd96419cae37c3ac2c93c2b033f5 100644 --- a/go/CMakeLists.txt +++ b/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) diff --git a/go/cmd/master/master.go b/go/cmd/master/master.go index 6c1e4c7198225eb198aedd8f5bb1ad22568c9a23..537df59c860a3cb77ecd8287cd352397d7f7a4e4 100644 --- a/go/cmd/master/master.go +++ b/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() { diff --git a/go/pserver/etcd_client.go b/go/pserver/etcd_client.go index 80b1abee5e0aefdf869d4046710f78e8f0c0e256..719013b1bb4e80ff1f3040394803706d97514516 100644 --- a/go/pserver/etcd_client.go +++ b/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" diff --git a/paddle/contrib/inference/paddle_inference_api_tensorrt_subgraph_engine.cc b/paddle/contrib/inference/paddle_inference_api_tensorrt_subgraph_engine.cc index 14554545d92daba24992985ea9e0aa4a867e59b9..a11396cee91a758e86af2efd9e58b9da68442590 100644 --- a/paddle/contrib/inference/paddle_inference_api_tensorrt_subgraph_engine.cc +++ b/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 { diff --git a/paddle/fluid/inference/tensorrt/convert/io_converter.h b/paddle/fluid/inference/tensorrt/convert/io_converter.h index fc8881f80c6c012e60bc9632971aaaedb6a5436b..71c48e085d25d2bc6720d93735f661f9e3af7b40 100644 --- a/paddle/fluid/inference/tensorrt/convert/io_converter.h +++ b/paddle/fluid/inference/tensorrt/convert/io_converter.h @@ -17,7 +17,7 @@ limitations under the License. */ #include #include #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 { diff --git a/paddle/fluid/inference/tensorrt/convert/op_converter.h b/paddle/fluid/inference/tensorrt/convert/op_converter.h index bf4e07fed0db120ed39b75c6da531d4956b7c2ff..6697952051c4b1997ca6b550da17a52e64cb3454 100644 --- a/paddle/fluid/inference/tensorrt/convert/op_converter.h +++ b/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 { diff --git a/paddle/fluid/inference/tensorrt/convert/ut_helper.h b/paddle/fluid/inference/tensorrt/convert/ut_helper.h index 0003b16d4ea39dfaaf9ce437d01251857e81c2ba..3b1f531adc5d756259df1c350f7f44bf71ee1f93 100644 --- a/paddle/fluid/inference/tensorrt/convert/ut_helper.h +++ b/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 { diff --git a/paddle/fluid/inference/tensorrt/engine.h b/paddle/fluid/inference/tensorrt/engine.h index 42a596deb1c6de58a500161b0f8d84b2d483bc41..b06a9bbc6758ae9410b2fce99ef2b1a9e7ab98c0 100644 --- a/paddle/fluid/inference/tensorrt/engine.h +++ b/paddle/fluid/inference/tensorrt/engine.h @@ -20,8 +20,8 @@ limitations under the License. */ #include #include #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 { diff --git a/paddle/fluid/operators/tensorrt_engine_op.cc b/paddle/fluid/operators/tensorrt_engine_op.cc index b5d05788314741f71b07f23f700719795251a38a..647cfc0a0af2be85e2868c6f68cab962c6631a8d 100644 --- a/paddle/fluid/operators/tensorrt_engine_op.cc +++ b/paddle/fluid/operators/tensorrt_engine_op.cc @@ -18,9 +18,9 @@ #include #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 { diff --git a/paddle/legacy/trainer/tests/test_Compare.cpp b/paddle/legacy/trainer/tests/test_Compare.cpp index 9bbb0a6013cf565cd7f59199ea63c0506bbd8120..e37e546be8513b1cc7438810a01641859a4bad18 100644 --- a/paddle/legacy/trainer/tests/test_Compare.cpp +++ b/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);