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

Allow partially-specified resource edge colocation as long as device specifications don't have information which conflicts

Browse Source 
Mainly I'm targeting the resource edge checking in core/common_runtime/colocation_graph.cc

PiperOrigin-RevId: 288938069
Change-Id: I448e967d043d4e267e394051bf609d835f9dde0c
This commit is contained in:
Allen Lavoie 2020-01-09 11:34:14 -08:00 committed by TensorFlower Gardener
parent 10b22bf930
commit 62bc37e41e
3 changed files with 37 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tensorflow/core/util/device_name_utils.cc
View File

@ -279,6 +279,27 @@ bool DeviceNameUtils::IsSpecification(const ParsedName& less_specific,
return true;
}
/* static */
bool DeviceNameUtils::AreCompatibleDevNames(const ParsedName& a,
const ParsedName& b) {
if (a.has_job && b.has_job && (a.job != b.job)) {
return false;
}
if (a.has_replica && b.has_replica && (a.replica != b.replica)) {
return false;
}
if (a.has_task && b.has_task && (a.task != b.task)) {
return false;
}
if (a.has_type && b.has_type && (a.type != b.type)) {
return false;
}
if (a.has_id && b.has_id && (a.id != b.id)) {
return false;
}
return true;
}
void DeviceNameUtils::EnsureSpecification(ParsedName* more_specific,
const ParsedName& less_specific) {
if (less_specific.has_job) {

9
tensorflow/core/util/device_name_utils.h
View File

@ -128,12 +128,9 @@ class DeviceNameUtils {
static bool IsCompleteSpecification(const ParsedName& pattern,
const ParsedName& name);
// True iff there exists any possible complete device name that is
// a specification of both "a" and "b".
static inline bool AreCompatibleDevNames(const ParsedName& a,
const ParsedName& b) {
return IsSpecification(a, b) || IsSpecification(b, a);
}
// True iff there exists any possible device name that is a specification of
// both "a" and "b".
static bool AreCompatibleDevNames(const ParsedName& a, const ParsedName& b);
// Merges the device specifications in "*target" and "other", and
// stores the result in "*target". Returns OK if "*target" and

13
tensorflow/core/util/device_name_utils_test.cc
View File

@ -277,6 +277,19 @@ TEST(DeviceNameUtilsTest, Basic) {
/*explicitDevice=*/true));
}
}
{
DeviceNameUtils::ParsedName x, y;
DeviceNameUtils::ParseFullName("/job:work/replica:1/task:3/device:GPU:*",
&x);
DeviceNameUtils::ParseFullName("/device:CPU:*", &y);
EXPECT_FALSE(DeviceNameUtils::AreCompatibleDevNames(x, y));
}
{
DeviceNameUtils::ParsedName x, y;
DeviceNameUtils::ParseFullName("/job:work/replica:1/task:3", &x);
DeviceNameUtils::ParseFullName("/device:CPU:*", &y);
EXPECT_TRUE(DeviceNameUtils::AreCompatibleDevNames(x, y));
}
}
static bool IsCSHelper(StringPiece pattern, StringPiece actual) {