Skip to content

Commit 9639285

Browse files
metascroyfacebook-github-bot
authored andcommitted
fix et-view (#2843)
Summary: et-view should always copy the data pointer. Reviewed By: JacobSzwejbka Differential Revision: D55715318
1 parent 599cfde commit 9639285

File tree

2 files changed

+4
-17
lines changed

2 files changed

+4
-17
lines changed

kernels/prim_ops/et_view.cpp

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -87,18 +87,7 @@ void et_view(RuntimeContext& context, EValue** stack) {
8787
// Do some checks
8888
ET_CHECK(self.numel() == out.numel());
8989

90-
// If out has a data_ptr, it must match self
91-
// We hit this path for memory-planned tensors
92-
if (out.const_data_ptr() != nullptr) {
93-
ET_CHECK_MSG(
94-
self.const_data_ptr() == out.const_data_ptr(),
95-
"out has a non-null data_ptr, but it does not equal self's data_ptr.");
96-
97-
// nothing else to do
98-
return;
99-
}
100-
101-
// out.const_data_ptr() == nullptr now
90+
// Update data ptr
10291
ET_CHECK_MSG(
10392
internal::set_tensor_data(
10493
out,

kernels/prim_ops/test/prim_ops_test.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -331,14 +331,13 @@ TEST_F(RegisterPrimOpsTest, TestETView) {
331331
EValue(good_outs[0]), EValue(good_outs[1])};
332332

333333
// bad outs expect death
334-
constexpr int N_BAD_OUTS = 3;
334+
constexpr int N_BAD_OUTS = 2;
335335
Tensor bad_outs[N_BAD_OUTS] = {
336336
tf.ones({1, 3, 2, 1}), // wrong rank
337-
tf.ones({1, 3, 3}), // wrong size
338-
tf.ones({1, 3, 2}) // occupied data_ptr
337+
tf.ones({1, 3, 3}) // wrong size
339338
};
340339
EValue bad_out_evalues[N_BAD_OUTS] = {
341-
EValue(bad_outs[0]), EValue(bad_outs[1]), EValue(bad_outs[2])};
340+
EValue(bad_outs[0]), EValue(bad_outs[1])};
342341

343342
// ***************************************************************************
344343
// Run tests
@@ -349,7 +348,6 @@ TEST_F(RegisterPrimOpsTest, TestETView) {
349348
// Bad out stacks
350349
{&self_evalue, &size_int_list_evalue, &bad_out_evalues[0]},
351350
{&self_evalue, &size_int_list_evalue, &bad_out_evalues[1]},
352-
{&self_evalue, &size_int_list_evalue, &bad_out_evalues[2]},
353351
// Bad size stacks
354352
{&self_evalue, &bad_size_int_list_evalue1, &good_out_evalues[0]},
355353
{&self_evalue, &bad_size_int_list_evalue2, &good_out_evalues[0]}};

0 commit comments

Comments
 (0)