Merge pull request #104 from jma127/master

Slight logger refactor and memory pressure reduction

Author: jma127

src_cpp/elf/CMakeLists.txt

@@ -14,10 +14,10 @@ set(ELF_SOURCES
  options/Pybind.cc
 )
 
-# set(ELF_TEST_SOURCES
-#  options/OptionMapTest.cc
-#  options/OptionSpecTest.cc
-# )
+set(ELF_TEST_SOURCES
+ options/OptionMapTest.cc
+ options/OptionSpecTest.cc
+)
 
 # Main ELF library
 
@@ -40,7 +40,7 @@ target_link_libraries(elf PUBLIC
 # Tests
 
 enable_testing()
-# add_cpp_tests(test_cpp_elf_ elf ${ELF_TEST_SOURCES})
+add_cpp_tests(test_cpp_elf_ elf ${ELF_TEST_SOURCES})
 
 # Python bindings
 

src_cpp/elf/ai/tree_search/mcts.h

@@ -42,8 +42,9 @@ class MCTSAI_T : public AI_T<typename Actor::State, typename Actor::Action> {
  const elf::ai::tree_search::TSOptions& options,
  std::function<Actor*(int)> gen)
  : options_(options),
- logger_(
- elf::logging::getLogger("elf::ai::tree_search::MCTSAI_T-", "")) {
+ logger_(elf::logging::getIndexedLogger(
+ "elf::ai::tree_search::MCTSAI_T-",
+ "")) {
  ts_.reset(new TreeSearch(options_, gen));
  }
 

src_cpp/elf/ai/tree_search/tree_search.h

@@ -70,7 +70,7 @@ class TreeSearchSingleThreadT {
  TreeSearchSingleThreadT(int thread_id, const TSOptions& options)
  : threadId_(thread_id),
  options_(options),
- logger_(elf::logging::getLogger(
+ logger_(elf::logging::getIndexedLogger(
  "elf::ai::tree_search::TreeSearchSingleThreadT-",
  "")) {
  if (options_.verbose) {
@@ -334,8 +334,9 @@ class TreeSearchT {
  TreeSearchT(const TSOptions& options, std::function<Actor*(int)> actor_gen)
  : options_(options),
  stopSearch_(false),
- logger_(
- elf::logging::getLogger("elf::ai::tree_search::TreeSearchT-", "")) {
+ logger_(elf::logging::getIndexedLogger(
+ "elf::ai::tree_search::TreeSearchT-",
+ "")) {
  for (int i = 0; i < options.num_threads; ++i) {
  treeSearches_.emplace_back(new TreeSearchSingleThread(i, options_));
  actors_.emplace_back(actor_gen(i));

src_cpp/elf/ai/tree_search/tree_search_base.h

@@ -116,9 +116,7 @@ struct EdgeInfo {
  child_node(InvalidNodeId),
  reward(0),
  num_visits(0),
- virtual_loss(0),
- logger_(
- elf::logging::getLogger("elf::ai::tree_search::EdgeInfo-", "")) {}
+ virtual_loss(0) {}
 
  float getQSA() const {
  return reward / num_visits;
@@ -127,9 +125,6 @@ struct EdgeInfo {
  // TODO: What is this function doing (ssengupta@fb.com)
  void checkValid() const {
  if (virtual_loss != 0) {
- // TODO: This should be a Google log (ssengupta@fb)
- logger_->info(
- "Virtual loss is not zero[{}]\n{}", virtual_loss, info(true));
  assert(virtual_loss == 0);
  }
  }

src_cpp/elf/base/context.h

@@ -200,7 +200,8 @@ class Context {
  public:
  using GameCallback = std::function<void(int game_idx, GameClient*)>;
 
- Context() : logger_(elf::logging::getLogger("elf::base::Context-", "")) {
+ Context()
+ : logger_(elf::logging::getIndexedLogger("elf::base::Context-", "")) {
  // Wait for the derived class to add entries to extractor_.
  server_ = comm_.getServer();
  client_.reset(new GameClient(&comm_, this));

src_cpp/elf/base/dispatcher.h

@@ -21,8 +21,9 @@ class ThreadedDispatcherT : public ThreadedCtrlBase {
  ThreadedDispatcherT(Ctrl& ctrl, int num_games)
  : ThreadedCtrlBase(ctrl, 500),
  num_games_(num_games),
- logger_(
- elf::logging::getLogger("elf::base::ThreadedDispatcherT-", "")) {}
+ logger_(elf::logging::getIndexedLogger(
+ "elf::base::ThreadedDispatcherT-",
+ "")) {}
 
  void Start(ServerReply replier, ServerFirstSend first_send = nullptr) {
  server_replier_ = replier;

src_cpp/elf/base/extractor.h

@@ -471,7 +471,8 @@ class ClassFieldT;
 //
 class Extractor {
  public:
- Extractor() : logger_(elf::logging::getLogger("elf::base::Extractor-", "")) {}
+ Extractor()
+ : logger_(elf::logging::getIndexedLogger("elf::base::Extractor-", "")) {}
 
  template <typename T>
  FuncMapT<T>& addField(const std::string& key) {
@@ -579,7 +580,8 @@ class ClassFieldT {
 
  ClassFieldT(Extractor* ext)
  : ext_(ext),
- logger_(elf::logging::getLogger("elf::base::ClassFieldT-", "")) {}
+ logger_(elf::logging::getIndexedLogger("elf::base::ClassFieldT-", "")) {
+ }
 
  template <typename T>
  ClassField& addFunction(

src_cpp/elf/base/sharedmem.h

@@ -133,7 +133,7 @@ class SharedMem {
  const std::unordered_map<std::string, AnyP>& mem)
  : opts_(smem_opts),
  mem_(mem),
- logger_(elf::logging::getLogger("elf::base::SharedMem-", "")) {
+ logger_(elf::logging::getIndexedLogger("elf::base::SharedMem-", "")) {
  opts_.setIdx(idx);
  }
 

src_cpp/elf/comm/comm.h

@@ -327,7 +327,7 @@ class CommT : public CommInternalT<
  : CommInternal::Client(pp),
  pp_(pp),
  rng_(time(NULL)),
- logger_(elf::logging::getLogger("elf::comm::Client-", "")) {}
+ logger_(elf::logging::getIndexedLogger("elf::comm::Client-", "")) {}
 
  ReplyStatus sendWait(Data data, const std::vector<std::string>& labels) {
  return CommInternal::Client::sendWait(

src_cpp/elf/distributed/shared_reader.h

@@ -164,8 +164,9 @@ class ReaderQueuesT {
  ReaderQueuesT(const RQCtrl& reader_ctrl)
  : min_size_satisfied_(false),
  parity_sizes_(2, 0),
- logger_(
- elf::logging::getLogger("elf::distributed::ReaderQueuesT-", "")) {
+ logger_(elf::logging::getIndexedLogger(
+ "elf::distributed::ReaderQueuesT-",
+ "")) {
  // Make sure this is an even number.
  assert(reader_ctrl.num_reader % 2 == 0);
  min_size_per_queue_ = reader_ctrl.ctrl.queue_min_size;