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

Simplified the addition of devices.

Browse Source 
Change: 137964954
This commit is contained in:
Benoit Steiner 2016-11-02 09:49:12 -08:00 committed by TensorFlower Gardener
parent 064c3bbc38
commit c794ba78a5
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tensorflow/core/common_runtime/device_factory.cc
View File

@ -78,7 +78,7 @@ DeviceFactory* DeviceFactory::GetFactory(const string& device_type) {
Status DeviceFactory::AddDevices(const SessionOptions& options,
const string& name_prefix,
std::vector<Device*>* devices) {
// CPU first.
// CPU first. A CPU device is required.
auto cpu_factory = GetFactory("CPU");
if (!cpu_factory) {
return errors::NotFound(
@ -90,18 +90,11 @@ Status DeviceFactory::AddDevices(const SessionOptions& options,
return errors::NotFound("No CPU devices are available in this process");
}
// Then GPU.
auto gpu_factory = GetFactory("GPU");
if (gpu_factory) {
TF_RETURN_IF_ERROR(
gpu_factory->CreateDevices(options, name_prefix, devices));
}
// Then the rest.
// Then the rest (including GPU).
mutex_lock l(*get_device_factory_lock());
for (auto& p : device_factories()) {
auto factory = p.second.factory.get();
if (factory != cpu_factory && factory != gpu_factory) {
if (factory != cpu_factory) {
TF_RETURN_IF_ERROR(factory->CreateDevices(options, name_prefix, devices));
}
}