Merge remote-tracking branch 'upstream/master' and changes

based on PR review comments.

1 files changed, 4 insertions, 6 deletions

diff --git a/third_party/ngraph/build_defs.bzl b/third_party/ngraph/build_defs.bzl
index 2c9027a6b8..8ad7515aed 100644
--- a/third_party/ngraph/build_defs.bzl
+++ b/third_party/ngraph/build_defs.bzl
@@ -1,16 +1,14 @@
 def clean_dep(dep):
   return str(Label(dep))
 
-def if_ngraph(a):
+def if_ngraph(if_true, if_false = []):
     """Shorthand for select()'ing on whether we're building with nGraph support.
 
     Returns a select statement which evaluates to if_true if we're building
     with nGraph.  Otherwise, the select statement evaluates to default.
 
     """
-    ret_val = select({
-        clean_dep("//tensorflow:with_ngraph_support"): a,
-        "//conditions:default": []
+    return select({
+        clean_dep("//tensorflow:with_ngraph_support"): if_true,
+        "//conditions:default": if_false
     })
-
-    return ret_val