talksik/mediapipe
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Project import generated by Copybara.

Browse Source 
GitOrigin-RevId: c2597990d2200830529f823f969b7e48293ab787
This commit is contained in:
MediaPipe Team
2019-09-09 14:37:30 -07:00
committed by jqtang
parent 785d266e3f
commit 423c21b454
8 changed files with 388 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mediapipe/framework/profiler/BUILD
+1
View File
@@ -226,6 +226,7 @@ cc_test(
"//mediapipe/calculators/core:flow_limiter_calculator",
"//mediapipe/calculators/core:immediate_mux_calculator",
"//mediapipe/calculators/core:round_robin_demux_calculator",
"//mediapipe/calculators/util:annotation_overlay_calculator",
"//mediapipe/framework:calculator_cc_proto",
"//mediapipe/framework:calculator_framework",
"//mediapipe/framework:calculator_profile_cc_proto",
mediapipe/framework/profiler/graph_profiler.cc
+10 -2
View File
@@ -174,6 +174,10 @@ void GraphProfiler::Pause() {
}
void GraphProfiler::Resume() {
// is_profiling_ enables recording of performance stats.
// is_tracing_ enables recording of timing events.
// While the graph is running, these variables indicate
// IsProfilerEnabled and IsTracerEnabled.
is_profiling_ = IsProfilerEnabled(profiler_config_);
is_tracing_ = IsTracerEnabled(profiler_config_);
}
@@ -502,7 +506,7 @@ void GraphProfiler::AddProcessSample(
}
std::unique_ptr<GlProfilingHelper> GraphProfiler::CreateGlProfilingHelper() {
if (!IsProfilerEnabled(profiler_config_)) {
if (!IsTracerEnabled(profiler_config_)) {
return nullptr;
}
return absl::make_unique<mediapipe::GlProfilingHelper>(shared_from_this());
@@ -576,7 +580,6 @@ void AssignNodeNames(GraphProfile* profile) {
LOG(INFO) << "trace_log_path: " << trace_log_path;
int log_interval_count = GetLogIntervalCount(profiler_config_);
int log_file_count = GetLogFileCount(profiler_config_);
++previous_log_index_;
// Record the GraphTrace events since the previous WriteProfile.
// The end_time is chosen to be trace_log_margin_usec in the past,
@@ -592,6 +595,10 @@ void AssignNodeNames(GraphProfile* profile) {
tracer()->GetLog(previous_log_end_time_, end_time, trace);
}
previous_log_end_time_ = end_time;
// If there are no trace events, skip log writing.
if (is_tracing_ && trace->calculator_trace().empty()) {
return ::mediapipe::OkStatus();
}
// Record the latest CalculatorProfiles.
Status status;
@@ -603,6 +610,7 @@ void AssignNodeNames(GraphProfile* profile) {
this->Reset();
// Record the CalculatorGraphConfig, once per log file.
++previous_log_index_;
bool is_new_file = (previous_log_index_ % log_interval_count == 0);
if (is_new_file) {
*profile.mutable_config() = validated_graph_->Config();
mediapipe/framework/profiler/graph_tracer_test.cc
+46 -189
View File
@@ -67,9 +67,8 @@ class GraphTracerTest : public ::testing::Test {
}
// Initializes the GraphTracer.
void SetUpGraphTracer(size_t size) {
void SetUpGraphTracer() {
ProfilerConfig profiler_config;
profiler_config.set_trace_log_capacity(size);
profiler_config.set_trace_enabled(true);
tracer_ = absl::make_unique<GraphTracer>(profiler_config);
}
@@ -118,7 +117,7 @@ class GraphTracerTest : public ::testing::Test {
TEST_F(GraphTracerTest, EmptyTrace) {
// Define the GraphTracer.
SetUpGraphTracer(1024 * 1024);
SetUpGraphTracer();
// Validate the GraphTrace data.
EXPECT_THAT(GetTrace(),
@@ -131,7 +130,7 @@ TEST_F(GraphTracerTest, EmptyTrace) {
TEST_F(GraphTracerTest, CalculatorTrace) {
// Define the GraphTracer, the CalculatorState, and the stream specs.
SetUpGraphTracer(1024 * 1024);
SetUpGraphTracer();
SetUpCalculatorContext("PCalculator_1", /*node_id=*/0, {"input_stream"},
{"output_stream"});
absl::Time curr_time = start_time_;
@@ -171,7 +170,7 @@ TEST_F(GraphTracerTest, CalculatorTrace) {
TEST_F(GraphTracerTest, GraphTrace) {
// Define the GraphTracer, the CalculatorState, and the stream specs.
SetUpGraphTracer(1024 * 1024);
SetUpGraphTracer();
SetUpCalculatorContext("PCalculator_1", /*node_id=*/0, {"input_stream"},
{"up_1", "up_2"});
absl::Time curr_time = start_time_;
@@ -914,11 +913,14 @@ TEST_F(GraphTracerE2ETest, DemuxGraphLog) {
}
// Read a GraphProfile from a file path.
void ReadGraphProfile(const std::string& path, GraphProfile* profile) {
::mediapipe::Status ReadGraphProfile(const std::string& path,
GraphProfile* profile) {
std::ifstream ifs;
ifs.open(path);
proto_ns::io::IstreamInputStream in_stream(&ifs);
profile->ParseFromZeroCopyStream(&in_stream);
return ifs.is_open() ? ::mediapipe::OkStatus()
: ::mediapipe::UnavailableError("Cannot open");
}
TEST_F(GraphTracerE2ETest, DemuxGraphLogFile) {
@@ -928,7 +930,8 @@ TEST_F(GraphTracerE2ETest, DemuxGraphLogFile) {
graph_config_.mutable_profiler_config()->set_trace_log_interval_usec(-1);
RunDemuxInFlightGraph();
GraphProfile profile;
ReadGraphProfile(absl::StrCat(log_path, 0, ".binarypb"), &profile);
MEDIAPIPE_EXPECT_OK(
ReadGraphProfile(absl::StrCat(log_path, 0, ".binarypb"), &profile));
EXPECT_EQ(89, profile.graph_trace(0).calculator_trace().size());
}
@@ -937,22 +940,24 @@ TEST_F(GraphTracerE2ETest, DemuxGraphLogFiles) {
SetUpDemuxInFlightGraph();
graph_config_.mutable_profiler_config()->set_trace_log_path(log_path);
graph_config_.mutable_profiler_config()->set_trace_log_count(100);
graph_config_.mutable_profiler_config()->set_trace_log_interval_count(10);
graph_config_.mutable_profiler_config()->set_trace_log_interval_count(5);
graph_config_.mutable_profiler_config()->set_trace_log_interval_usec(2500);
RunDemuxInFlightGraph();
std::vector<int> event_counts;
std::vector<GraphProfile> graph_profiles;
for (int i = 0; i < 7; ++i) {
GraphProfile profile;
ReadGraphProfile(absl::StrCat(log_path, i, ".binarypb"), &profile);
int count = 0;
for (auto trace : *profile.mutable_graph_trace()) {
count += trace.calculator_trace().size();
std::string log_file_name = absl::StrCat(log_path, i, ".binarypb");
if (ReadGraphProfile(log_file_name, &profile).ok()) {
int count = 0;
for (auto trace : *profile.mutable_graph_trace()) {
count += trace.calculator_trace().size();
}
event_counts.push_back(count);
graph_profiles.push_back(profile);
}
event_counts.push_back(count);
graph_profiles.push_back(profile);
}
std::vector<int> expected = {37, 42, 19, 0, 0, 0, 0};
std::vector<int> expected = {37, 52, 9};
EXPECT_EQ(event_counts, expected);
GraphProfile& profile_2 = graph_profiles[2];
profile_2.clear_calculator_profiles();
@@ -981,179 +986,6 @@ TEST_F(GraphTracerE2ETest, DemuxGraphLogFiles) {
stream_name: "output_packets_0"
stream_name: "finish_indicator"
stream_name: "output_1"
}
graph_trace {
base_time: 1544086800000000
base_timestamp: 0
stream_name: ""
stream_name: "input_packets_0"
stream_name: "input_0_sampled"
stream_name: "input_0"
stream_name: "input_1"
stream_name: "output_0"
stream_name: "output_packets_0"
stream_name: "finish_indicator"
stream_name: "output_1"
}
graph_trace {
base_time: 1544086800000000
base_timestamp: 0
stream_name: ""
stream_name: "input_packets_0"
stream_name: "input_0_sampled"
stream_name: "input_0"
stream_name: "input_1"
stream_name: "output_0"
stream_name: "output_packets_0"
stream_name: "finish_indicator"
stream_name: "output_1"
}
graph_trace {
base_time: 1544086800000000
base_timestamp: 0
stream_name: ""
stream_name: "input_packets_0"
stream_name: "input_0_sampled"
stream_name: "input_0"
stream_name: "input_1"
stream_name: "output_0"
stream_name: "output_packets_0"
stream_name: "finish_indicator"
stream_name: "output_1"
}
graph_trace {
base_time: 1544086800000000
base_timestamp: 0
stream_name: ""
stream_name: "input_packets_0"
stream_name: "input_0_sampled"
stream_name: "input_0"
stream_name: "input_1"
stream_name: "output_0"
stream_name: "output_packets_0"
stream_name: "finish_indicator"
stream_name: "output_1"
}
graph_trace {
base_time: 1544086800000000
base_timestamp: 0
stream_name: ""
stream_name: "input_packets_0"
stream_name: "input_0_sampled"
stream_name: "input_0"
stream_name: "input_1"
stream_name: "output_0"
stream_name: "output_packets_0"
stream_name: "finish_indicator"
stream_name: "output_1"
}
graph_trace {
base_time: 1544086800000000
base_timestamp: 0
stream_name: ""
stream_name: "input_packets_0"
stream_name: "input_0_sampled"
stream_name: "input_0"
stream_name: "input_1"
stream_name: "output_0"
stream_name: "output_packets_0"
stream_name: "finish_indicator"
stream_name: "output_1"
calculator_trace {
node_id: 3
input_timestamp: 50000
event_type: PROCESS
finish_time: 65004
output_trace { packet_timestamp: 50000 stream_id: 5 }
}
calculator_trace {
node_id: 5
event_type: READY_FOR_PROCESS
start_time: 65004
}
calculator_trace {
node_id: 3
event_type: READY_FOR_CLOSE
start_time: 65004
}
calculator_trace {
node_id: 5
input_timestamp: 50000
event_type: PROCESS
start_time: 65004
finish_time: 65004
input_trace {
start_time: 65004
finish_time: 65004
packet_timestamp: 50000
stream_id: 5
}
output_trace { packet_timestamp: 50000 stream_id: 6 }
output_trace { packet_timestamp: 50000 stream_id: 7 }
}
calculator_trace {
node_id: 1
event_type: READY_FOR_PROCESS
start_time: 65004
}
calculator_trace {
node_id: 5
event_type: NOT_READY
start_time: 65004
}
calculator_trace {
node_id: 5
event_type: READY_FOR_PROCESS
start_time: 65004
}
calculator_trace {
node_id: 5
event_type: NOT_READY
start_time: 65004
}
calculator_trace {
node_id: 1
input_timestamp: 50000
event_type: PROCESS
start_time: 65004
input_trace {
start_time: 65004
finish_time: 65004
packet_timestamp: 50000
stream_id: 7
}
}
calculator_trace {
node_id: 1
event_type: NOT_READY
start_time: 65004
}
}
graph_trace {
base_time: 1544086800000000
base_timestamp: 0
stream_name: ""
stream_name: "input_packets_0"
stream_name: "input_0_sampled"
stream_name: "input_0"
stream_name: "input_1"
stream_name: "output_0"
stream_name: "output_packets_0"
stream_name: "finish_indicator"
stream_name: "output_1"
}
graph_trace {
base_time: 1544086800000000
base_timestamp: 0
stream_name: ""
stream_name: "input_packets_0"
stream_name: "input_0_sampled"
stream_name: "input_0"
stream_name: "input_1"
stream_name: "output_0"
stream_name: "output_packets_0"
stream_name: "finish_indicator"
stream_name: "output_1"
calculator_trace {
node_id: 4
input_timestamp: 40000
@@ -1288,7 +1120,7 @@ TEST_F(GraphTracerE2ETest, DemuxGraphLogFiles) {
num_histogram_intervals: 100
trace_log_count: 100
trace_log_interval_usec: 2500
trace_log_interval_count: 10
trace_log_interval_count: 5
trace_enabled: true
}
}
@@ -1428,5 +1260,30 @@ TEST_F(GraphTracerE2ETest, GpuTaskTrace) {
)")));
}
// Show that trace_enabled activates the GlContextProfiler.
TEST_F(GraphTracerE2ETest, GpuTracing) {
CHECK(proto_ns::TextFormat::ParseFromString(R"(
input_stream: "input_buffer"
input_stream: "render_data"
output_stream: "annotated_buffer"
node {
calculator: "AnnotationOverlayCalculator"
input_stream: "INPUT_FRAME:input_buffer"
input_stream: "render_data"
output_stream: "OUTPUT_FRAME:annotated_buffer"
}
profiler_config {
trace_enabled: true
}
)",
&graph_config_));
// Create the CalculatorGraph with only trace_enabled set.
MEDIAPIPE_ASSERT_OK(graph_.Initialize(graph_config_, {}));
// Check that GPU profiling is enabled wihout running the graph.
// This graph with GlFlatColorCalculator cannot run on desktop.
EXPECT_NE(nullptr, graph_.profiler()->CreateGlProfilingHelper());
}
} // namespace
} // namespace mediapipe