Merge branch 'master' into relu3D

14 files changed, 708 insertions, 135 deletions

diff --git a/third_party/flatbuffers/build_defs.bzl b/third_party/flatbuffers/build_defs.bzl
index ba763f3360..2f25156668 100644
--- a/third_party/flatbuffers/build_defs.bzl
+++ b/third_party/flatbuffers/build_defs.bzl
@@ -1,5 +1,4 @@
-# Description:
-#   BUILD rules for generating flatbuffer files.
+"""BUILD rules for generating flatbuffer files."""
 
 flatc_path = "@flatbuffers//:flatc"
 
diff --git a/third_party/gpus/cuda/BUILD.windows.tpl b/third_party/gpus/cuda/BUILD.windows.tpl
index ff6b3cc351..325d18b9cb 100644
--- a/third_party/gpus/cuda/BUILD.windows.tpl
+++ b/third_party/gpus/cuda/BUILD.windows.tpl
@@ -142,6 +142,7 @@ cc_library(
     ],
     includes = [
         ".",
+        "cuda/",
         "cuda/extras/CUPTI/include/",
     ],
     visibility = ["//visibility:public"],
diff --git a/third_party/hadoop/hdfs.h b/third_party/hadoop/hdfs.h
index a664f3b50c..30c277a450 100644
--- a/third_party/hadoop/hdfs.h
+++ b/third_party/hadoop/hdfs.h
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
-#ifndef LIBHDFS_HDFS_H
-#define LIBHDFS_HDFS_H
+#ifndef TENSORFLOW_THIRD_PARTY_HADOOP_HDFS_H_
+#define TENSORFLOW_THIRD_PARTY_HADOOP_HDFS_H_
 
 #include <errno.h>  /* for EINTERNAL, etc. */
 #include <fcntl.h>  /* for O_RDONLY, O_WRONLY */
@@ -904,7 +904,7 @@ void hadoopRzBufferFree(hdfsFile file, struct hadoopRzBuffer *buffer);
 #endif
 
 #undef LIBHDFS_EXTERNAL
