fix cherry-pick for 2.7

Author: jeffdaily

aten/src/ATen/hip/impl/HIPAllocatorMasqueradingAsCUDA.h

@@ -67,8 +67,8 @@ class HIPAllocatorMasqueradingAsCUDA final : public HIPCachingAllocator::HIPAllo
     allocator_->setMemoryFraction(fraction, device);
   }
 
-  void emptyCache(MempoolId_t mempool_id = {0, 0}) override {
-    allocator_->emptyCache(mempool_id);
+  void emptyCache() override {
+    allocator_->emptyCache();
   }
 
   void enable(bool value) override {
@@ -103,8 +103,8 @@ class HIPAllocatorMasqueradingAsCUDA final : public HIPCachingAllocator::HIPAllo
     allocator_->resetPeakStats(device);
   }
 
-  HIPCachingAllocator::SnapshotInfo snapshot(MempoolId_t mempool_id = {0, 0}) override {
-    return allocator_->snapshot(mempool_id);
+  HIPCachingAllocator::SnapshotInfo snapshot() override {
+    return allocator_->snapshot();
   }
 
   void beginAllocateToPool(
@@ -128,15 +128,10 @@ class HIPAllocatorMasqueradingAsCUDA final : public HIPCachingAllocator::HIPAllo
     return allocator_->getPoolUseCount(device, mempool_id);
   }
 
-  void createOrIncrefPool(
+  void ensureExistsAndIncrefPool(
       c10::DeviceIndex device,
-      MempoolId_t mempool_id,
-      HIPAllocator* allocator = nullptr) override {
-    allocator_->createOrIncrefPool(device, mempool_id, allocator);
-  }
-
-  void setUseOnOOM(c10::DeviceIndex device, MempoolId_t mempool_id) override {
-    allocator_->setUseOnOOM(device, mempool_id);
+      MempoolId_t mempool_id) override {
+    allocator_->ensureExistsAndIncrefPool(device, mempool_id);
   }
 
   bool checkPoolLiveAllocations(
@@ -162,24 +157,15 @@ class HIPAllocatorMasqueradingAsCUDA final : public HIPCachingAllocator::HIPAllo
       bool enabled,
       HIPCachingAllocator::CreateContextFn context_recorder,
       size_t alloc_trace_max_entries,
-      HIPCachingAllocator::RecordContext when,
-      bool clearHistory) override {
-    allocator_->recordHistory(enabled, context_recorder, alloc_trace_max_entries, when, clearHistory);
+      HIPCachingAllocator::RecordContext when) override {
+    allocator_->recordHistory(enabled, context_recorder, alloc_trace_max_entries, when);
   }
 
   void recordAnnotation(
       const std::vector<std::pair<std::string, std::string>>& md) override {
     allocator_->recordAnnotation(md);
   }
 
-  void pushCompileContext(std::string& md) override {
-    allocator_->pushCompileContext(md);
-  }
-
-  void popCompileContext() override {
-    allocator_->popCompileContext();
-  }
-
   void attachOutOfMemoryObserver(HIPCachingAllocator::OutOfMemoryObserver observer) override {
     allocator_->attachOutOfMemoryObserver(observer);
   }

aten/src/ATen/hip/impl/HIPCachingAllocatorMasqueradingAsCUDA.h

@@ -37,8 +37,8 @@ inline void setMemoryFraction(double fraction, c10::DeviceIndex device) {
   return get()->setMemoryFraction(fraction, device);
 }
 
-inline void emptyCache(MempoolId_t mempool_id = {0, 0}) {
-  return get()->emptyCache(mempool_id);
+inline void emptyCache() {
+  return get()->emptyCache();
 }
 
 inline void enable(bool value) {
@@ -70,8 +70,8 @@ inline void resetPeakStats(c10::DeviceIndex device) {
   return get()->resetPeakStats(device);
 }
 
-inline HIPCachingAllocator::SnapshotInfo snapshot(MempoolId_t mempool_id = {0, 0}) {
-  return get()->snapshot(mempool_id);
+inline HIPCachingAllocator::SnapshotInfo snapshot() {
+  return get()->snapshot();
 }
 
 inline std::shared_ptr<HIPCachingAllocator::AllocatorState> getCheckpointState(
@@ -101,25 +101,16 @@ inline void recordHistory(
     bool enabled,
     HIPCachingAllocator::CreateContextFn context_recorder,
     size_t alloc_trace_max_entries,
-    HIPCachingAllocator::RecordContext when,
-    bool clearHistory) {
+    HIPCachingAllocator::RecordContext when) {
   return get()->recordHistory(
-      enabled, context_recorder, alloc_trace_max_entries, when, clearHistory);
+      enabled, context_recorder, alloc_trace_max_entries, when);
 }
 
 inline void recordAnnotation(
     const std::vector<std::pair<std::string, std::string>>& md) {
   return get()->recordAnnotation(md);
 }
 
-inline void pushCompileContext(std::string& md) {
-  return get()->pushCompileContext(md);
-}
-
-inline void popCompileContext() {
-  return get()->popCompileContext();
-}
-
 inline bool isHistoryEnabled() {
   return get()->isHistoryEnabled();
 }
@@ -144,15 +135,10 @@ inline void releasePool(c10::DeviceIndex device, MempoolId_t mempool_id) {
   return get()->releasePool(device, mempool_id);
 }
 
-inline void createOrIncrefPool(
+inline void ensureExistsAndIncrefPool(
     c10::DeviceIndex device,
-    MempoolId_t mempool_id,
-    HIPCachingAllocator::HIPAllocator* allocator_ptr = nullptr) {
-  get()->createOrIncrefPool(device, mempool_id, allocator_ptr);
-}
-
-inline void setUseOnOOM(c10::DeviceIndex device, MempoolId_t mempool_id) {
-  get()->setUseOnOOM(device, mempool_id);
+    MempoolId_t mempool_id) {
+  get()->ensureExistsAndIncrefPool(device, mempool_id);
 }
 
 inline int getPoolUseCount(c10::DeviceIndex device, MempoolId_t mempool_id) {