Skip to content

Commit

Permalink
Remove CAFFE2_USE_MINIMAL_GOOGLE_GLOG (pytorch#12938)
Browse files Browse the repository at this point in the history
Summary:
Pull Request resolved: pytorch#12938

We will be using C10_USE_MINIMAL_GLOG. Also, this will be in exported flags,
so dependent libraries won't need to define it.

Reviewed By: smessmer, BIT-silence

Differential Revision: D10468993

fbshipit-source-id: 04ae3ae17122d46b1b512d4202ab014365b87f4a
  • Loading branch information
Yangqing Jia authored and facebook-github-bot committed Oct 22, 2018
1 parent 283d418 commit 95caa37
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions c10/util/logging_is_google_glog.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include <cuda.h>
#endif

#if !defined(__CUDACC__) && !defined(CAFFE2_USE_MINIMAL_GOOGLE_GLOG)
#if !defined(__CUDACC__) && !defined(C10_USE_MINIMAL_GLOG)
#include <glog/stl_logging.h>

// Old versions of glog don't declare this using declaration, so help
Expand All @@ -26,7 +26,7 @@ namespace std {
using ::operator<<;
}

#else // !defined(__CUDACC__) && !defined(CAFFE2_USE_MINIMAL_GOOGLE_GLOG)
#else // !defined(__CUDACC__) && !defined(C10_USE_MINIMAL_GLOG)

// In the cudacc compiler scenario, we will simply ignore the container
// printout feature. Basically we need to register a fake overload for
Expand Down

0 comments on commit 95caa37

Please sign in to comment.