Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move sync_mode device ctx from grpc server #10881

Merged
merged 43 commits into from
Jun 1, 2018
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
fe4c8da
init
gongweibao May 23, 2018
9885c8c
add
gongweibao May 23, 2018
c3a8c05
compile ok
gongweibao May 23, 2018
4c45baf
move queue
gongweibao May 24, 2018
42c2ad0
fix global var bug
gongweibao May 24, 2018
33495e6
add rpc_id
gongweibao May 24, 2018
244617b
fix shared ptr bug
gongweibao May 24, 2018
64cb0e3
merge
gongweibao May 24, 2018
fe74105
follow panxin comments
gongweibao May 25, 2018
3a6fdd0
add cond id
gongweibao May 25, 2018
cfcffdb
clean up queue
gongweibao May 25, 2018
a556088
fix gen_nccl
gongweibao May 25, 2018
16fd836
fix gen_nccl
gongweibao May 25, 2018
63c5e7c
fix one
gongweibao May 25, 2018
dc5f373
can shut down
gongweibao May 25, 2018
6c8dc00
not find
gongweibao May 27, 2018
80f081c
fix shutdown
gongweibao May 27, 2018
8665134
clean up
gongweibao May 27, 2018
bd1c538
temp grc_server_test
gongweibao May 27, 2018
fe0f4aa
fix req_id
gongweibao May 27, 2018
a653b27
add mutex
gongweibao May 27, 2018
806bcd4
fix mem leak
gongweibao May 27, 2018
31a4413
cleanup and vgg16 ok
gongweibao May 28, 2018
4ede352
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
gongweibao May 28, 2018
c9a39a2
follow comments
gongweibao May 28, 2018
b6d9fc4
follow comments
gongweibao May 28, 2018
6503dac
fix gen
gongweibao May 28, 2018
1d8b37a
fix get bug
gongweibao May 28, 2018
c72e911
fix unittest
gongweibao May 28, 2018
941738a
fix get bug
gongweibao May 29, 2018
d01aa77
compile ok
gongweibao May 29, 2018
276044c
add log
gongweibao May 29, 2018
8d171a3
clean up
gongweibao May 30, 2018
1cf100e
add more reqs
gongweibao May 30, 2018
2e4fc55
add paddle enforce
gongweibao May 30, 2018
1cc99ff
merge
gongweibao May 30, 2018
f6ce3e3
add rpc_server.cc
gongweibao May 30, 2018
9771071
fix bug
gongweibao May 30, 2018
cdcafb2
fix sigterm
gongweibao May 30, 2018
ee91b3f
clean up
gongweibao May 30, 2018
8aa4921
follow comments
gongweibao May 31, 2018
9993820
fix dead lock bug
gongweibao May 31, 2018
324c234
follow comments
gongweibao May 31, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions paddle/fluid/inference/analysis/data_flow_graph.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,10 @@ limitations under the License. */

#include <deque>
#include <stack>
#include <string>
#include <unordered_set>
#include <utility>
#include <vector>

#include "paddle/fluid/inference/analysis/graph_traits.h"
#include "paddle/fluid/inference/analysis/node.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,6 @@ TEST_F(DFG_Tester, Test) {
LOG(INFO) << graph.nodes.size();
}

} // analysis
} // inference
} // paddle
}; // namespace analysis
}; // namespace inference
}; // namespace paddle
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,11 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License. */

#include "paddle/fluid/inference/analysis/fluid_to_data_flow_graph_pass.h"
#include <string>
#include <vector>

#include "paddle/fluid/inference/analysis/fluid_to_data_flow_graph_pass.h"

namespace paddle {
namespace inference {
namespace analysis {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@

#pragma once

#include <string>

#include "paddle/fluid/framework/program_desc.h"
#include "paddle/fluid/inference/analysis/data_flow_graph.h"
#include "paddle/fluid/inference/analysis/pass.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@ TEST_F(DFG_Tester, Init) {
LOG(INFO) << '\n' << graph.DotString();
}

} // analysis
} // inference
} // paddle
} // namespace analysis
} // namespace inference
} // namespace paddle
6 changes: 4 additions & 2 deletions paddle/fluid/inference/analysis/helper.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ struct DataTypeNamer {
return dic_.at(x);
}

const std::string &repr(size_t &hash) const {
const std::string &repr(size_t &hash) const { // NOLINT
PADDLE_ENFORCE(dic_.count(hash), "unknown type for representation");
return dic_.at(hash);
}
Expand All @@ -53,7 +53,9 @@ struct DataTypeNamer {
SET_TYPE(float);
}

std::unordered_map<decltype(typeid(int).hash_code()), std::string> dic_;
std::unordered_map<decltype(typeid(int).hash_code()), // NOLINT
std::string>
dic_;
};
#undef SET_TYPE

Expand Down
1 change: 1 addition & 0 deletions paddle/fluid/inference/analysis/pass.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ limitations under the License. */

#include <glog/logging.h>
#include <iosfwd>
#include <string>

#include "paddle/fluid/framework/framework.pb.h"
#include "paddle/fluid/inference/analysis/data_flow_graph.h"
Expand Down
2 changes: 2 additions & 0 deletions paddle/fluid/inference/analysis/subgraph_splitter.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ limitations under the License. */

#pragma once

#include <vector>

#include "paddle/fluid/inference/analysis/data_flow_graph.h"
#include "paddle/fluid/inference/analysis/node.h"

Expand Down
1 change: 1 addition & 0 deletions paddle/fluid/inference/analysis/ut_helper.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ limitations under the License. */
#pragma once
#include <gflags/gflags.h>
#include <gtest/gtest.h>
#include <string>
#include "paddle/fluid/framework/executor.h"
#include "paddle/fluid/inference/analysis/data_flow_graph.h"
#include "paddle/fluid/inference/analysis/fluid_to_data_flow_graph_pass.h"
Expand Down
2 changes: 1 addition & 1 deletion paddle/fluid/operators/detail/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
if(WITH_DISTRIBUTE)
grpc_library(sendrecvop_grpc SRCS bytebuffer_stream.cc sendrecvop_utils.cc grpc_client.cc
grpc_server.cc variable_response.cc PROTO send_recv.proto DEPS lod_tensor selected_rows)
rpc_processor.cc grpc_server.cc variable_response.cc PROTO send_recv.proto DEPS lod_tensor selected_rows)
set(DISTRIBUTE_COMPILE_FLAGS "-Wno-non-virtual-dtor -Wno-error=non-virtual-dtor -Wno-error=delete-non-virtual-dtor")
set_source_files_properties(serde_test.cc grpc_server_test.cc PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS})
cc_test(serde_test SRCS serde_test.cc variable_response.cc DEPS grpc++_unsecure grpc_unsecure gpr
Expand Down
Loading