experiments/STT-tensorflow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #44365 from yisitu/cherrypicks_CDI8I

Browse Source 
[Cherrypick r2.4] Save response on the client side for better backward compatibility.
This commit is contained in:
Mihai Maruseac 2020-10-28 18:37:59 -07:00 committed by GitHub
commit 6aa37d5bfc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tensorflow/core/profiler/rpc/client/capture_profile.cc
View File

@ -132,6 +132,12 @@ Status Profile(const std::string& repository_root,
<< client_response.service_address; << client_response.service_address;
} else { } else {
has_trace_data = true; has_trace_data = true;
// If server side returns tool data in the response, saves that into the
// repository. This improves backward compatibility by reducing assumption
// of what server side does.
TF_RETURN_IF_ERROR(SaveProfile(repository_root, session_id,
client_response.service_address, response,
&std::cout));
} }
if (!client_response.status.ok()) { if (!client_response.status.ok()) {
LOG(WARNING) << client_response.service_address << " returned " LOG(WARNING) << client_response.service_address << " returned "

6
tensorflow/core/profiler/rpc/client/save_profile.cc
View File

@ -22,6 +22,7 @@ limitations under the License.
#include "absl/strings/match.h" #include "absl/strings/match.h"
#include "absl/strings/str_cat.h" #include "absl/strings/str_cat.h"
#include "absl/strings/str_replace.h"
#include "absl/strings/string_view.h" #include "absl/strings/string_view.h"
#include "absl/strings/strip.h" #include "absl/strings/strip.h"
#include "absl/time/clock.h" #include "absl/time/clock.h"
@ -115,10 +116,13 @@ Status MaybeCreateEmptyEventFile(const std::string& logdir) {
Status SaveProfile(const std::string& repository_root, const std::string& run, Status SaveProfile(const std::string& repository_root, const std::string& run,
const std::string& host, const ProfileResponse& response, const std::string& host, const ProfileResponse& response,
std::ostream* os) { std::ostream* os) {
if (response.tool_data().empty()) return Status::OK();
std::string run_dir; std::string run_dir;
TF_RETURN_IF_ERROR(GetOrCreateRunDir(repository_root, run, &run_dir, os)); TF_RETURN_IF_ERROR(GetOrCreateRunDir(repository_root, run, &run_dir, os));
// Windows file names do not support colons.
std::string hostname = absl::StrReplaceAll(host, {{":", "_"}});
for (const auto& tool_data : response.tool_data()) { for (const auto& tool_data : response.tool_data()) {
TF_RETURN_IF_ERROR(DumpToolData(run_dir, host, tool_data, os)); TF_RETURN_IF_ERROR(DumpToolData(run_dir, hostname, tool_data, os));
} }
return Status::OK(); return Status::OK();
} }