Deprecates SPM_NO_THREADLOCAL mode

Author: taku910

CMakeLists.txt

@@ -27,7 +27,6 @@ option(SPM_ENABLE_SHARED "Builds shared libaries in addition to static libraries
 option(SPM_BUILD_TEST "Builds test binaries." OFF)
 option(SPM_ENABLE_TCMALLOC "Enable TCMalloc if available." ON)
 option(SPM_TCMALLOC_STATIC "Link static library of TCMALLOC." OFF)
-option(SPM_NO_THREADLOCAL "Disable thread_local operator" OFF)
 option(SPM_ENABLE_MSVC_MT_BUILD, "Use /MT flag in MSVC build" OFF)
 option(SPM_CROSS_SYSTEM_PROCESSOR, "Override system processor" "")
 option(SPM_DISABLE_EMBEDDED_DATA, "Disable to embed pre-compiled data." OFF)

src/CMakeLists.txt

@@ -251,10 +251,6 @@ set_target_properties(sentencepiece_train-static PROPERTIES OUTPUT_NAME "sentenc
 
 if (NOT MSVC)
   set(CMAKE_CXX_FLAGS "-O3 -Wall -fPIC ${CMAKE_CXX_FLAGS}")
-  if (SPM_NO_THREADLOCAL)
-    add_definitions(-DSPM_NO_THREADLOCAL=1)
-    add_definitions(-DGOOGLE_PROTOBUF_NO_THREADLOCAL=1)
-  endif()
   set_source_files_properties(
     sentencepiece.pb.cc sentencepiece_model.pb.cc
     PROPERTIES COMPILE_FLAGS "-Wno-misleading-indentation")

src/util.cc

@@ -179,35 +179,6 @@ std::string UnicodeTextToUTF8(const UnicodeText &utext) {
 }  // namespace string_util
 
 namespace random {
-#ifdef SPM_NO_THREADLOCAL
-namespace {
-class RandomGeneratorStorage {
- public:
-  RandomGeneratorStorage() {
-    pthread_key_create(&key_, &RandomGeneratorStorage::Delete);
-  }
-  virtual ~RandomGeneratorStorage() { pthread_key_delete(key_); }
-
-  std::mt19937 *Get() {
-    auto *result = static_cast<std::mt19937 *>(pthread_getspecific(key_));
-    if (result == nullptr) {
-      result = new std::mt19937(GetRandomGeneratorSeed());
-      pthread_setspecific(key_, result);
-    }
-    return result;
-  }
-
- private:
-  static void Delete(void *value) { delete static_cast<std::mt19937 *>(value); }
-  pthread_key_t key_;
-};
-}  // namespace
-
-std::mt19937 *GetRandomGenerator() {
-  static RandomGeneratorStorage *storage = new RandomGeneratorStorage;
-  return storage->Get();
-}
-#else
 std::mt19937 *GetRandomGenerator() {
   // Thread-locals occupy stack space in every thread ever created by the
   // program, even if that thread never uses the thread-local variable.
@@ -222,7 +193,6 @@ std::mt19937 *GetRandomGenerator() {
       std::make_unique<std::mt19937>(GetRandomGeneratorSeed());
   return mt.get();
 }
-#endif
 }  // namespace random
 
 namespace util {

src/util.h

@@ -32,10 +32,6 @@
 #include "sentencepiece_processor.h"
 #include "third_party/absl/strings/string_view.h"
 
-#ifdef SPM_NO_THREADLOCAL
-#include <pthread.h>
-#endif
-
 namespace sentencepiece {
 template <typename T>
 std::ostream &operator<<(std::ostream &out, const std::vector<T> &v) {
@@ -314,7 +310,8 @@ class ReservoirSampler {
  public:
   explicit ReservoirSampler(std::vector<T> *sampled, uint64_t size)
       : sampled_(sampled), size_(size), engine_(GetRandomGeneratorSeed()) {}
-  explicit ReservoirSampler(std::vector<T> *sampled, uint64_t size, uint64_t seed)
+  explicit ReservoirSampler(std::vector<T> *sampled, uint64_t size,
+                            uint64_t seed)
       : sampled_(sampled), size_(size), engine_(seed) {}
   virtual ~ReservoirSampler() {}