experiments/STT-tensorflow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix calling Literal member functions.

Browse Source
This commit is contained in:
Yifei Feng 2017-06-21 16:08:22 -07:00
parent 15a8df724a
commit e89f04d801
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tensorflow/compiler/plugin/executor/executable.cc
View File

@ -36,7 +36,7 @@ static se::DeviceMemoryBase AllocateSingleOutput(sep::ExecutorExecutor* executor
const Literal& literal) { const Literal& literal) {
int64 size(xla::ShapeUtil::ByteSizeOf(literal.shape())); int64 size(xla::ShapeUtil::ByteSizeOf(literal.shape()));
void* buf = executor->Allocate(size); void* buf = executor->Allocate(size);
const void* src = Literal::InternalData(literal); const void* src = literal.InternalData();
memcpy(buf, src, size); memcpy(buf, src, size);
return se::DeviceMemoryBase(buf, size); return se::DeviceMemoryBase(buf, size);
} }
@ -90,7 +90,7 @@ StatusOr<se::DeviceMemoryBase> ExecutorExecutable::ExecuteOnStream(
arg_literals_ptrs.push_back(arg_literals.back().get()); arg_literals_ptrs.push_back(arg_literals.back().get());
// Copy in the data from the stream_executor buffers // Copy in the data from the stream_executor buffers
void* buffer = Literal::MutableInternalData(arg_literals.back().get()); void* buffer = arg_literals.back().get()->MutableInternalData();
memcpy(buffer, arguments[p].opaque(), memcpy(buffer, arguments[p].opaque(),
ShapeUtil::ByteSizeOf(param->shape())); ShapeUtil::ByteSizeOf(param->shape()));
} }

8
tensorflow/compiler/plugin/executor/transfer_manager.cc
View File

@ -70,13 +70,13 @@ Status ExecutorTransferManager::TransferLiteralFromDevice(
} }
*literal->mutable_shape() = device_shape; *literal->mutable_shape() = device_shape;
Literal::Reserve(ShapeUtil::ElementsIn(device_shape), literal); literal->Reserve(ShapeUtil::ElementsIn(device_shape));
TF_RETURN_IF_ERROR(TransferBufferFromDevice( TF_RETURN_IF_ERROR(TransferBufferFromDevice(
executor, source, ShapeUtil::ByteSizeOf(device_shape), executor, source, ShapeUtil::ByteSizeOf(device_shape),
Literal::MutableInternalData(literal))); literal->MutableInternalData()));
if (!ShapeUtil::Equal(literal_shape, device_shape)) { if (!ShapeUtil::Equal(literal_shape, device_shape)) {
literal->Swap( literal->Swap(
Literal::Relayout(*literal, literal_shape.layout()).get()); literal->Relayout(literal_shape.layout()).get());
} }
TF_RET_CHECK(ShapeUtil::Equal(literal_shape, literal->shape())); TF_RET_CHECK(ShapeUtil::Equal(literal_shape, literal->shape()));
return Status::OK(); return Status::OK();
@ -134,7 +134,7 @@ Status ExecutorTransferManager::TransferLiteralToDevice(
} }
return TransferBufferToDevice(executor, GetByteSizeRequirement(shape), return TransferBufferToDevice(executor, GetByteSizeRequirement(shape),
Literal::InternalData(literal), literal.InternalData(),
destination); destination);
} }