frozenleaves/pytorch
1
0
Fork 0
mirror of https://github.com/pytorch/pytorch.git synced 2025-11-11 22:34:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Restore timestamps on C++ logs without glog (#121384)

Browse Source 
It looks like it was commented out because the original implementation was not sufficiently portable. I had to do some rewrites to the innards to make it no portable. No Windows nanoseconds support because I'm lazy.

I tested by running `build/bin/TCPStoreTest` and observing the log messages there.  I am actually not sure how to look at the log messages from Python though.

Signed-off-by: Edward Z. Yang <ezyang@meta.com>
Pull Request resolved: https://github.com/pytorch/pytorch/pull/121384
Approved by: https://github.com/Skylion007, https://github.com/malfet
This commit is contained in:
Edward Z. Yang
2024-03-07 13:32:26 -08:00
committed by PyTorch MergeBot
parent 704e15307e
commit b84f94f6a3
1 changed files with 31 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
c10/util/Logging.cpp
View File

@ -5,6 +5,10 @@
#include <folly/synchronization/SanitizeThread.h>
#endif
#ifndef _WIN32
#include <sys/time.h>
#endif
#include <algorithm>
#include <cstdlib>
#include <iostream>
@ -351,27 +355,37 @@ MessageLogger::MessageLogger(const char* file, int line, int severity)
#else // !ANDROID
tag_ = "";
#endif // ANDROID
/*
time_t rawtime;
struct tm * timeinfo;
time_t rawtime = 0;
time(&rawtime);
timeinfo = localtime(&rawtime);
std::chrono::nanoseconds ns =
std::chrono::duration_cast<std::chrono::nanoseconds>(
std::chrono::high_resolution_clock::now().time_since_epoch());
*/
#ifndef _WIN32
struct tm raw_timeinfo = {0};
struct tm* timeinfo = &raw_timeinfo;
localtime_r(&rawtime, timeinfo);
#else
// is thread safe on Windows
struct tm* timeinfo = localtime(&rawtime);
#endif
#ifndef _WIN32
// Get the current nanoseconds since epoch
struct timespec ts = {0};
clock_gettime(CLOCK_MONOTONIC, &ts);
long ns = ts.tv_nsec;
#else
long ns = 0;
#endif
if (GLOBAL_RANK != -1) {
stream_ << "[rank" << GLOBAL_RANK << "]:";
}
stream_ << "["
<< CAFFE2_SEVERITY_PREFIX[std::min(4, GLOG_FATAL - severity_)]
//<< (timeinfo->tm_mon + 1) * 100 + timeinfo->tm_mday
//<< std::setfill('0')
//<< " " << std::setw(2) << timeinfo->tm_hour
//<< ":" << std::setw(2) << timeinfo->tm_min
//<< ":" << std::setw(2) << timeinfo->tm_sec
//<< "." << std::setw(9) << ns.count() % 1000000000
<< " " << c10::detail::StripBasename(std::string(file)) << ":" << line
stream_ << "[" << CAFFE2_SEVERITY_PREFIX[std::min(4, GLOG_FATAL - severity_)]
<< (timeinfo->tm_mon + 1) * 100 + timeinfo->tm_mday
<< std::setfill('0') << " " << std::setw(2) << timeinfo->tm_hour
<< ":" << std::setw(2) << timeinfo->tm_min << ":" << std::setw(2)
<< timeinfo->tm_sec << "." << std::setw(9) << ns << " "
<< c10::detail::StripBasename(std::string(file)) << ":" << line
<< "] ";
}