-#endif /*LIBHDFS_HDFS_H*/
+#endif  // TENSORFLOW_THIRD_PARTY_HADOOP_HDFS_H_
 
 /**
  * vim: ts=4: sw=4: et
diff --git a/third_party/kafka/BUILD b/third_party/kafka/BUILD
index 3c50b8cf52..11ec50069a 100644
--- a/third_party/kafka/BUILD
+++ b/third_party/kafka/BUILD
@@ -48,8 +48,13 @@ cc_library(
         "src/rdinterval.h",
         "src/rdkafka.c",
         "src/rdkafka.h",
+        "src/rdkafka_admin.c",
+        "src/rdkafka_admin.h",
         "src/rdkafka_assignor.c",
         "src/rdkafka_assignor.h",
+        "src/rdkafka_aux.c",
+        "src/rdkafka_aux.h",
+        "src/rdkafka_background.c",
         "src/rdkafka_broker.c",
         "src/rdkafka_broker.h",
         "src/rdkafka_buf.c",
@@ -58,6 +63,7 @@ cc_library(
         "src/rdkafka_cgrp.h",
         "src/rdkafka_conf.c",
         "src/rdkafka_conf.h",
+        "src/rdkafka_confval.h",
         "src/rdkafka_event.h",
         "src/rdkafka_feature.c",
         "src/rdkafka_feature.h",
diff --git a/third_party/mkl/build_defs.bzl b/third_party/mkl/build_defs.bzl
index 06a8c3518c..b645c0fc5c 100644
--- a/third_party/mkl/build_defs.bzl
+++ b/third_party/mkl/build_defs.bzl
@@ -11,10 +11,8 @@ mkl_repository depends on the following environment variables:
   * `TF_MKL_ROOT`: The root folder where a copy of libmkl is located.
 """
 
-
 _TF_MKL_ROOT = "TF_MKL_ROOT"
 
-
 def if_mkl(if_true, if_false = []):
     """Shorthand for select()'ing on whether we're building with MKL.
 
@@ -26,7 +24,7 @@ def if_mkl(if_true, if_false = []):
       a select evaluating to either if_true or if_false as appropriate.
     """
     return select({
-        "//third_party/mkl:using_mkl": if_true,
+        str(Label("//third_party/mkl:using_mkl")): if_true,
         "//conditions:default": if_false,
     })
 
@@ -42,11 +40,10 @@ def if_mkl_ml(if_true, if_false = []):
       a select evaluating to either if_true or if_false as appropriate.
     """
     return select({
-        "//third_party/mkl_dnn:using_mkl_dnn_only":
-        if_false,
-        "//third_party/mkl:using_mkl": if_true,
+        str(Label("//third_party/mkl_dnn:using_mkl_dnn_only")): if_false,
+        str(Label("//third_party/mkl:using_mkl")): if_true,
         "//conditions:default": if_false,
-        })
+    })
 
 def if_mkl_ml_only(if_true, if_false = []):
     """Shorthand for select()'ing on whether we're building with MKL-ML only.
@@ -59,7 +56,7 @@ def if_mkl_ml_only(if_true, if_false = []):
       a select evaluating to either if_true or if_false as appropriate.
     """
     return select({
-        "//third_party/mkl:using_mkl_ml_only": if_true,
+        str(Label("//third_party/mkl:using_mkl_ml_only")): if_true,
         "//conditions:default": if_false,
     })
 
@@ -76,7 +73,7 @@ def if_mkl_lnx_x64(if_true, if_false = []):
       a select evaluating to either if_true or if_false as appropriate.
     """
     return select({
-        "//third_party/mkl:using_mkl_lnx_x64": if_true,
+        str(Label("//third_party/mkl:using_mkl_lnx_x64")): if_true,
         "//conditions:default": if_false,
     })
 
@@ -90,45 +87,40 @@ def mkl_deps():
       inclusion in the deps attribute of rules.
     """
     return select({
-        "//third_party/mkl_dnn:using_mkl_dnn_only":
-        ["@mkl_dnn"],
-        "//third_party/mkl:using_mkl_ml_only":
-        ["//third_party/mkl:intel_binary_blob"],
-        "//third_party/mkl:using_mkl":
-        [
+        str(Label("//third_party/mkl_dnn:using_mkl_dnn_only")): ["@mkl_dnn"],
+        str(Label("//third_party/mkl:using_mkl_ml_only")): ["//third_party/mkl:intel_binary_blob"],
+        str(Label("//third_party/mkl:using_mkl")): [
             "//third_party/mkl:intel_binary_blob",
-            "@mkl_dnn"
+            "@mkl_dnn",
         ],
-        "//conditions:default": []
-        })
+        "//conditions:default": [],
+    })
 
 def _enable_local_mkl(repository_ctx):
-  return _TF_MKL_ROOT in repository_ctx.os.environ
-
+    return _TF_MKL_ROOT in repository_ctx.os.environ
 
 def _mkl_autoconf_impl(repository_ctx):
-  """Implementation of the local_mkl_autoconf repository rule."""
-
-  if _enable_local_mkl(repository_ctx):
-    # Symlink lib and include local folders.
-    mkl_root = repository_ctx.os.environ[_TF_MKL_ROOT]
-    mkl_lib_path = "%s/lib" % mkl_root
-    repository_ctx.symlink(mkl_lib_path, "lib")
-    mkl_include_path = "%s/include" % mkl_root
-    repository_ctx.symlink(mkl_include_path, "include")
-    mkl_license_path = "%s/license.txt" % mkl_root
-    repository_ctx.symlink(mkl_license_path, "license.txt")
-  else:
-    # setup remote mkl repository.
-    repository_ctx.download_and_extract(
-        repository_ctx.attr.urls,
-        sha256=repository_ctx.attr.sha256,
-        stripPrefix=repository_ctx.attr.strip_prefix,
-    )
-
-  # Also setup BUILD file.
-  repository_ctx.symlink(repository_ctx.attr.build_file, "BUILD")
-
+    """Implementation of the local_mkl_autoconf repository rule."""
+
+    if _enable_local_mkl(repository_ctx):
+        # Symlink lib and include local folders.
+        mkl_root = repository_ctx.os.environ[_TF_MKL_ROOT]
+        mkl_lib_path = "%s/lib" % mkl_root
+        repository_ctx.symlink(mkl_lib_path, "lib")
+        mkl_include_path = "%s/include" % mkl_root
+        repository_ctx.symlink(mkl_include_path, "include")
+        mkl_license_path = "%s/license.txt" % mkl_root
+        repository_ctx.symlink(mkl_license_path, "license.txt")
+    else:
+        # setup remote mkl repository.
+        repository_ctx.download_and_extract(
+            repository_ctx.attr.urls,
+            sha256 = repository_ctx.attr.sha256,
+            stripPrefix = repository_ctx.attr.strip_prefix,
+        )
+
+    # Also setup BUILD file.
+    repository_ctx.symlink(repository_ctx.attr.build_file, "BUILD")
 
 mkl_repository = repository_rule(
     implementation = _mkl_autoconf_impl,
diff --git a/third_party/ngraph/BUILD b/third_party/ngraph/BUILD
new file mode 100644
index 0000000000..067771b43f
--- /dev/null
+++ b/third_party/ngraph/BUILD
@@ -0,0 +1 @@
+licenses(["notice"])  # 3-Clause BSD
diff --git a/third_party/ngraph/LICENSE b/third_party/ngraph/LICENSE
new file mode 100644
index 0000000000..9c8f3ea087
--- /dev/null
+++ b/third_party/ngraph/LICENSE
@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
\ No newline at end of file
diff --git a/third_party/ngraph/NGRAPH_LICENSE b/third_party/ngraph/NGRAPH_LICENSE
new file mode 100644
index 0000000000..9c8f3ea087
--- /dev/null
+++ b/third_party/ngraph/NGRAPH_LICENSE
@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
\ No newline at end of file
diff --git a/third_party/ngraph/build_defs.bzl b/third_party/ngraph/build_defs.bzl
new file mode 100644
index 0000000000..3c34be524b
--- /dev/null
+++ b/third_party/ngraph/build_defs.bzl
@@ -0,0 +1,11 @@
+"""Build configurations for nGraph."""
+
+def clean_dep(dep):
+    return str(Label(dep))
+
+def if_ngraph(if_true, if_false = []):
+    """select()'ing on whether we're building with nGraph support."""
+    return select({
+        clean_dep("//tensorflow:with_ngraph_support"): if_true,
+        "//conditions:default": if_false,
+    })
diff --git a/third_party/ngraph/ngraph.BUILD b/third_party/ngraph/ngraph.BUILD
new file mode 100644
index 0000000000..31aa3cee51
--- /dev/null
+++ b/third_party/ngraph/ngraph.BUILD
@@ -0,0 +1,37 @@
+licenses(["notice"])  # 3-Clause BSD
+
+exports_files(["LICENSE"])
+
+cc_library(
+    name = "ngraph_core",
+    srcs = glob([
+        "src/ngraph/*.cpp",
+        "src/ngraph/autodiff/*.cpp",
+        "src/ngraph/builder/*.cpp",
+        "src/ngraph/descriptor/*.cpp",
+        "src/ngraph/descriptor/layout/*.cpp",
+        "src/ngraph/op/*.cpp",
+        "src/ngraph/op/util/*.cpp",
+        "src/ngraph/pattern/*.cpp",
+        "src/ngraph/pattern/*.hpp",
+        "src/ngraph/pass/*.cpp",
+        "src/ngraph/pass/*.hpp",
+        "src/ngraph/runtime/*.cpp",
+        "src/ngraph/type/*.cpp",
+        "src/ngraph/runtime/interpreter/*.cpp",
+        "src/ngraph/runtime/interpreter/*.hpp",
+    ]),
+    hdrs = glob(["src/ngraph/**/*.hpp"]),
+    deps = [
+        "@eigen_archive//:eigen",
+        "@nlohmann_json_lib",
+    ],
+    copts = [
+        "-I external/ngraph/src",
+        "-I external/nlohmann_json_lib/include/",
+        '-D SHARED_LIB_EXT=\\".so\\"',
+        '-D NGRAPH_VERSION=\\"0.5.0\\"',
+    ],
+    visibility = ["//visibility:public"],
+    alwayslink = 1,
+)
diff --git a/third_party/ngraph/ngraph_tf.BUILD b/third_party/ngraph/ngraph_tf.BUILD
new file mode 100644
index 0000000000..4d96ccf2f2
--- /dev/null
+++ b/third_party/ngraph/ngraph_tf.BUILD
@@ -0,0 +1,88 @@
+licenses(["notice"])  # 3-Clause BSD
+
+exports_files(["LICENSE"])
+
+load(
+    "@org_tensorflow//tensorflow:tensorflow.bzl",
+    "tf_cc_test",
+)
+
+cc_library(
+    name = "ngraph_libs_linux",
+    srcs = [
+        "lib/libiomp5.so",
+        "lib/libmklml_intel.so",
+    ],
+    visibility = ["//visibility:public"],
+)
+
+cc_library(
+    name = "ngraph_tf",
+    srcs = [
+        "src/ngraph_builder.h",
+        "src/ngraph_builder.cc",
+        "src/ngraph_cluster.h",
+        "src/ngraph_cluster.cc",
+        "src/ngraph_cluster_manager.h",
+        "src/ngraph_cluster_manager.cc",
+        "src/ngraph_confirm_pass.cc",
+        "src/ngraph_device.cc",
+        "src/ngraph_encapsulate_op.cc",
+        "src/ngraph_encapsulate_pass.cc",
+        "src/ngraph_freshness_tracker.h",
+        "src/ngraph_freshness_tracker.cc",
+        "src/ngraph_graph_rewrite_passes.cc",
+        "src/ngraph_liberate_pass.cc",
+        "src/ngraph_op_kernels.cc",
+        "src/ngraph_stub_ops.cc",
+        "src/ngraph_utils.h",
+        "src/ngraph_utils.cc",
+        "src/ngraph_send_recv_ops.cc",
+        "src/ngraph_variable_ops.cc",
+        "src/tf_graphcycles.cc",
+        "logging/ngraph_log.h",
+        "logging/ngraph_log.cc",
+        "logging/tf_graph_writer.h",
+        "logging/tf_graph_writer.cc",
+    ],
+    hdrs = [
+        "src/tf_graphcycles.h",
+    ],
+    deps = [
+        "@org_tensorflow//tensorflow/core:protos_all_proto_text",
+        "@org_tensorflow//tensorflow/core:framework_headers_lib",
+        "@org_tensorflow//tensorflow/core:core_cpu_headers_lib",
+        "@ngraph//:ngraph_core",
+    ],
+    copts = [
+        "-I external/ngraph_tf/src",
+        "-I external/ngraph_tf/logging",
+        "-I external/ngraph/src",
+        "-D NGRAPH_EMBEDDED_IN_TENSORFLOW=1",
+    ],
+    alwayslink = 1,
+    visibility = ["//visibility:public"],
+)
+
+tf_cc_test(
+    name = "ngraph_tf_tests",
+    size = "small",
+    srcs = [
+        "test/tf_exec.cpp",
+        "test/main.cpp",
+    ],
+    deps = [
+        ":ngraph_tf",
+        "@com_google_googletest//:gtest",
+        "@org_tensorflow//tensorflow/cc:cc_ops",
+        "@org_tensorflow//tensorflow/cc:client_session",
+        "@org_tensorflow//tensorflow/core:tensorflow",
+    ],
+    extra_copts = [
+        "-fexceptions ",
+        "-D NGRAPH_EMBEDDED_IN_TENSORFLOW=1",
+        "-I external/ngraph_tf/src",
+        "-I external/ngraph_tf/logging",
+        "-I external/ngraph/src",
+    ],
+)
diff --git a/third_party/ngraph/nlohmann_json.BUILD b/third_party/ngraph/nlohmann_json.BUILD
new file mode 100644
index 0000000000..04c8db6a96
--- /dev/null
+++ b/third_party/ngraph/nlohmann_json.BUILD
@@ -0,0 +1,15 @@
+licenses(["notice"])  # 3-Clause BSD
+
+exports_files(["LICENSE.MIT"])
+
+cc_library(
+    name = "nlohmann_json_lib",
+    hdrs = glob([
+        "include/nlohmann/**/*.hpp",
+    ]),
+    copts = [
+        "-I external/nlohmann_json_lib",
+    ],
+    visibility = ["//visibility:public"],
+    alwayslink = 1,
+)
diff --git a/third_party/systemlibs/nsync.BUILD b/third_party/systemlibs/nsync.BUILD
new file mode 100644
index 0000000000..c5d4ad0a76
--- /dev/null
+++ b/third_party/systemlibs/nsync.BUILD
@@ -0,0 +1,23 @@
+licenses(["notice"])  # BSD 3-Clause
+
+filegroup(
+    name = "LICENSE",
+    visibility = ["//visibility:public"],
+)
+
+cc_library(
+    name = "nsync_headers",
+    visibility = ["//visibility:public"],
+)
+
+cc_library(
+    name = "nsync",
+    linkopts = ["-lnsync"],
+    visibility = ["//visibility:public"],
+)
+
+cc_library(
+    name = "nsync_cpp",
+    linkopts = ["-lnsync_cpp"],
+    visibility = ["//visibility:public"],
+)
diff --git a/third_party/systemlibs/syslibs_configure.bzl b/third_party/systemlibs/syslibs_configure.bzl
index 07a44c317e..8b09c9ac1f 100644
--- a/third_party/systemlibs/syslibs_configure.bzl
+++ b/third_party/systemlibs/syslibs_configure.bzl
@@ -7,9 +7,9 @@
     the system version instead
 """
 
-_TF_SYSTEM_LIBS="TF_SYSTEM_LIBS"
+_TF_SYSTEM_LIBS = "TF_SYSTEM_LIBS"
 
-VALID_LIBS=[
+VALID_LIBS = [
     "astor_archive",
     "com_googlesource_code_re2",
     "curl",
@@ -22,6 +22,7 @@ VALID_LIBS=[
     "jsoncpp_git",
     "lmdb",
     "nasm",
+    "nsync",
     "org_sqlite",
     "pcre",
     "png_archive",
@@ -32,112 +33,109 @@ VALID_LIBS=[
     "zlib_archive",
 ]
 
-
 def auto_configure_fail(msg):
-  """Output failure message when syslibs configuration fails."""
-  red = "\033[0;31m"
-  no_color = "\033[0m"
-  fail("\n%sSystem Library Configuration Error:%s %s\n" % (red, no_color, msg))
-
+    """Output failure message when syslibs configuration fails."""
+    red = "\033[0;31m"
+    no_color = "\033[0m"
+    fail("\n%sSystem Library Configuration Error:%s %s\n" % (red, no_color, msg))
 
 def _is_windows(repository_ctx):
-  """Returns true if the host operating system is windows."""
-  os_name = repository_ctx.os.name.lower()
-  if os_name.find("windows") != -1:
-    return True
-  return False
-
+    """Returns true if the host operating system is windows."""
+    os_name = repository_ctx.os.name.lower()
+    if os_name.find("windows") != -1:
+        return True
+    return False
 
 def _enable_syslibs(repository_ctx):
-  s = repository_ctx.os.environ.get(_TF_SYSTEM_LIBS, '').strip()
-  if not _is_windows(repository_ctx) and s != None and s != '':
-    return True
-  return False
-
+    s = repository_ctx.os.environ.get(_TF_SYSTEM_LIBS, "").strip()
+    if not _is_windows(repository_ctx) and s != None and s != "":
+        return True
+    return False
 
 def _get_system_lib_list(repository_ctx):
-  """Gets the list of deps that should use the system lib.
+    """Gets the list of deps that should use the system lib.
 
-  Args:
-    repository_ctx: The repository context.
+    Args:
+      repository_ctx: The repository context.
 
-  Returns:
-    A string version of a python list
-  """
-  if _TF_SYSTEM_LIBS not in repository_ctx.os.environ:
-    return []
+    Returns:
+      A string version of a python list
+    """
+    if _TF_SYSTEM_LIBS not in repository_ctx.os.environ:
+        return []
 
-  libenv = repository_ctx.os.environ[_TF_SYSTEM_LIBS].strip()
-  libs = []
+    libenv = repository_ctx.os.environ[_TF_SYSTEM_LIBS].strip()
+    libs = []
 
-  for lib in list(libenv.split(',')):
-    lib = lib.strip()
-    if lib == "":
-      continue
-    if lib not in VALID_LIBS:
-      auto_configure_fail("Invalid system lib set: %s" % lib)
-      return []
-    libs.append(lib)
-
-  return libs
+    for lib in list(libenv.split(",")):
+        lib = lib.strip()
+        if lib == "":
+            continue
+        if lib not in VALID_LIBS:
+            auto_configure_fail("Invalid system lib set: %s" % lib)
+            return []
+        libs.append(lib)
 
+    return libs
 
 def _format_system_lib_list(repository_ctx):
-  """Formats the list of deps that should use the system lib.
-
-  Args:
-    repository_ctx: The repository context.
-
-  Returns:
-    A list of the names of deps that should use the system lib.
-  """
-  libs = _get_system_lib_list(repository_ctx)
-  ret = ''
-  for lib in libs:
-    ret += "'%s',\n" % lib
-
-  return ret
-
-
-def _tpl(repository_ctx, tpl, substitutions={}, out=None):
-  if not out:
-    out = tpl.replace(":", "")
-  repository_ctx.template(
-      out,
-      Label("//third_party/systemlibs%s.tpl" % tpl),
-      substitutions,
-      False)
-
+    """Formats the list of deps that should use the system lib.
+
+    Args:
+      repository_ctx: The repository context.
+
+    Returns:
+      A list of the names of deps that should use the system lib.
+    """
+    libs = _get_system_lib_list(repository_ctx)
+    ret = ""
+    for lib in libs:
+        ret += "'%s',\n" % lib
+
+    return ret
+
+def _tpl(repository_ctx, tpl, substitutions = {}, out = None):
+    if not out:
+        out = tpl.replace(":", "")
+    repository_ctx.template(
+        out,
+        Label("//third_party/systemlibs%s.tpl" % tpl),
+        substitutions,
+        False,
+    )
 
 def _create_dummy_repository(repository_ctx):
-  """Creates the dummy repository to build with all bundled libraries."""
-
-  _tpl(repository_ctx, ":BUILD")
-  _tpl(repository_ctx, ":build_defs.bzl",
-    {
-      "%{syslibs_enabled}": 'False',
-      "%{syslibs_list}": '',
-    })
-
+    """Creates the dummy repository to build with all bundled libraries."""
+
+    _tpl(repository_ctx, ":BUILD")
+    _tpl(
+        repository_ctx,
+        ":build_defs.bzl",
+        {
+            "%{syslibs_enabled}": "False",
+            "%{syslibs_list}": "",
+        },
+    )
 
 def _create_local_repository(repository_ctx):
-  """Creates the repository to build with system libraries."""
-
-  _tpl(repository_ctx, ":BUILD")
-  _tpl(repository_ctx, ":build_defs.bzl",
-    {
-      "%{syslibs_enabled}": 'True',
-      "%{syslibs_list}": _format_system_lib_list(repository_ctx),
-    })
-
+    """Creates the repository to build with system libraries."""
+
+    _tpl(repository_ctx, ":BUILD")
+    _tpl(
+        repository_ctx,
+        ":build_defs.bzl",
+        {
+            "%{syslibs_enabled}": "True",
+            "%{syslibs_list}": _format_system_lib_list(repository_ctx),
+        },
+    )
 
 def _syslibs_autoconf_impl(repository_ctx):
-  """Implementation of the syslibs_configure repository rule."""
-  if not _enable_syslibs(repository_ctx):
-    _create_dummy_repository(repository_ctx)
-  else:
-    _create_local_repository(repository_ctx)
-
+    """Implementation of the syslibs_configure repository rule."""
+    if not _enable_syslibs(repository_ctx):
+        _create_dummy_repository(repository_ctx)
+    else:
+        _create_local_repository(repository_ctx)
 
 syslibs_configure = repository_rule(
     implementation = _syslibs_autoconf_impl,