Revert "Move CreateContext to global registry (#11688)" (#12049)

Summary:
This reverts commit 3ae6ee4ebded136da30aa53fd3873d84acfbc9f0.
Pull Request resolved: https://github.com/pytorch/pytorch/pull/12049

Differential Revision: D10030954

Pulled By: ezyang

fbshipit-source-id: 6ca9de65b707c5b4c68280fc6f1b8e5ad7251efc

1 files changed, 1 insertions, 31 deletions

diff --git a/caffe2/proto/caffe2_pb.h b/caffe2/proto/caffe2_pb.h
index a0d455d451..0a08c8db24 100644
--- a/caffe2/proto/caffe2_pb.h
+++ b/caffe2/proto/caffe2_pb.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <ATen/core/Device.h>
+#include <ATen/core/DeviceType.h>
 #include <ATen/core/Error.h>
 #include <caffe2/proto/caffe2.pb.h>
 
@@ -47,10 +47,6 @@ inline CAFFE2_API DeviceType ProtoToType(const caffe2::DeviceTypeProto p) {
   }
 }
 
-inline CAFFE2_API DeviceType ProtoToType(int p) {
-  return ProtoToType(static_cast<caffe2::DeviceTypeProto>(p));
-}
-
 inline CAFFE2_API DeviceTypeProto TypeToProto(const DeviceType& t) {
   switch (t) {
     case DeviceType::CPU:
@@ -81,30 +77,4 @@ inline CAFFE2_API DeviceTypeProto TypeToProto(const DeviceType& t) {
   }
 }
 
-inline CAFFE2_API caffe2::DeviceOption DeviceToOption(
-    const at::Device& device) {
-  caffe2::DeviceOption option;
-  auto type = device.type();
-  option.set_device_type(TypeToProto(type));
-  // sets the gpu_id to -1 means we'll use the current gpu id when the function
-  // is being called, see context_gpu.cu for more info.
-  if (type == at::DeviceType::CUDA) {
-    option.set_cuda_gpu_id(device.index());
-  } else if (type == at::DeviceType::HIP) {
-    option.set_hip_gpu_id(device.index());
-  }
-  return option;
-}
-
-inline CAFFE2_API at::Device OptionToDevice(const caffe2::DeviceOption option) {
-  at::Device device(ProtoToType(option.device_type()));
-  auto type = device.type();
-  if (type == at::DeviceType::CUDA) {
-    device.set_index(option.cuda_gpu_id());
-  } else if (type == at::DeviceType::HIP) {
-    device.set_index(option.hip_gpu_id());
-  }
-  return device;
-}
-
 } // namespace caffe2