Find libdevice files in .runfiles when TEST_SRCDIR is not set.

Jingyue Wu · tensorflower-gardener · commit 667a023a417f · 2016-12-13T16:22:12.000-08:00
Before this CL, XLA GPU binaries can only be run with "blaze test". After this
CL, they can be run directly via "blaze-bin/&lt;executable&gt;".
Change: 141952101
diff --git a/tensorflow/core/platform/default/cuda_libdevice_path.cc b/tensorflow/core/platform/default/cuda_libdevice_path.cc
@@ -17,22 +17,27 @@ limitations under the License.
 
 #include <stdlib.h>
 
+#include "tensorflow/core/lib/io/path.h"
 #include "tensorflow/core/lib/strings/strcat.h"
-#include "tensorflow/core/platform/default/logging.h"
+#include "tensorflow/core/platform/env.h"
+#include "tensorflow/core/platform/logging.h"
 
 namespace tensorflow {
 
 string CudaRoot() {
   // 'bazel test' sets TEST_SRCDIR.
-  const string kRelativeCudaRoot = "local_config_cuda/cuda";
-  const char* env = getenv("TEST_SRCDIR");
-  if (env && env[0] != '\0') {
-    return strings::StrCat(env, "/", kRelativeCudaRoot);
-  } else {
-    LOG(WARNING) << "TEST_SRCDIR environment variable not set: "
-                 << "using $PWD/" << kRelativeCudaRoot << "as the CUDA root.";
-    return kRelativeCudaRoot;
+  const string kRelativeCudaRoot = io::JoinPath("local_config_cuda", "cuda");
+  const char* test_srcdir = getenv("TEST_SRCDIR");
+  if (test_srcdir && test_srcdir[0] != '\0') {
+    return io::JoinPath(test_srcdir, kRelativeCudaRoot);
   }
+
+  LOG(INFO) << "TEST_SRCDIR environment variable not set: using "
+            << kRelativeCudaRoot
+            << " under this executable's runfiles directory as the CUDA root.";
+  return io::JoinPath(
+      strings::StrCat(Env::Default()->GetExecutablePath(), ".runfiles"),
+      kRelativeCudaRoot);
 }
 
 }  // namespace tensorflow
diff --git a/tensorflow/core/platform/env.cc b/tensorflow/core/platform/env.cc
@@ -15,6 +15,15 @@ limitations under the License.
 
 #include <deque>
 #include <vector>
+#if defined(__APPLE__)
+#include <mach-o/dyld.h>
+#endif
+#if defined(PLATFORM_WINDOWS)
+#include <windows.h>
+#define PATH_MAX MAX_PATH
+#else
+#include <unistd.h>
+#endif
 
 #include "tensorflow/core/lib/core/errors.h"
 #include "tensorflow/core/lib/gtl/map_util.h"
@@ -197,6 +206,26 @@ Status Env::RenameFile(const string& src, const string& target) {
   return src_fs->RenameFile(src, target);
 }
 
+string Env::GetExecutablePath() {
+  char exe_path[PATH_MAX] = {0};
+#ifdef __APPLE__
+  uint32_t buffer_size(0U);
+  _NSGetExecutablePath(nullptr, &buffer_size);
+  char unresolved_path[buffer_size];
+  _NSGetExecutablePath(unresolved_path, &buffer_size);
+  CHECK(realpath(unresolved_path, exe_path));
+#elif defined(PLATFORM_WINDOWS)
+  HMODULE hModule = GetModuleHandle(NULL);
+  GetModuleFileName(hModule, exe_path, MAX_PATH);
+#else
+  CHECK_NE(-1, readlink("/proc/self/exe", exe_path, sizeof(exe_path) - 1));
+#endif
+  // Make sure it's null-terminated:
+  exe_path[sizeof(exe_path) - 1] = 0;
+
+  return exe_path;
+}
+
 Thread::~Thread() {}
 
 EnvWrapper::~EnvWrapper() {}
diff --git a/tensorflow/core/platform/env.h b/tensorflow/core/platform/env.h
@@ -204,6 +204,10 @@ class Env {
   /// replaced.
   Status RenameFile(const string& src, const string& target);
 
+  /// \brief Returns the absolute path of the current executable. It resolves
+  /// symlinks if there is any.
+  string GetExecutablePath();
+
   // TODO(jeff,sanjay): Add back thread/thread-pool support if needed.
   // TODO(jeff,sanjay): if needed, tighten spec so relative to epoch, or
   // provide a routine to get the absolute time.
diff --git a/tensorflow/core/platform/env_test.cc b/tensorflow/core/platform/env_test.cc
@@ -291,4 +291,9 @@ TEST_F(DefaultEnvTest, RecursivelyCreateDirWithUri) {
   TF_EXPECT_OK(env->FileExists(create_path));
 }
 
+TEST_F(DefaultEnvTest, GetExecutablePath) {
+  Env* env = Env::Default();
+  TF_EXPECT_OK(env->FileExists(env->GetExecutablePath()));
+}
+
 }  // namespace tensorflow
diff --git a/tensorflow/stream_executor/dso_loader.cc b/tensorflow/stream_executor/dso_loader.cc
@@ -19,22 +19,14 @@ limitations under the License.
 #include "tensorflow/stream_executor/dso_loader.h"
 
 #include <limits.h>
-#if defined(__APPLE__)
-#include <mach-o/dyld.h>
-#endif
 #include <stdlib.h>
-#if defined(PLATFORM_WINDOWS)
-#include <windows.h>
-#define PATH_MAX MAX_PATH
-#else
-#include <unistd.h>
-#endif
 #include <initializer_list>
 #include <vector>
 
 #include "tensorflow/core/platform/load_library.h"
 #include "tensorflow/stream_executor/lib/env.h"
 #include "tensorflow/stream_executor/lib/error.h"
+#include "tensorflow/stream_executor/lib/path.h"
 #include "tensorflow/stream_executor/lib/str_util.h"
 #include "tensorflow/stream_executor/lib/strcat.h"
 #include "tensorflow/stream_executor/lib/stringprintf.h"
@@ -130,29 +122,8 @@ string GetCudnnVersion() { return TF_CUDNN_VERSION; }
 }
 
 /* static */ string DsoLoader::GetBinaryDirectory(bool strip_executable_name) {
-  char exe_path[PATH_MAX] = {0};
-#ifdef __APPLE__
-  uint32_t buffer_size(0U);
-  _NSGetExecutablePath(nullptr, &buffer_size);
-  char unresolved_path[buffer_size];
-  _NSGetExecutablePath(unresolved_path, &buffer_size);
-  CHECK_ERR(realpath(unresolved_path, exe_path) ? 1 : -1);
-#elif defined(PLATFORM_WINDOWS)
-  HMODULE hModule = GetModuleHandle(NULL);
-  GetModuleFileName(hModule, exe_path, MAX_PATH);
-#else
-  CHECK_ERR(readlink("/proc/self/exe", exe_path, sizeof(exe_path) - 1));
-#endif
-  // Make sure it's null-terminated:
-  exe_path[sizeof(exe_path) - 1] = 0;
-
-  if (strip_executable_name) {
-    // The exe is the last component of the path, so remove one component.
-    std::vector<string> components = port::Split(exe_path, '/');
-    components.pop_back();
-    return port::Join(components, "/");
-  }
-  return exe_path;
+  string exe_path = port::Env::Default()->GetExecutablePath();
+  return strip_executable_name ? port::Dirname(exe_path).ToString() : exe_path;
 }
 
 // Creates a heap-allocated vector for initial rpaths.
