From 307fd6d28c3296d5a2ef37c63eb09526efc63af4 Mon Sep 17 00:00:00 2001
From: Deven Desai <deven.desai.amd@gmail.com>
Date: Sun, 19 Jan 2020 02:38:16 +0000
Subject: [PATCH] [ROCm] Fix for compile error in
 //tensorflow/compiler/xla:debug_options_parsers_test

On the ROCm platform, we currently get the following compile failure for the test
`tensorflow/compiler/xla/debug_options_parsers_test`

```
...
external/com_google_googletest/googletest/include/gtest/internal/gtest-port.h:881:23: note:   'testing::internal::string'
 typedef ::std::string string;
                       ^
tensorflow/compiler/xla/debug_options_parsers_test.cc:29:33: error: 'test_map' was not declared in this scope
   unordered_map<string, string> test_map;
                                 ^
tensorflow/compiler/xla/debug_options_parsers_test.cc:30:10: error: expected ';' before 'test_string'
   string test_string = "aa=bb,cc,dd=,ee=ff=gg";
...

```

This fix resolves the compile error, and gets the test passing again on the ROCm platform

On the ROCm platform, this test is compiled via the following gcc compiler

```
root@ixt-rack-04:/root/tensorflow# gcc --version
gcc (Ubuntu 5.4.0-6ubuntu1~16.04.12) 5.4.0 20160609
```

The crosstool setup / compile invocation on the ROCm platform is done via
 * https://github.com/tensorflow/tensorflow/blob/master/third_party/gpus/rocm_configure.bzl
 * https://github.com/tensorflow/tensorflow/blob/master/third_party/gpus/crosstool/clang/bin/crosstool_wrapper_driver_rocm.tpl
---
 tensorflow/compiler/xla/debug_options_parsers_test.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tensorflow/compiler/xla/debug_options_parsers_test.cc b/tensorflow/compiler/xla/debug_options_parsers_test.cc
index 5239f902ff7..3db2b0564fd 100644
--- a/tensorflow/compiler/xla/debug_options_parsers_test.cc
+++ b/tensorflow/compiler/xla/debug_options_parsers_test.cc
@@ -26,8 +26,8 @@ namespace xla {
 
 // Test that the xla_backend_extra_options flag is parsed correctly.
 TEST(DebugOptionsFlags, ParseXlaBackendExtraOptions) {
-  std::unordered_map<string, string> test_map;
-  string test_string = "aa=bb,cc,dd=,ee=ff=gg";
+  std::unordered_map<std::string, std::string> test_map;
+  std::string test_string = "aa=bb,cc,dd=,ee=ff=gg";
   parse_xla_backend_extra_options(&test_map, test_string);
   EXPECT_EQ(test_map.size(), 4);
   EXPECT_EQ(test_map.at("aa"), "bb");