Skip to content

Commit 4ee0437

Browse files
swolchokfacebook-github-bot
authored andcommitted
Remove TensorPtr::get() (#5687)
Summary: Pull Request resolved: #5687 Intermediate step before shrinking TensorPtr to 16 bytes instead of the current 24. ghstack-source-id: 244967821 exported-using-ghexport Reviewed By: shoumikhin Differential Revision: D63470105 fbshipit-source-id: fef01abec8f206ecd535bf0b55d2abaf69db02c0
1 parent 53936dc commit 4ee0437

File tree

3 files changed

+4
-12
lines changed

3 files changed

+4
-12
lines changed

extension/tensor/tensor_ptr.h

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,13 @@ class TensorPtr {
3636
return static_cast<bool>(tensor_impl_);
3737
}
3838

39-
exec_aten::Tensor* get() const {
40-
return tensor_impl_ ? &tensor_ : nullptr;
41-
}
42-
4339
exec_aten::Tensor* operator->() const {
44-
return get();
40+
return tensor_impl_ ? &tensor_ : nullptr;
4541
}
4642

4743
exec_aten::Tensor& operator*() const {
4844
ET_DCHECK(*this != nullptr);
49-
return *get();
45+
return *operator->();
5046
}
5147

5248
void reset() {

extension/tensor/test/tensor_ptr_test.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,21 +26,17 @@ TEST_F(TensorPtrTest, BasicSmartPointerAccess) {
2626
TensorPtr p;
2727
EXPECT_FALSE(p);
2828
EXPECT_EQ(p, nullptr);
29-
EXPECT_EQ(p.get(), nullptr);
3029
EXPECT_EQ(p.operator->(), nullptr);
3130
TensorPtr p2 = make_tensor_ptr({1}, nullptr, {}, {});
3231
EXPECT_TRUE(p2);
3332
EXPECT_NE(p2, nullptr);
34-
ASSERT_NE(p2.get(), nullptr);
3533
ASSERT_NE(p2.operator->(), nullptr);
36-
EXPECT_EQ(p2.get(), p2.operator->());
3734
EXPECT_EQ(p2->dim(), 1);
3835
EXPECT_EQ((*p2).dim(), 1);
3936
EXPECT_NE(p, p2);
4037
p2.reset();
4138
EXPECT_FALSE(p2);
4239
EXPECT_EQ(p2, nullptr);
43-
EXPECT_EQ(p2.get(), nullptr);
4440
EXPECT_EQ(p2.operator->(), nullptr);
4541
EXPECT_EQ(p, p2);
4642
}

extension/training/examples/XOR/train.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ int main(int argc, char** argv) {
8686
for (int i = 0; i < num_epochs; i++) {
8787
int index = dist(URBG);
8888
auto& data = data_set[index];
89-
const auto& results = mod.execute_forward_backward(
90-
"forward", {*data.first.get(), *data.second.get()});
89+
const auto& results =
90+
mod.execute_forward_backward("forward", {*data.first, *data.second});
9191
if (results.error() != Error::Ok) {
9292
ET_LOG(Error, "Failed to execute forward_backward");
9393
return 1;

0 commit comments

Comments
 (0)