diff --git a/tensorflow/stream_executor/lib/path.h b/tensorflow/stream_executor/lib/path.h
@@ -16,13 +16,16 @@ limitations under the License.
 #ifndef TENSORFLOW_STREAM_EXECUTOR_LIB_PATH_H_
 #define TENSORFLOW_STREAM_EXECUTOR_LIB_PATH_H_
 
+#include "tensorflow/core/lib/io/path.h"
 #include "tensorflow/stream_executor/lib/stringpiece.h"
 #include "tensorflow/stream_executor/platform/port.h"
 
 namespace perftools {
 namespace gputools {
 namespace port {
 
+using tensorflow::io::Dirname;
+
 namespace internal {
 // TODO(rspringer): Move to cc/implementation file.
 // Not part of the public API.

Original file line number	Diff line number	Diff line change
`@@ -291,4 +291,9 @@ TEST_F(DefaultEnvTest, RecursivelyCreateDirWithUri) {`
`291`	`291`	`TF_EXPECT_OK(env->FileExists(create_path));`
`292`	`292`	`}`
`293`	`293`
	`294`	`+TEST_F(DefaultEnvTest, GetExecutablePath) {`
	`295`	`+ Env* env = Env::Default();`
	`296`	`+ TF_EXPECT_OK(env->FileExists(env->GetExecutablePath()));`
	`297`	`+}`
	`298`	`+`
`294`	`299`	`} // namespace tensorflow`