Hard-code libcuda version number to "1". Fixes tensorflow#2865. (tensorflow#3576)

cancan101 · Vijay Vasudevan · commit 0685152a02f1 · 2016-08-08T13:32:34.000-07:00
As per comments from nvidia-docker dev @3XX0, hardcoding "1" should be reasonably safe. The TF_CUDA_VERSION variable from the configure script is not appropriate here (it will contain something like "7.0" or "7.5", while the libcuda soname major version number should be "1").
diff --git a/tensorflow/stream_executor/dso_loader.cc b/tensorflow/stream_executor/dso_loader.cc
@@ -72,7 +72,7 @@ string GetCudnnVersion() { return ""; }
 }
 
 /* static */ port::Status DsoLoader::GetLibcudaDsoHandle(void** dso_handle) {
-  return GetDsoHandle(FindDsoPath(tensorflow::internal::FormatLibraryFileName("cuda", ""),
+  return GetDsoHandle(FindDsoPath(tensorflow::internal::FormatLibraryFileName("cuda", "1"),
                                   GetCudaDriverLibraryPath()),
                       dso_handle);
 }

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ string GetCudnnVersion() { return ""; }`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`/* static / port::Status DsoLoader::GetLibcudaDsoHandle(void* dso_handle) {`
`75`		`- return GetDsoHandle(FindDsoPath(tensorflow::internal::FormatLibraryFileName("cuda", ""),`
	`75`	`+ return GetDsoHandle(FindDsoPath(tensorflow::internal::FormatLibraryFileName("cuda", "1"),`
`76`	`76`	`GetCudaDriverLibraryPath()),`
`77`	`77`	`dso_handle);`
`78`	`78`	`}`