From 94e392e5346550ba2e0c20520d2106ff49adcfb4 Mon Sep 17 00:00:00 2001 From: "A. Unique TensorFlower" Date: Fri, 13 May 2016 12:17:40 -0800 Subject: Pass --define=using_cuda_nvcc to CUDA builds. This has no practical effect, as CUDA builds are always with nvcc, but it lets us modify the build config rule //third_party/gpus/cuda:using_nvcc so it returns true, rather than false, for CUDA builds. Change: 122288952 --- third_party/gpus/cuda/BUILD | 6 ++---- tools/bazel.rc.template | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/third_party/gpus/cuda/BUILD b/third_party/gpus/cuda/BUILD index 792dbb4268..abc391f326 100644 --- a/third_party/gpus/cuda/BUILD +++ b/third_party/gpus/cuda/BUILD @@ -18,8 +18,7 @@ config_setting( config_setting( name = "using_gcudacc", values = { - "define": "using_cuda=true", - "copt": "--use_gcudacc", + "define": "using_cuda_gcudacc=true", }, visibility = ["//visibility:public"], ) @@ -27,8 +26,7 @@ config_setting( config_setting( name = "using_nvcc", values = { - "define": "using_cuda=true", - "copt": "--use_nvcc", + "define": "using_cuda_nvcc=true", }, ) diff --git a/tools/bazel.rc.template b/tools/bazel.rc.template index e90ec790fd..2a88b98f34 100644 --- a/tools/bazel.rc.template +++ b/tools/bazel.rc.template @@ -1,5 +1,5 @@ build:cuda --crosstool_top=//third_party/gpus/crosstool -build:cuda --define=using_cuda=true +build:cuda --define=using_cuda=true --define=using_cuda_nvcc=true build --force_python=py$PYTHON_MAJOR_VERSION build --python$PYTHON_MAJOR_VERSION_path=$PYTHON_BINARY -- cgit v1.2.3