diff options
| author |  A. Unique TensorFlower <gardener@tensorflow.org> | 2017-01-26 15:55:26 -0800 |
|---|---|---|
| committer | TensorFlower Gardener <gardener@tensorflow.org> | 2017-01-26 16:07:43 -0800 |
| commit | 8845387fc6e8eb476bb42e620bd86b263bda41b9 (patch) | |
| tree | d5965c77f78b64f521489a7b5fd1df939b88affa /tensorflow/stream_executor/dso_loader.h | |
| parent | b80fce2f901ac393cd7edcbe484221c95ff5ba90 (diff) | |
Change the way the host platform stream blocks so that it is usable with a condition variable implementation that doesn't support waiting with a predicate.
Remove unnecessary ToString calls in cuda_gpu_executor.cc.
Minor tweaks to header inclusions which should have no effect on code behavior.
Change: 145732882
Diffstat (limited to 'tensorflow/stream_executor/dso_loader.h')
| -rw-r--r-- | tensorflow/stream_executor/dso_loader.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tensorflow/stream_executor/dso_loader.h b/tensorflow/stream_executor/dso_loader.h index 0c83bb2504..9495f7253a 100644 --- a/tensorflow/stream_executor/dso_loader.h +++ b/tensorflow/stream_executor/dso_loader.h @@ -22,13 +22,15 @@ limitations under the License. #include "tensorflow/stream_executor/platform/port.h" #include <vector> -#include "cuda/cuda_config.h" #include "tensorflow/stream_executor/lib/status.h" #include "tensorflow/stream_executor/lib/statusor.h" #include "tensorflow/stream_executor/lib/stringpiece.h" #include "tensorflow/stream_executor/platform.h" #include "tensorflow/stream_executor/platform/mutex.h" -#include "tensorflow/stream_executor/platform/port.h" + +#if !defined(PLATFORM_GOOGLE) +#include "cuda/cuda_config.h" +#endif namespace perftools { namespace gputools { |