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

Fix mac build

Browse Source 
clone from meheff's change:
[XLA] Change return type of DeviceAssignment::Deserialize to fix build
breakage on mac.
The mac build had the following error:

error: incomplete type 'xla::DeviceAssignment' used in type trait
expression

This was due to a static method returning a StatusOr<DeviceAssignment>
inside of the definition of DeviceAssignment.
This commit is contained in:
Yifei Feng 2017-06-21 13:22:28 -07:00
parent a54d43fa40
commit 15a8df724a
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tensorflow/compiler/xla/service/computation_placer.cc
View File

@ -49,17 +49,18 @@ Status DeviceAssignment::Serialize(DeviceAssignmentProto* proto) const {
return Status::OK(); return Status::OK();
} }
/* static */ StatusOr<DeviceAssignment> DeviceAssignment::Deserialize( /* static */ StatusOr<std::unique_ptr<DeviceAssignment>>
const DeviceAssignmentProto& proto) { DeviceAssignment::Deserialize(const DeviceAssignmentProto& proto) {
TF_RET_CHECK(proto.computation_devices_size() == proto.computation_count()); TF_RET_CHECK(proto.computation_devices_size() == proto.computation_count());
DeviceAssignment assignment(proto.replica_count(), proto.computation_count()); auto assignment = MakeUnique<DeviceAssignment>(proto.replica_count(),
proto.computation_count());
for (int computation = 0; computation < proto.computation_count(); for (int computation = 0; computation < proto.computation_count();
++computation) { ++computation) {
const auto& computation_device = proto.computation_devices(computation); const auto& computation_device = proto.computation_devices(computation);
TF_RET_CHECK(computation_device.replica_device_ids_size() == TF_RET_CHECK(computation_device.replica_device_ids_size() ==
proto.replica_count()); proto.replica_count());
for (int replica = 0; replica < proto.replica_count(); ++replica) { for (int replica = 0; replica < proto.replica_count(); ++replica) {
assignment(replica, computation) = (*assignment)(replica, computation) =
computation_device.replica_device_ids(replica); computation_device.replica_device_ids(replica);
} }
} }

6
tensorflow/compiler/xla/service/computation_placer.h
View File

@ -49,7 +49,11 @@ class DeviceAssignment : public Array2D<int> {
// Protocol buffer serialization and deserialization. // Protocol buffer serialization and deserialization.
Status Serialize(DeviceAssignmentProto* proto) const; Status Serialize(DeviceAssignmentProto* proto) const;
static StatusOr<DeviceAssignment> Deserialize(
// Return a std::unique_ptr<DeviceAssignment> instead of a DeviceAssignment
// directly because one of the supported TF platforms (mac) does not compile
// due to a StatusOr of an incomplete type (DeviceAssignment).
static StatusOr<std::unique_ptr<DeviceAssignment>> Deserialize(
const DeviceAssignmentProto& proto); const DeviceAssignmentProto& proto);
}; };