From 52d3e5a3a7bece06da072dcfb3f4ac53e83f8470 Mon Sep 17 00:00:00 2001 From: avijit-nervana Date: Wed, 22 Aug 2018 23:34:34 -0700 Subject: Added the BUILD files for tbb and updated the ngraph.BUILD with CPU library (DEX). --- third_party/ngraph/ngraph.BUILD | 109 ++++++++++++++++++++++++++++++++++++- third_party/ngraph/ngraph_tf.BUILD | 11 +--- third_party/ngraph/tbb.BUILD | 52 ++++++++++++++++++ 3 files changed, 161 insertions(+), 11 deletions(-) create mode 100644 third_party/ngraph/tbb.BUILD (limited to 'third_party') diff --git a/third_party/ngraph/ngraph.BUILD b/third_party/ngraph/ngraph.BUILD index 31aa3cee51..f1cf8acbf6 100644 --- a/third_party/ngraph/ngraph.BUILD +++ b/third_party/ngraph/ngraph.BUILD @@ -2,6 +2,112 @@ licenses(["notice"]) # 3-Clause BSD exports_files(["LICENSE"]) +cc_library( + name = "ngraph_headers", + hdrs = glob(["src/ngraph/**/*.hpp"]) , + visibility = ["//visibility:public"], +) + +cc_library( + name = "ngraph_cpu_backend", + srcs = [ + "src/ngraph/runtime/cpu/cpu_backend.cpp", + "src/ngraph/runtime/cpu/cpu_builder.cpp", + "src/ngraph/runtime/cpu/cpu_call_frame.cpp", + "src/ngraph/runtime/cpu/cpu_external_function.cpp", + "src/ngraph/runtime/cpu/cpu_kernels.cpp", + "src/ngraph/runtime/cpu/cpu_layout_descriptor.cpp", + "src/ngraph/runtime/cpu/cpu_tensor_view_wrapper.cpp", + "src/ngraph/runtime/cpu/cpu_tensor_view.cpp", + "src/ngraph/runtime/cpu/cpu_tracing.cpp", + "src/ngraph/runtime/cpu/builder/add.cpp", + "src/ngraph/runtime/cpu/builder/allreduce.cpp", + "src/ngraph/runtime/cpu/builder/avg_pool.cpp", + "src/ngraph/runtime/cpu/builder/argmin.cpp", + "src/ngraph/runtime/cpu/builder/argmax.cpp", + "src/ngraph/runtime/cpu/builder/batch_norm.cpp", + "src/ngraph/runtime/cpu/builder/broadcast.cpp", + "src/ngraph/runtime/cpu/builder/bounded_relu.cpp", + "src/ngraph/runtime/cpu/builder/concat.cpp", + "src/ngraph/runtime/cpu/builder/convert.cpp", + "src/ngraph/runtime/cpu/builder/convert_layout.cpp", + "src/ngraph/runtime/cpu/builder/convolution.cpp", + "src/ngraph/runtime/cpu/builder/dot.cpp", + "src/ngraph/runtime/cpu/builder/function_call.cpp", + "src/ngraph/runtime/cpu/builder/lstm.cpp", + "src/ngraph/runtime/cpu/builder/lrn.cpp", + "src/ngraph/runtime/cpu/builder/matmul_bias.cpp", + "src/ngraph/runtime/cpu/builder/max.cpp", + "src/ngraph/runtime/cpu/builder/max_pool.cpp", + "src/ngraph/runtime/cpu/builder/min.cpp", + "src/ngraph/runtime/cpu/builder/one_hot.cpp", + "src/ngraph/runtime/cpu/builder/relu.cpp", + "src/ngraph/runtime/cpu/builder/pad.cpp", + "src/ngraph/runtime/cpu/builder/product.cpp", + "src/ngraph/runtime/cpu/builder/reduce_function.cpp", + "src/ngraph/runtime/cpu/builder/reduce_function_window.cpp", + "src/ngraph/runtime/cpu/builder/replace_slice.cpp", + "src/ngraph/runtime/cpu/builder/reshape.cpp", + "src/ngraph/runtime/cpu/builder/reverse.cpp", + "src/ngraph/runtime/cpu/builder/reverse_sequence.cpp", + "src/ngraph/runtime/cpu/builder/rnn.cpp", + "src/ngraph/runtime/cpu/builder/select.cpp", + "src/ngraph/runtime/cpu/builder/select_and_scatter.cpp", + "src/ngraph/runtime/cpu/builder/sigmoid.cpp", + "src/ngraph/runtime/cpu/builder/slice.cpp", + "src/ngraph/runtime/cpu/builder/softmax.cpp", + "src/ngraph/runtime/cpu/builder/sum.cpp", + "src/ngraph/runtime/cpu/kernel/eigen_thread_pool.cpp", + "src/ngraph/runtime/cpu/kernel/pad.cpp", + "src/ngraph/runtime/cpu/kernel/reduce_max.cpp", + "src/ngraph/runtime/cpu/kernel/reduce_sum.cpp", + "src/ngraph/runtime/cpu/kernel/reshape.cpp", + "src/ngraph/runtime/cpu/mkldnn_emitter.cpp", + "src/ngraph/runtime/cpu/mkldnn_invoke.cpp", + "src/ngraph/runtime/cpu/mkldnn_utils.cpp", + "src/ngraph/runtime/cpu/op/batch_dot.cpp", + "src/ngraph/runtime/cpu/op/batch_norm_relu.cpp", + "src/ngraph/runtime/cpu/op/bounded_relu.cpp", + "src/ngraph/runtime/cpu/op/group_conv.cpp", + "src/ngraph/runtime/cpu/op/conv_bias.cpp", + "src/ngraph/runtime/cpu/op/conv_relu.cpp", + "src/ngraph/runtime/cpu/op/convert_layout.cpp", + "src/ngraph/runtime/cpu/op/loop_kernel.cpp", + "src/ngraph/runtime/cpu/op/lstm.cpp", + "src/ngraph/runtime/cpu/op/matmul_bias.cpp", + "src/ngraph/runtime/cpu/op/max_pool_with_indices.cpp", + "src/ngraph/runtime/cpu/op/rnn.cpp", + "src/ngraph/runtime/cpu/op/sigmoid_mul.cpp", + "src/ngraph/runtime/cpu/pass/cpu_assignment.cpp", + "src/ngraph/runtime/cpu/pass/cpu_collapse_dims.cpp", + "src/ngraph/runtime/cpu/pass/cpu_concat_inputs.cpp", + "src/ngraph/runtime/cpu/pass/cpu_fusion.cpp", + "src/ngraph/runtime/cpu/pass/cpu_layout.cpp", + "src/ngraph/runtime/cpu/pass/cpu_loop_kernel_fusion.cpp", + "src/ngraph/runtime/cpu/pass/cpu_mat_fusion.cpp", + "src/ngraph/runtime/cpu/pass/cpu_post_layout_optimizations.cpp", + "src/ngraph/runtime/cpu/pass/cpu_rnn_fusion.cpp", + "src/ngraph/runtime/cpu/pass/cpu_workspace_insertion.cpp", + ], + hdrs = glob(["src/ngraph/runtime/cpu/**/*.hpp"]) + glob([]), + deps = [ + ":ngraph_headers", + "@eigen_archive//:eigen", + "@nlohmann_json_lib", + "@tbb", + "@mkl_dnn//:mkl_dnn", + ], + copts = [ + "-I external/ngraph/src", + "-I external/nlohmann_json_lib/include/", + '-D SHARED_LIB_EXT=\\".so\\"', + '-D NGRAPH_VERSION=\\"0.5.0\\"', + '-D NGRAPH_DEX_ONLY', + ], + visibility = ["//visibility:public"], + alwayslink = 1, +) + cc_library( name = "ngraph_core", srcs = glob([ @@ -21,8 +127,9 @@ cc_library( "src/ngraph/runtime/interpreter/*.cpp", "src/ngraph/runtime/interpreter/*.hpp", ]), - hdrs = glob(["src/ngraph/**/*.hpp"]), deps = [ + ":ngraph_headers", + ":ngraph_cpu_backend", "@eigen_archive//:eigen", "@nlohmann_json_lib", ], diff --git a/third_party/ngraph/ngraph_tf.BUILD b/third_party/ngraph/ngraph_tf.BUILD index 4d96ccf2f2..0647d9926a 100644 --- a/third_party/ngraph/ngraph_tf.BUILD +++ b/third_party/ngraph/ngraph_tf.BUILD @@ -7,15 +7,6 @@ load( "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 = [ @@ -58,7 +49,7 @@ cc_library( "-I external/ngraph_tf/src", "-I external/ngraph_tf/logging", "-I external/ngraph/src", - "-D NGRAPH_EMBEDDED_IN_TENSORFLOW=1", + #"-D NGRAPH_EMBEDDED_IN_TENSORFLOW=1", ], alwayslink = 1, visibility = ["//visibility:public"], diff --git a/third_party/ngraph/tbb.BUILD b/third_party/ngraph/tbb.BUILD new file mode 100644 index 0000000000..c3e7f7fd35 --- /dev/null +++ b/third_party/ngraph/tbb.BUILD @@ -0,0 +1,52 @@ +licenses(["notice"]) # 3-Clause BSD + +exports_files(["LICENSE"]) + +genrule( + name = "build_tbb", + srcs = glob(["**"]) + [ + "@local_config_cc//:toolchain", + ], + cmd = """ + set -e + WORK_DIR=$$PWD + DEST_DIR=$$PWD/$(@D) + export PATH=$$(dirname $(AR)):$$PATH + export CXXFLAGS=$(CC_FLAGS) + export NM=$(NM) + export AR=$(AR) + cd $$(dirname $(location :Makefile)) + + #TBB's build needs some help to figure out what compiler it's using + if $$CXX --version | grep clang &> /dev/null; then + COMPILER_OPT="compiler=clang" + else + COMPILER_OPT="compiler=gcc" + fi + + # uses extra_inc=big_iron.inc to specify that static libraries are + # built. See https://software.intel.com/en-us/forums/intel-threading-building-blocks/topic/297792 + make tbb_build_prefix="build" \ + extra_inc=big_iron.inc \ + $$COMPILER_OPT; \ + + echo cp build/build_{release,debug}/*.a $$DEST_DIR + cp build/build_{release,debug}/*.a $$DEST_DIR + cd $$WORK_DIR + """, + outs = [ + "libtbb.a", + "libtbbmalloc.a", + ] +) + +cc_library( + name = "tbb", + hdrs = glob([ + "include/serial/**", + "include/tbb/**/**", + ]), + srcs = ["libtbb.a"], + includes = ["include"], + visibility = ["//visibility:public"], +) \ No newline at end of file -- cgit v1.2.3 From aa02f7f3622dca8c7b03e745cdb8a10797f32f61 Mon Sep 17 00:00:00 2001 From: avijit-nervana Date: Thu, 23 Aug 2018 22:56:22 -0700 Subject: Updated build files --- third_party/ngraph/ngraph.BUILD | 8 ++--- third_party/ngraph/ngraph_tf.BUILD | 2 +- third_party/ngraph/tbb.BUILD | 72 +++++++++++++++++++++----------------- 3 files changed, 45 insertions(+), 37 deletions(-) (limited to 'third_party') diff --git a/third_party/ngraph/ngraph.BUILD b/third_party/ngraph/ngraph.BUILD index f1cf8acbf6..3d9c3ac044 100644 --- a/third_party/ngraph/ngraph.BUILD +++ b/third_party/ngraph/ngraph.BUILD @@ -4,7 +4,7 @@ exports_files(["LICENSE"]) cc_library( name = "ngraph_headers", - hdrs = glob(["src/ngraph/**/*.hpp"]) , + hdrs = glob(["src/ngraph/**/*.hpp"]), visibility = ["//visibility:public"], ) @@ -102,7 +102,7 @@ cc_library( "-I external/nlohmann_json_lib/include/", '-D SHARED_LIB_EXT=\\".so\\"', '-D NGRAPH_VERSION=\\"0.5.0\\"', - '-D NGRAPH_DEX_ONLY', + "-D NGRAPH_DEX_ONLY", ], visibility = ["//visibility:public"], alwayslink = 1, @@ -124,8 +124,8 @@ cc_library( "src/ngraph/pass/*.hpp", "src/ngraph/runtime/*.cpp", "src/ngraph/type/*.cpp", - "src/ngraph/runtime/interpreter/*.cpp", - "src/ngraph/runtime/interpreter/*.hpp", + #"src/ngraph/runtime/interpreter/*.cpp", + #"src/ngraph/runtime/interpreter/*.hpp", ]), deps = [ ":ngraph_headers", diff --git a/third_party/ngraph/ngraph_tf.BUILD b/third_party/ngraph/ngraph_tf.BUILD index 0647d9926a..d0231e468e 100644 --- a/third_party/ngraph/ngraph_tf.BUILD +++ b/third_party/ngraph/ngraph_tf.BUILD @@ -71,7 +71,7 @@ tf_cc_test( ], extra_copts = [ "-fexceptions ", - "-D NGRAPH_EMBEDDED_IN_TENSORFLOW=1", + #"-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/tbb.BUILD b/third_party/ngraph/tbb.BUILD index c3e7f7fd35..7c760cb3b3 100644 --- a/third_party/ngraph/tbb.BUILD +++ b/third_party/ngraph/tbb.BUILD @@ -2,42 +2,50 @@ licenses(["notice"]) # 3-Clause BSD exports_files(["LICENSE"]) +# Taken from: https://github.com/rnburn/satyr/blob/master/bazel/tbb.BUILD +# License: MIT +# See: https://github.com/rnburn/satyr/blob/master/LICENSE + genrule( - name = "build_tbb", - srcs = glob(["**"]) + [ - "@local_config_cc//:toolchain", - ], - cmd = """ - set -e - WORK_DIR=$$PWD - DEST_DIR=$$PWD/$(@D) - export PATH=$$(dirname $(AR)):$$PATH - export CXXFLAGS=$(CC_FLAGS) - export NM=$(NM) - export AR=$(AR) - cd $$(dirname $(location :Makefile)) - - #TBB's build needs some help to figure out what compiler it's using - if $$CXX --version | grep clang &> /dev/null; then + name = "build_tbb", + srcs = glob(["**"]) + [ + "@local_config_cc//:toolchain", + ], + cmd = """ + set -e + WORK_DIR=$$PWD + DEST_DIR=$$PWD/$(@D) + export PATH=$$(dirname $(AR)):$$PATH + export CXXFLAGS=$(CC_FLAGS) + export NM=$(NM) + export AR=$(AR) + cd $$(dirname $(location :Makefile)) + + #TBB's build needs some help to figure out what compiler it's using + if $$CXX --version | grep clang &> /dev/null; then COMPILER_OPT="compiler=clang" - else - COMPILER_OPT="compiler=gcc" - fi + else + COMPILER_OPT="compiler=gcc" - # uses extra_inc=big_iron.inc to specify that static libraries are - # built. See https://software.intel.com/en-us/forums/intel-threading-building-blocks/topic/297792 - make tbb_build_prefix="build" \ + # # Workaround for TBB bug + # # See https://github.com/01org/tbb/issues/59 + # CXXFLAGS="$$CXXFLAGS -flifetime-dse=1" + fi + + # uses extra_inc=big_iron.inc to specify that static libraries are + # built. See https://software.intel.com/en-us/forums/intel-threading-building-blocks/topic/297792 + make tbb_build_prefix="build" \ extra_inc=big_iron.inc \ $$COMPILER_OPT; \ - echo cp build/build_{release,debug}/*.a $$DEST_DIR - cp build/build_{release,debug}/*.a $$DEST_DIR - cd $$WORK_DIR - """, - outs = [ - "libtbb.a", - "libtbbmalloc.a", - ] + echo cp build/build_{release,debug}/*.a $$DEST_DIR + cp build/build_{release,debug}/*.a $$DEST_DIR + cd $$WORK_DIR + """, + outs = [ + "libtbb.a", + "libtbbmalloc.a", + ], ) cc_library( @@ -45,8 +53,8 @@ cc_library( hdrs = glob([ "include/serial/**", "include/tbb/**/**", - ]), + ]), srcs = ["libtbb.a"], includes = ["include"], visibility = ["//visibility:public"], -) \ No newline at end of file +) -- cgit v1.2.3 From 7e91ec68c7df088c306cc56cce621aee7ff53c94 Mon Sep 17 00:00:00 2001 From: avijit-nervana Date: Fri, 24 Aug 2018 22:13:21 -0700 Subject: Added more unit tests and upgraded to the device-less bridge. --- WORKSPACE | 6 ++++++ tensorflow/workspace.bzl | 20 ++++++++++---------- third_party/ngraph/ngraph_tf.BUILD | 34 +++++++++++++++++++++++----------- 3 files changed, 39 insertions(+), 21 deletions(-) (limited to 'third_party') diff --git a/WORKSPACE b/WORKSPACE index 4af1a1e75f..15aa24f3c1 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -86,3 +86,9 @@ new_local_repository( build_file = "//third_party/ngraph:ngraph.BUILD", ) +new_local_repository( + name = "ngraph_tf", + path = "/nfs/site/home/avijitch/workspace/tf-upstream/ngraph-tf", + build_file = "//third_party/ngraph:ngraph_tf.BUILD", +) + diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl index 951cb8a89d..a5dc95d609 100644 --- a/tensorflow/workspace.bzl +++ b/tensorflow/workspace.bzl @@ -865,16 +865,16 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""): build_file = clean_dep("//third_party/ngraph:nlohmann_json.BUILD"), ) - tf_http_archive( - name = "ngraph_tf", - urls = [ - "https://mirror.bazel.build/github.com/NervanaSystems/ngraph-tf/archive/v0.3.0-rc1.tar.gz", - "https://github.com/NervanaSystems/ngraph-tf/archive/v0.3.0-rc1.tar.gz", - ], - sha256 = "7919332cb15120101c3e05c1b969a5e029a6411581312583c8f80b6aaaa83072", - strip_prefix = "ngraph-tf-0.3.0-rc1", - build_file = clean_dep("//third_party/ngraph:ngraph_tf.BUILD"), - ) + # tf_http_archive( + # name = "ngraph_tf", + # urls = [ + # "https://mirror.bazel.build/github.com/NervanaSystems/ngraph-tf/archive/v0.3.0-rc1.tar.gz", + # "https://github.com/NervanaSystems/ngraph-tf/archive/v0.3.0-rc1.tar.gz", + # ], + # sha256 = "7919332cb15120101c3e05c1b969a5e029a6411581312583c8f80b6aaaa83072", + # strip_prefix = "ngraph-tf-0.3.0-rc1", + # build_file = clean_dep("//third_party/ngraph:ngraph_tf.BUILD"), + # ) ############################################################################## # BIND DEFINITIONS diff --git a/third_party/ngraph/ngraph_tf.BUILD b/third_party/ngraph/ngraph_tf.BUILD index d0231e468e..f40d2057e8 100644 --- a/third_party/ngraph/ngraph_tf.BUILD +++ b/third_party/ngraph/ngraph_tf.BUILD @@ -10,26 +10,35 @@ load( cc_library( name = "ngraph_tf", srcs = [ + "src/ngraph_assign_clusters.h", + "src/ngraph_assign_clusters.cc", "src/ngraph_builder.h", "src/ngraph_builder.cc", - "src/ngraph_cluster.h", - "src/ngraph_cluster.cc", + "src/ngraph_capture_variables.h", + "src/ngraph_capture_variables.cc", + "src/ngraph_conversions.h", "src/ngraph_cluster_manager.h", "src/ngraph_cluster_manager.cc", - "src/ngraph_confirm_pass.cc", - "src/ngraph_device.cc", + "src/ngraph_deassign_clusters.h", + "src/ngraph_deassign_clusters.cc", "src/ngraph_encapsulate_op.cc", - "src/ngraph_encapsulate_pass.cc", + "src/ngraph_encapsulate_clusters.h", + "src/ngraph_encapsulate_clusters.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_liberate_pass.cc", + # "src/ngraph_op_kernels.cc", + # "src/ngraph_stub_ops.cc", + "src/ngraph_mark_for_clustering.h", + "src/ngraph_mark_for_clustering.cc", + "src/ngraph_rewrite_pass.cc", + "src/ngraph_rewrite_for_tracking.h", + "src/ngraph_rewrite_for_tracking.cc", + "src/ngraph_tracked_variable.cc", "src/ngraph_utils.h", "src/ngraph_utils.cc", - "src/ngraph_send_recv_ops.cc", - "src/ngraph_variable_ops.cc", + # "src/ngraph_send_recv_ops.cc", + # "src/ngraph_variable_ops.cc", "src/tf_graphcycles.cc", "logging/ngraph_log.h", "logging/ngraph_log.cc", @@ -60,6 +69,9 @@ tf_cc_test( size = "small", srcs = [ "test/tf_exec.cpp", + "test/conversions.cpp", + "test/padding.cpp", + "test/graph_rewrites/assign_clusters.cc", "test/main.cpp", ], deps = [ -- cgit v1.2.3 From 6b25c37daaa6a063b6b687252343db5453a84b8b Mon Sep 17 00:00:00 2001 From: avijit-nervana Date: Mon, 27 Aug 2018 19:15:36 -0700 Subject: Added new version of the bridge that supports deviceless operation. --- third_party/ngraph/ngraph_tf.BUILD | 7 ------- 1 file changed, 7 deletions(-) (limited to 'third_party') diff --git a/third_party/ngraph/ngraph_tf.BUILD b/third_party/ngraph/ngraph_tf.BUILD index f40d2057e8..c1221cc385 100644 --- a/third_party/ngraph/ngraph_tf.BUILD +++ b/third_party/ngraph/ngraph_tf.BUILD @@ -26,9 +26,6 @@ cc_library( "src/ngraph_encapsulate_clusters.cc", "src/ngraph_freshness_tracker.h", "src/ngraph_freshness_tracker.cc", - # "src/ngraph_liberate_pass.cc", - # "src/ngraph_op_kernels.cc", - # "src/ngraph_stub_ops.cc", "src/ngraph_mark_for_clustering.h", "src/ngraph_mark_for_clustering.cc", "src/ngraph_rewrite_pass.cc", @@ -37,8 +34,6 @@ cc_library( "src/ngraph_tracked_variable.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", @@ -58,7 +53,6 @@ cc_library( "-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"], @@ -83,7 +77,6 @@ tf_cc_test( ], extra_copts = [ "-fexceptions ", - #"-D NGRAPH_EMBEDDED_IN_TENSORFLOW=1", "-I external/ngraph_tf/src", "-I external/ngraph_tf/logging", "-I external/ngraph/src", -- cgit v1.2.3 From 66b27b0f4c3541268007b251885f8db424147e66 Mon Sep 17 00:00:00 2001 From: avijit-nervana Date: Tue, 28 Aug 2018 18:46:45 -0700 Subject: Added comments. --- third_party/ngraph/ngraph.BUILD | 2 -- third_party/ngraph/tbb.BUILD | 5 ++++- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'third_party') diff --git a/third_party/ngraph/ngraph.BUILD b/third_party/ngraph/ngraph.BUILD index 3d9c3ac044..426d49c542 100644 --- a/third_party/ngraph/ngraph.BUILD +++ b/third_party/ngraph/ngraph.BUILD @@ -124,8 +124,6 @@ cc_library( "src/ngraph/pass/*.hpp", "src/ngraph/runtime/*.cpp", "src/ngraph/type/*.cpp", - #"src/ngraph/runtime/interpreter/*.cpp", - #"src/ngraph/runtime/interpreter/*.hpp", ]), deps = [ ":ngraph_headers", diff --git a/third_party/ngraph/tbb.BUILD b/third_party/ngraph/tbb.BUILD index 7c760cb3b3..e2096e48af 100644 --- a/third_party/ngraph/tbb.BUILD +++ b/third_party/ngraph/tbb.BUILD @@ -3,8 +3,11 @@ licenses(["notice"]) # 3-Clause BSD exports_files(["LICENSE"]) # Taken from: https://github.com/rnburn/satyr/blob/master/bazel/tbb.BUILD -# License: MIT +# License for this BUILD file: MIT # See: https://github.com/rnburn/satyr/blob/master/LICENSE +# +# License for TBB: Apache 2.0 +# See: https://github.com/01org/tbb/blob/tbb_2018/LICENSE genrule( name = "build_tbb", -- cgit v1.2.3 From 4644d186e1cc5862d152a6be4df4443c46f76b4a Mon Sep 17 00:00:00 2001 From: avijit-nervana Date: Tue, 4 Sep 2018 07:28:44 -0700 Subject: Added the api for the bridge --- third_party/ngraph/ngraph_tf.BUILD | 2 ++ 1 file changed, 2 insertions(+) (limited to 'third_party') diff --git a/third_party/ngraph/ngraph_tf.BUILD b/third_party/ngraph/ngraph_tf.BUILD index c1221cc385..a8d1fdc194 100644 --- a/third_party/ngraph/ngraph_tf.BUILD +++ b/third_party/ngraph/ngraph_tf.BUILD @@ -10,6 +10,8 @@ load( cc_library( name = "ngraph_tf", srcs = [ + "src/ngraph_api.h", + "src/ngraph_api.cc", "src/ngraph_assign_clusters.h", "src/ngraph_assign_clusters.cc", "src/ngraph_builder.h", -- cgit v1.2.3 From a65c6c17d0705fe11be6f33f63a677106bf26ffb Mon Sep 17 00:00:00 2001 From: avijit-nervana Date: Tue, 4 Sep 2018 12:34:14 -0700 Subject: Updated the unit test files --- third_party/ngraph/ngraph_tf.BUILD | 2 ++ 1 file changed, 2 insertions(+) (limited to 'third_party') diff --git a/third_party/ngraph/ngraph_tf.BUILD b/third_party/ngraph/ngraph_tf.BUILD index a8d1fdc194..7577a4014d 100644 --- a/third_party/ngraph/ngraph_tf.BUILD +++ b/third_party/ngraph/ngraph_tf.BUILD @@ -68,6 +68,8 @@ tf_cc_test( "test/conversions.cpp", "test/padding.cpp", "test/graph_rewrites/assign_clusters.cc", + "test/test_utilities.h", + "test/test_utilities.cpp", "test/main.cpp", ], deps = [ -- cgit v1.2.3 From 18b80bbd4b8db8bd35afad7264258c1c5c269226 Mon Sep 17 00:00:00 2001 From: avijit-nervana Date: Wed, 5 Sep 2018 22:56:20 -0700 Subject: Updated with more unit tests --- third_party/ngraph/ngraph.BUILD | 4 ++-- third_party/ngraph/ngraph_tf.BUILD | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'third_party') diff --git a/third_party/ngraph/ngraph.BUILD b/third_party/ngraph/ngraph.BUILD index 426d49c542..1fd1b8e8e0 100644 --- a/third_party/ngraph/ngraph.BUILD +++ b/third_party/ngraph/ngraph.BUILD @@ -101,7 +101,7 @@ cc_library( "-I external/ngraph/src", "-I external/nlohmann_json_lib/include/", '-D SHARED_LIB_EXT=\\".so\\"', - '-D NGRAPH_VERSION=\\"0.5.0\\"', + '-D NGRAPH_VERSION=\\"0.7.0\\"', "-D NGRAPH_DEX_ONLY", ], visibility = ["//visibility:public"], @@ -135,7 +135,7 @@ cc_library( "-I external/ngraph/src", "-I external/nlohmann_json_lib/include/", '-D SHARED_LIB_EXT=\\".so\\"', - '-D NGRAPH_VERSION=\\"0.5.0\\"', + '-D NGRAPH_VERSION=\\"0.7.0\\"', ], visibility = ["//visibility:public"], alwayslink = 1, diff --git a/third_party/ngraph/ngraph_tf.BUILD b/third_party/ngraph/ngraph_tf.BUILD index 7577a4014d..979318d7c2 100644 --- a/third_party/ngraph/ngraph_tf.BUILD +++ b/third_party/ngraph/ngraph_tf.BUILD @@ -70,6 +70,10 @@ tf_cc_test( "test/graph_rewrites/assign_clusters.cc", "test/test_utilities.h", "test/test_utilities.cpp", + "test/test_math_ops.cpp", + "test/test_nn_ops.cpp", + "test/opexecuter.h", + "test/opexecuter.cpp", "test/main.cpp", ], deps = [ -- cgit v1.2.3