Revert "Introduce AcceleratorAllocatorConfig as the common class (#149601)"

This reverts commit 55108074c0. Reverted https://github.com/pytorch/pytorch/pull/149601 on behalf of https://github.com/facebook-github-bot due to Diff reverted internally ([comment](https://github.com/pytorch/pytorch/pull/149601#issuecomment-3050628047))
2026-01-15 12:15:51 +00:00 · 2025-07-09 00:07:31 +00:00
parent 1b3d69b59f
commit 86251eff40
3 changed files with 0 additions and 692 deletions
--- a/c10/test/core/AllocatorConfig_test.cpp
+++ b/c10/test/core/AllocatorConfig_test.cpp
@@ -1,123 +0,0 @@
-#include <c10/core/AllocatorConfig.h>
-
-#include <gtest/gtest.h>
-
-using namespace c10::CachingAllocator;
-constexpr size_t kMB = 1024 * 1024ul;
-
-struct ExtendedAllocatorConfig {
-  static ExtendedAllocatorConfig& instance() {
-    static ExtendedAllocatorConfig instance;
-    return instance;
-  }
-
-  // Returns the device-specific option value in bytes.
-  static size_t device_specific_option() {
-    return instance().device_specific_option_;
-  }
-
-  void parseArgs(const std::string& env) {
-    // Parse device-specific options from the environment variable
-    ConfigTokenizer tokenizer(env);
-    for (size_t i = 0; i < tokenizer.size(); i++) {
-      const auto& key = tokenizer[i];
-      if (key == "device_specific_option_mb") {
-        tokenizer.checkToken(++i, ":");
-        device_specific_option_ = tokenizer.toSizeT(++i) * kMB;
-      } else {
-        i = tokenizer.skipKey(i);
-      }
-
-      if (i + 1 < tokenizer.size()) {
-        tokenizer.checkToken(++i, ",");
-      }
-    }
-  }
-
- private:
-  // Device-specific option, e.g., memory limit for a specific device.
-  std::atomic<size_t> device_specific_option_{0};
-};
-
-REGISTER_ALLOCATOR_CONFIG_PARSE_HOOK([](const std::string& env) {
-  ExtendedAllocatorConfig::instance().parseArgs(env);
-})
-
-TEST(AllocatorConfigTest, allocator_config_test) {
-  std::string env =
-      "max_split_size_mb:40,"
-      "max_non_split_rounding_mb:30,"
-      "garbage_collection_threshold:0.5,"
-      "roundup_power2_divisions:[64:8,128:2,256:4,512:2,1024:4,>:1],"
-      "expandable_segments:True,"
-      "pinned_use_background_threads:True,"
-      "device_specific_option_mb:64";
-  c10::CachingAllocator::setAllocatorSettings(env);
-  EXPECT_EQ(c10::CachingAllocator::getAllocatorSettings(), env);
-  EXPECT_EQ(AcceleratorAllocatorConfig::max_split_size(), 40 * kMB);
-  EXPECT_EQ(
-      AcceleratorAllocatorConfig::max_non_split_rounding_size(), 30 * kMB);
-  EXPECT_EQ(AcceleratorAllocatorConfig::garbage_collection_threshold(), 0.5);
-  EXPECT_EQ(AcceleratorAllocatorConfig::roundup_power2_divisions(32 * kMB), 8);
-  EXPECT_EQ(AcceleratorAllocatorConfig::roundup_power2_divisions(64 * kMB), 8);
-  EXPECT_EQ(AcceleratorAllocatorConfig::roundup_power2_divisions(128 * kMB), 2);
-  EXPECT_EQ(AcceleratorAllocatorConfig::roundup_power2_divisions(256 * kMB), 4);
-  EXPECT_EQ(AcceleratorAllocatorConfig::roundup_power2_divisions(512 * kMB), 2);
-  EXPECT_EQ(
-      AcceleratorAllocatorConfig::roundup_power2_divisions(1024 * kMB), 4);
-  EXPECT_EQ(
-      AcceleratorAllocatorConfig::roundup_power2_divisions(2048 * kMB), 1);
-  EXPECT_EQ(
-      AcceleratorAllocatorConfig::roundup_power2_divisions(4096 * kMB), 1);
-  EXPECT_EQ(
-      AcceleratorAllocatorConfig::roundup_power2_divisions(8192 * kMB), 1);
-  EXPECT_EQ(AcceleratorAllocatorConfig::use_expandable_segments(), true);
-  EXPECT_EQ(AcceleratorAllocatorConfig::pinned_use_background_threads(), true);
-  EXPECT_EQ(ExtendedAllocatorConfig::device_specific_option(), 64 * kMB);
-
-  env =
-      "max_split_size_mb:20,"
-      "max_non_split_rounding_mb:40,"
-      "garbage_collection_threshold:0.8";
-  c10::CachingAllocator::setAllocatorSettings(env);
-  EXPECT_EQ(c10::CachingAllocator::getAllocatorSettings(), env);
-  EXPECT_EQ(AcceleratorAllocatorConfig::max_split_size(), 20 * kMB);
-  EXPECT_EQ(
-      AcceleratorAllocatorConfig::max_non_split_rounding_size(), 40 * kMB);
-  EXPECT_EQ(AcceleratorAllocatorConfig::garbage_collection_threshold(), 0.8);
-
-  // roundup_power2_divisions knob array syntax
-  env = "roundup_power2_divisions:[128:8,256:16,512:1,2048:8,>:2]";
-  c10::CachingAllocator::setAllocatorSettings(env);
-  EXPECT_EQ(c10::CachingAllocator::getAllocatorSettings(), env);
-  EXPECT_EQ(AcceleratorAllocatorConfig::roundup_power2_divisions(64 * kMB), 8);
-  EXPECT_EQ(AcceleratorAllocatorConfig::roundup_power2_divisions(128 * kMB), 8);
-  EXPECT_EQ(
-      AcceleratorAllocatorConfig::roundup_power2_divisions(256 * kMB), 16);
-  EXPECT_EQ(AcceleratorAllocatorConfig::roundup_power2_divisions(512 * kMB), 1);
-  EXPECT_EQ(
-      AcceleratorAllocatorConfig::roundup_power2_divisions(1024 * kMB), 0);
-  EXPECT_EQ(
-      AcceleratorAllocatorConfig::roundup_power2_divisions(2048 * kMB), 8);
-  EXPECT_EQ(
-      AcceleratorAllocatorConfig::roundup_power2_divisions(4096 * kMB), 2);
-
-  // roundup_power2_divisions single value syntax for backward compatibility
-  env = "roundup_power2_divisions:4";
-  c10::CachingAllocator::setAllocatorSettings(env);
-  EXPECT_EQ(c10::CachingAllocator::getAllocatorSettings(), env);
-  EXPECT_EQ(AcceleratorAllocatorConfig::roundup_power2_divisions(64 * kMB), 4);
-  EXPECT_EQ(AcceleratorAllocatorConfig::roundup_power2_divisions(256 * kMB), 4);
-  EXPECT_EQ(
-      AcceleratorAllocatorConfig::roundup_power2_divisions(2048 * kMB), 4);
-
-  env = "expandable_segments:False,";
-  c10::CachingAllocator::setAllocatorSettings(env);
-  EXPECT_EQ(c10::CachingAllocator::getAllocatorSettings(), env);
-  EXPECT_EQ(AcceleratorAllocatorConfig::use_expandable_segments(), false);
-
-  env = "pinned_use_background_threads:False";
-  c10::CachingAllocator::setAllocatorSettings(env);
-  EXPECT_EQ(c10::CachingAllocator::getAllocatorSettings(), env);
-  EXPECT_EQ(AcceleratorAllocatorConfig::pinned_use_background_threads(), false);
-}