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

Change gpu_device_test to cope with CUDA stream priority supporting [-2,0] in CUDA 8 instead of [-1,0] before.

Browse Source 
PiperOrigin-RevId: 317684869
Change-Id: Ib741cd1015f64358d323dda761250c990ce4ca41
This commit is contained in:
Christian Sigg 2020-06-22 10:38:48 -07:00 committed by TensorFlower Gardener
parent 809e482247
commit f5eb8a40e9
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tensorflow/core/common_runtime/gpu/gpu_device_test.cc
View File

@ -234,9 +234,9 @@ TEST_F(GPUDeviceTest, SingleVirtualDeviceWithInvalidPriority) {
SessionOptions opts = SessionOptions opts =
MakeSessionOptions("0", 0, 1, {{123, 456}}, {{-1, 2}}); MakeSessionOptions("0", 0, 1, {{123, 456}}, {{-1, 2}});
#else #else
// Priority outside the range (-1, 0) for NVidia GPUs // Priority outside the range (-2, 0) for NVidia GPUs
SessionOptions opts = SessionOptions opts =
MakeSessionOptions("0", 0, 1, {{123, 456}}, {{-2, 0}}); MakeSessionOptions("0", 0, 1, {{123, 456}}, {{-3, 0}});
#endif #endif
std::vector<std::unique_ptr<Device>> devices; std::vector<std::unique_ptr<Device>> devices;
Status status = DeviceFactory::GetFactory("GPU")->CreateDevices( Status status = DeviceFactory::GetFactory("GPU")->CreateDevices(
@ -249,9 +249,7 @@ TEST_F(GPUDeviceTest, SingleVirtualDeviceWithInvalidPriority) {
" virtual device 0 on GPU# 0"); " virtual device 0 on GPU# 0");
#else #else
ExpectErrorMessageSubstr( ExpectErrorMessageSubstr(
status, status, "Priority -3 is outside the range of supported priorities");
"Priority -2 is outside the range of supported priorities [-1,0] for"
" virtual device 0 on GPU# 0");
#endif #endif
} }
{ {
@ -259,7 +257,7 @@ TEST_F(GPUDeviceTest, SingleVirtualDeviceWithInvalidPriority) {
// Priority outside the range (0, 2) for AMD GPUs // Priority outside the range (0, 2) for AMD GPUs
SessionOptions opts = MakeSessionOptions("0", 0, 1, {{123, 456}}, {{0, 3}}); SessionOptions opts = MakeSessionOptions("0", 0, 1, {{123, 456}}, {{0, 3}});
#else #else
// Priority outside the range (-1, 0) for NVidia GPUs // Priority outside the range (-2, 0) for NVidia GPUs
SessionOptions opts = MakeSessionOptions("0", 0, 1, {{123, 456}}, {{0, 1}}); SessionOptions opts = MakeSessionOptions("0", 0, 1, {{123, 456}}, {{0, 1}});
#endif #endif
std::vector<std::unique_ptr<Device>> devices; std::vector<std::unique_ptr<Device>> devices;
@ -273,9 +271,7 @@ TEST_F(GPUDeviceTest, SingleVirtualDeviceWithInvalidPriority) {
" virtual device 0 on GPU# 0"); " virtual device 0 on GPU# 0");
#else #else
ExpectErrorMessageSubstr( ExpectErrorMessageSubstr(
status, status, "Priority 1 is outside the range of supported priorities");
"Priority 1 is outside the range of supported priorities [-1,0] for"
" virtual device 0 on GPU# 0");
#endif #endif
} }
} }
@ -296,7 +292,7 @@ TEST_F(GPUDeviceTest, MultipleVirtualDevices) {
// Valid range for priority values on AMD GPUs in (0,2) // Valid range for priority values on AMD GPUs in (0,2)
SessionOptions opts = MakeSessionOptions("0", 0, 1, {{123, 456}}, {{0, 1}}); SessionOptions opts = MakeSessionOptions("0", 0, 1, {{123, 456}}, {{0, 1}});
#else #else
// Valid range for priority values on NVidia GPUs in (-1, 0) // Valid range for priority values on NVidia GPUs in (-2, 0)
SessionOptions opts = MakeSessionOptions("0", 0, 1, {{123, 456}}, {{0, -1}}); SessionOptions opts = MakeSessionOptions("0", 0, 1, {{123, 456}}, {{0, -1}});
#endif #endif
std::vector<std::unique_ptr<Device>> devices; std::vector<std::unique_ptr<Device>> devices;
@ -347,7 +343,7 @@ TEST_F(GPUDeviceTest, MultipleVirtualDevicesWithPriority) {
// Valid range for priority values on AMD GPUs in (0,2) // Valid range for priority values on AMD GPUs in (0,2)
SessionOptions opts = MakeSessionOptions("0", 0, 1, {{123, 456}}, {{2, 1}}); SessionOptions opts = MakeSessionOptions("0", 0, 1, {{123, 456}}, {{2, 1}});
#else #else
// Valid range for priority values on NVidia GPUs in (-1, 0) // Valid range for priority values on NVidia GPUs in (-2, 0)
SessionOptions opts = SessionOptions opts =
MakeSessionOptions("0", 0, 1, {{123, 456}}, {{-1, 0}}); MakeSessionOptions("0", 0, 1, {{123, 456}}, {{-1, 0}});
#endif #endif