faiss 0.1.7 → 0.2.3

data/vendor/faiss/faiss/utils/WorkerThread.cpp

@@ -5,9 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-
-#include <faiss/utils/WorkerThread.h>
 #include <faiss/impl/FaissAssert.h>
+#include <faiss/utils/WorkerThread.h>
 #include <exception>
 
 namespace faiss {
@@ -15,112 +14,104 @@ namespace faiss {
 namespace {
 
 // Captures any exceptions thrown by the lambda and returns them via the promise
-void runCallback(std::function<void()>& fn,
-                 std::promise<bool>& promise) {
-  try {
-    fn();
-    promise.set_value(true);
-  } catch (...) {
-    promise.set_exception(std::current_exception());
-  }
+void runCallback(std::function<void()>& fn, std::promise<bool>& promise) {
+    try {
+        fn();
+        promise.set_value(true);
+    } catch (...) {
+        promise.set_exception(std::current_exception());
+    }
 }
 
 } // namespace
 
-WorkerThread::WorkerThread() :
-    wantStop_(false) {
-  startThread();
+WorkerThread::WorkerThread() : wantStop_(false) {
+    startThread();
 
-  // Make sure that the thread has started before continuing
-  add([](){}).get();
+    // Make sure that the thread has started before continuing
+    add([]() {}).get();
 }
 
 WorkerThread::~WorkerThread() {
-  stop();
-  waitForThreadExit();
+    stop();
+    waitForThreadExit();
 }
 
-void
-WorkerThread::startThread() {
-  thread_ = std::thread([this](){ threadMain(); });
+void WorkerThread::startThread() {
+    thread_ = std::thread([this]() { threadMain(); });
 }
 
-void
-WorkerThread::stop() {
-  std::lock_guard<std::mutex> guard(mutex_);
+void WorkerThread::stop() {
+    std::lock_guard<std::mutex> guard(mutex_);
 
-  wantStop_ = true;
-  monitor_.notify_one();
+    wantStop_ = true;
+    monitor_.notify_one();
 }
 
-std::future<bool>
-WorkerThread::add(std::function<void()> f) {
-  std::lock_guard<std::mutex> guard(mutex_);
+std::future<bool> WorkerThread::add(std::function<void()> f) {
+    std::lock_guard<std::mutex> guard(mutex_);
 
-  if (wantStop_) {
-    // The timer thread has been stopped, or we want to stop; we can't
-    // schedule anything else
-    std::promise<bool> p;
-    auto fut = p.get_future();
+    if (wantStop_) {
+        // The timer thread has been stopped, or we want to stop; we can't
+        // schedule anything else
+        std::promise<bool> p;
+        auto fut = p.get_future();
 
-    // did not execute
-    p.set_value(false);
-    return fut;
-  }
+        // did not execute
+        p.set_value(false);
+        return fut;
+    }
 
-  auto pr = std::promise<bool>();
-  auto fut = pr.get_future();
+    auto pr = std::promise<bool>();
+    auto fut = pr.get_future();
 
-  queue_.emplace_back(std::make_pair(std::move(f), std::move(pr)));
+    queue_.emplace_back(std::make_pair(std::move(f), std::move(pr)));
 
-  // Wake up our thread
-  monitor_.notify_one();
-  return fut;
+    // Wake up our thread
+    monitor_.notify_one();
+    return fut;
 }
 
-void
-WorkerThread::threadMain() {
-  threadLoop();
+void WorkerThread::threadMain() {
+    threadLoop();
 
-  // Call all pending tasks
-  FAISS_ASSERT(wantStop_);
+    // Call all pending tasks
+    FAISS_ASSERT(wantStop_);
 
-  // flush all pending operations
-  for (auto& f : queue_) {
-    runCallback(f.first, f.second);
-  }
+    // flush all pending operations
+    for (auto& f : queue_) {
+        runCallback(f.first, f.second);
+    }
 }
 
-void
-WorkerThread::threadLoop() {
-  while (true) {
-    std::pair<std::function<void()>, std::promise<bool>> data;
+void WorkerThread::threadLoop() {
+    while (true) {
+        std::pair<std::function<void()>, std::promise<bool>> data;
 
-    {
-      std::unique_lock<std::mutex> lock(mutex_);
+        {
+            std::unique_lock<std::mutex> lock(mutex_);
 
-      while (!wantStop_ && queue_.empty()) {
-        monitor_.wait(lock);
-      }
+            while (!wantStop_ && queue_.empty()) {
+                monitor_.wait(lock);
+            }
 
-      if (wantStop_) {
-        return;
-      }
+            if (wantStop_) {
+                return;
+            }
 
-      data = std::move(queue_.front());
-      queue_.pop_front();
-    }
+            data = std::move(queue_.front());
+            queue_.pop_front();
+        }
 
-    runCallback(data.first, data.second);
-  }
+        runCallback(data.first, data.second);
+    }
 }
 
-void
-WorkerThread::waitForThreadExit() {
-  try {
-    thread_.join();
-  } catch (...) {
-  }
+void WorkerThread::waitForThreadExit() {
+    try {
+        thread_.join();
+    } catch (...) {
+    }
 }
 
-} // namespace
+} // namespace faiss

data/vendor/faiss/faiss/utils/WorkerThread.h

@@ -5,57 +5,56 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-
 #pragma once
 
 #include <condition_variable>
-#include <future>
 #include <deque>
+#include <future>
 #include <thread>
 
 namespace faiss {
 
 class WorkerThread {
- public:
-  WorkerThread();
+   public:
+    WorkerThread();
 
-  /// Stops and waits for the worker thread to exit, flushing all
-  /// pending lambdas
-  ~WorkerThread();
+    /// Stops and waits for the worker thread to exit, flushing all
+    /// pending lambdas
+    ~WorkerThread();
 
-  /// Request that the worker thread stop itself
-  void stop();
+    /// Request that the worker thread stop itself
+    void stop();
 
-  /// Blocking waits in the current thread for the worker thread to
-  /// stop
-  void waitForThreadExit();
+    /// Blocking waits in the current thread for the worker thread to
+    /// stop
+    void waitForThreadExit();
 
-  /// Adds a lambda to run on the worker thread; returns a future that
-  /// can be used to block on its completion.
-  /// Future status is `true` if the lambda was run in the worker
-  /// thread; `false` if it was not run, because the worker thread is
-  /// exiting or has exited.
-  std::future<bool> add(std::function<void()> f);
+    /// Adds a lambda to run on the worker thread; returns a future that
+    /// can be used to block on its completion.
+    /// Future status is `true` if the lambda was run in the worker
+    /// thread; `false` if it was not run, because the worker thread is
+    /// exiting or has exited.
+    std::future<bool> add(std::function<void()> f);
 
- private:
-  void startThread();
-  void threadMain();
-  void threadLoop();
+   private:
+    void startThread();
+    void threadMain();
+    void threadLoop();
 
-  /// Thread that all queued lambdas are run on
-  std::thread thread_;
+    /// Thread that all queued lambdas are run on
+    std::thread thread_;
 
-  /// Mutex for the queue and exit status
-  std::mutex mutex_;
+    /// Mutex for the queue and exit status
+    std::mutex mutex_;
 
-  /// Monitor for the exit status and the queue
-  std::condition_variable monitor_;
+    /// Monitor for the exit status and the queue
+    std::condition_variable monitor_;
 
-  /// Whether or not we want the thread to exit
-  bool wantStop_;
+    /// Whether or not we want the thread to exit
+    bool wantStop_;
 
-  /// Queue of pending lambdas to call
-  std::deque<std::pair<std::function<void()>, std::promise<bool>>> queue_;
+    /// Queue of pending lambdas to call
+    std::deque<std::pair<std::function<void()>, std::promise<bool>>> queue_;
 };
 
-} // namespace
+} // namespace faiss