Kill Type.storage. (#15075)
Summary:
It's not used.
Pull Request resolved: https://github.com/pytorch/pytorch/pull/15075
Reviewed By: ezyang
Differential Revision: D13422487
Pulled By: gchanan
fbshipit-source-id: 272aa0a10e96f3ffb97d571490b517f972b9dcf7
diff --git a/aten/src/ATen/UndefinedType.cpp b/aten/src/ATen/UndefinedType.cpp
index d6d0e85..6c2b452 100644
--- a/aten/src/ATen/UndefinedType.cpp
+++ b/aten/src/ATen/UndefinedType.cpp
@@ -23,12 +23,6 @@
AT_ERROR("getDeviceFromPtr not defined for UndefinedType");
}
-Storage UndefinedType::storage(bool resizable) const {
- AT_ERROR("storage not defined for UndefinedType");
-}
-Storage UndefinedType::storage(size_t size, bool resizable) const {
- AT_ERROR("storage(size_t) not defined for UndefinedType");
-}
Storage UndefinedType::storageFromBlob(void * data, int64_t size, const std::function<void(void*)> & deleter) const {
AT_ERROR("storageFromBlob not defined for UndefinedType");
}
diff --git a/aten/src/ATen/UndefinedType.h b/aten/src/ATen/UndefinedType.h
index 9bdb85d..44c3af4 100644
--- a/aten/src/ATen/UndefinedType.h
+++ b/aten/src/ATen/UndefinedType.h
@@ -18,8 +18,6 @@
virtual Backend backend() const override;
virtual Allocator* allocator() const override;
virtual Device getDeviceFromPtr(void* data) const override;
- virtual Storage storage(bool resizable = false) const override;
- virtual Storage storage(size_t size, bool resizable = false) const override;
virtual Storage storageFromBlob(void * data, int64_t size, const std::function<void(void*)> & deleter) const override;
virtual Storage storageWithAllocator(int64_t size, Allocator* allocator) const override;
virtual std::unique_ptr<Generator> generator() const override;
diff --git a/aten/src/ATen/core/Type.h b/aten/src/ATen/core/Type.h
index cf6c2e3..56885dd 100644
--- a/aten/src/ATen/core/Type.h
+++ b/aten/src/ATen/core/Type.h
@@ -99,8 +99,6 @@
bool is_undefined() const noexcept { return is_undefined_; }
virtual Allocator * allocator() const = 0;
virtual Device getDeviceFromPtr(void * data) const = 0;
- virtual Storage storage(bool resizable = false) const = 0;
- virtual Storage storage(size_t size, bool resizable = false) const = 0;
virtual Storage storageFromBlob(void * data, int64_t size, const std::function<void(void*)> & deleter=noop_deleter) const = 0;
virtual Storage storageWithAllocator(int64_t size, Allocator* allocator) const = 0;
virtual std::unique_ptr<Generator> generator() const = 0;
diff --git a/aten/src/ATen/templates/Type.h b/aten/src/ATen/templates/Type.h
index c927538..614ce80 100644
--- a/aten/src/ATen/templates/Type.h
+++ b/aten/src/ATen/templates/Type.h
@@ -70,8 +70,6 @@
bool is_undefined() const noexcept { return is_undefined_; }
virtual Allocator * allocator() const = 0;
virtual Device getDeviceFromPtr(void * data) const = 0;
- virtual Storage storage(bool resizable = false) const = 0;
- virtual Storage storage(size_t size, bool resizable = false) const = 0;
virtual Storage storageFromBlob(void * data, int64_t size, const std::function<void(void*)> & deleter=noop_deleter) const = 0;
virtual Storage storageWithAllocator(int64_t size, Allocator* allocator) const = 0;
virtual std::unique_ptr<Generator> generator() const = 0;
diff --git a/aten/src/ATen/templates/TypeDefault.cpp b/aten/src/ATen/templates/TypeDefault.cpp
index 7fa816d..1f17e19 100644
--- a/aten/src/ATen/templates/TypeDefault.cpp
+++ b/aten/src/ATen/templates/TypeDefault.cpp
@@ -94,12 +94,6 @@
return at::empty({0}, options()).set_(storage, 0, sizes, strides);
}
-Storage TypeDefault::storage(bool resizable) const {
- return Storage(typeMeta(), 0, allocator(), resizable);
-}
-Storage TypeDefault::storage(size_t size, bool resizable) const {
- return Storage(typeMeta(), size, allocator(), resizable);
-}
Storage TypeDefault::storageFromBlob(void * data, int64_t size, const std::function<void(void*)> & deleter) const {
return Storage(
typeMeta(),
diff --git a/aten/src/ATen/templates/TypeDefault.h b/aten/src/ATen/templates/TypeDefault.h
index 12c12f2..f200b98 100644
--- a/aten/src/ATen/templates/TypeDefault.h
+++ b/aten/src/ATen/templates/TypeDefault.h
@@ -43,8 +43,6 @@
Tensor tensorWithAllocator(IntList sizes, Allocator* allocator) const override;
Tensor tensorWithAllocator(IntList sizes, IntList strides, Allocator* allocator) const override;
- Storage storage(bool resizable = false) const override;
- Storage storage(size_t size, bool resizable = false) const override;
Storage storageFromBlob(void * data, int64_t size, const std::function<void(void*)> & deleter) const override;
Storage storageWithAllocator(int64_t size, Allocator* allocator) const override;
Storage unsafeStorageFromTH(void * th_pointer, bool retain) const override;
diff --git a/aten/src/ATen/test/scalar_tensor_test.cpp b/aten/src/ATen/test/scalar_tensor_test.cpp
index c5b8ab1..8b8e3d5 100644
--- a/aten/src/ATen/test/scalar_tensor_test.cpp
+++ b/aten/src/ATen/test/scalar_tensor_test.cpp
@@ -187,8 +187,7 @@
// with storage
auto lhs = ones(*lhs_it, T);
auto rhs = ones(*rhs_it, T);
- auto storage = T.storage(rhs.numel(), false);
- lhs.set_(storage);
+ lhs.set_(rhs.storage());
// should not be dim 0 because an empty storage is dim 1; all other
// storages aren't scalars
ASSERT_NE(lhs.dim(), 0);
@@ -197,8 +196,7 @@
// with storage, offset, sizes, strides
auto lhs = ones(*lhs_it, T);
auto rhs = ones(*rhs_it, T);
- auto storage = T.storage(rhs.numel(), false);
- lhs.set_(storage, rhs.storage_offset(), rhs.sizes(), rhs.strides());
+ lhs.set_(rhs.storage(), rhs.storage_offset(), rhs.sizes(), rhs.strides());
require_equal_size_dim(lhs, rhs);
}
}
diff --git a/tools/autograd/templates/VariableType.h b/tools/autograd/templates/VariableType.h
index 4aa19b4..f29e6da 100644
--- a/tools/autograd/templates/VariableType.h
+++ b/tools/autograd/templates/VariableType.h
@@ -38,8 +38,6 @@
at::Backend backend() const override;
at::Allocator* allocator() const override;
at::Device getDeviceFromPtr(void * data) const override;
- Storage storage(bool resizable = false) const override;
- Storage storage(size_t size, bool resizable = false) const override;
Storage storageFromBlob(void * data, int64_t size, const std::function<void(void*)> & deleter) const override;
Storage storageWithAllocator(int64_t size, at::Allocator* allocator) const override;
std::unique_ptr<at::Generator> generator() const override;
diff --git a/torch/csrc/autograd/VariableTypeManual.cpp b/torch/csrc/autograd/VariableTypeManual.cpp
index ccec5c3..4feffc8 100644
--- a/torch/csrc/autograd/VariableTypeManual.cpp
+++ b/torch/csrc/autograd/VariableTypeManual.cpp
@@ -31,12 +31,6 @@
Device VariableType::getDeviceFromPtr(void * data) const {
return baseType->getDeviceFromPtr(data);
}
-Storage VariableType::storage(bool resizable) const {
- return baseType->storage();
-}
-Storage VariableType::storage(size_t size, bool resizable) const {
- return baseType->storage(size);
-}
Storage VariableType::storageFromBlob(void * data, int64_t size, const std::function<void(void*)> & deleter) const {
return baseType->storageFromBlob(data, size, deleter);
}
