diff options
| -rwxr-xr-x | tensorflow/workspace.bzl | 16 | ||||
| -rw-r--r-- | third_party/ngraph/ngraph.BUILD | 43 | ||||
| -rw-r--r-- | third_party/ngraph/ngraph_tf.BUILD | 51 |
3 files changed, 61 insertions, 49 deletions
diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl index 0916d4540b..915fee6a1f 100755 --- a/tensorflow/workspace.bzl +++ b/tensorflow/workspace.bzl @@ -858,11 +858,11 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""): tf_http_archive( name = "ngraph", urls = [ - "https://mirror.bazel.build/github.com/NervanaSystems/ngraph/archive/v0.7.0.tar.gz", - "https://github.com/NervanaSystems/ngraph/archive/v0.7.0.tar.gz", + "https://mirror.bazel.build/github.com/NervanaSystems/ngraph/archive/v0.8.0.tar.gz", + "https://github.com/NervanaSystems/ngraph/archive/v0.8.0.tar.gz", ], - sha256 = "34434b6d5993ac5233538c84f498840db7ac91df82e225c379ee7c8f6de644a5", - strip_prefix = "ngraph-0.7.0", + sha256 = "a8cf3ef2d0e6d31b54eb33f6a9e795f562195ce5c2a857e729ca9c35241cc45c", + strip_prefix = "ngraph-0.8.0", build_file = clean_dep("//third_party/ngraph:ngraph.BUILD"), ) @@ -880,11 +880,11 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""): tf_http_archive( name = "ngraph_tf", urls = [ - "https://mirror.bazel.build/github.com/NervanaSystems/ngraph-tf/archive/v0.5.0.tar.gz", - "https://github.com/NervanaSystems/ngraph-tf/archive/v0.5.0.tar.gz", + "https://mirror.bazel.build/github.com/NervanaSystems/ngraph-tf/archive/v0.6.0.tar.gz", + "https://github.com/NervanaSystems/ngraph-tf/archive/v0.6.0.tar.gz", ], - sha256 = "23b4566d8e40d6f1f236b0ffe3905dd964ae42ca54bacff67f24abcefd443afb", - strip_prefix = "ngraph-tf-0.5.0", + sha256 = "1f49391c02bef24872e9f85591e60e0e7eef12a337db71390444118049fe451f", + strip_prefix = "ngraph-tf-0.6.0", build_file = clean_dep("//third_party/ngraph:ngraph_tf.BUILD"), ) diff --git a/third_party/ngraph/ngraph.BUILD b/third_party/ngraph/ngraph.BUILD index 1fd1b8e8e0..71b2187011 100644 --- a/third_party/ngraph/ngraph.BUILD +++ b/third_party/ngraph/ngraph.BUILD @@ -11,41 +11,35 @@ cc_library( 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/argmin.cpp", + "src/ngraph/runtime/cpu/builder/avg_pool.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/broadcast.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/lstm.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/quantize.cpp", + "src/ngraph/runtime/cpu/builder/quantized_avg_pool.cpp", + "src/ngraph/runtime/cpu/builder/quantized_max_pool.cpp", "src/ngraph/runtime/cpu/builder/reduce_function.cpp", "src/ngraph/runtime/cpu/builder/reduce_function_window.cpp", + "src/ngraph/runtime/cpu/builder/relu.cpp", "src/ngraph/runtime/cpu/builder/replace_slice.cpp", "src/ngraph/runtime/cpu/builder/reshape.cpp", "src/ngraph/runtime/cpu/builder/reverse.cpp", @@ -57,6 +51,16 @@ cc_library( "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/builder/topk.cpp", + "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.cpp", + "src/ngraph/runtime/cpu/cpu_tensor_view_wrapper.cpp", + "src/ngraph/runtime/cpu/cpu_tracing.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", @@ -68,14 +72,19 @@ cc_library( "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_add.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/dequantize.cpp", + "src/ngraph/runtime/cpu/op/group_conv.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/quantize.cpp", + "src/ngraph/runtime/cpu/op/quantized_avg_pool.cpp", + "src/ngraph/runtime/cpu/op/quantized_max_pool.cpp", "src/ngraph/runtime/cpu/op/rnn.cpp", "src/ngraph/runtime/cpu/op/sigmoid_mul.cpp", "src/ngraph/runtime/cpu/pass/cpu_assignment.cpp", @@ -101,7 +110,7 @@ cc_library( "-I external/ngraph/src", "-I external/nlohmann_json_lib/include/", '-D SHARED_LIB_EXT=\\".so\\"', - '-D NGRAPH_VERSION=\\"0.7.0\\"', + '-D NGRAPH_VERSION=\\"0.8.0\\"', "-D NGRAPH_DEX_ONLY", ], visibility = ["//visibility:public"], @@ -135,7 +144,7 @@ cc_library( "-I external/ngraph/src", "-I external/nlohmann_json_lib/include/", '-D SHARED_LIB_EXT=\\".so\\"', - '-D NGRAPH_VERSION=\\"0.7.0\\"', + '-D NGRAPH_VERSION=\\"0.8.0\\"', ], visibility = ["//visibility:public"], alwayslink = 1, diff --git a/third_party/ngraph/ngraph_tf.BUILD b/third_party/ngraph/ngraph_tf.BUILD index 979318d7c2..dbedca0a03 100644 --- a/third_party/ngraph/ngraph_tf.BUILD +++ b/third_party/ngraph/ngraph_tf.BUILD @@ -10,41 +10,42 @@ load( cc_library( name = "ngraph_tf", srcs = [ - "src/ngraph_api.h", "src/ngraph_api.cc", - "src/ngraph_assign_clusters.h", + "src/ngraph_api.h", "src/ngraph_assign_clusters.cc", - "src/ngraph_builder.h", + "src/ngraph_assign_clusters.h", "src/ngraph_builder.cc", - "src/ngraph_capture_variables.h", + "src/ngraph_builder.h", "src/ngraph_capture_variables.cc", - "src/ngraph_conversions.h", - "src/ngraph_cluster_manager.h", + "src/ngraph_capture_variables.h", "src/ngraph_cluster_manager.cc", - "src/ngraph_deassign_clusters.h", + "src/ngraph_cluster_manager.h", + "src/ngraph_conversions.h", "src/ngraph_deassign_clusters.cc", - "src/ngraph_encapsulate_op.cc", - "src/ngraph_encapsulate_clusters.h", + "src/ngraph_deassign_clusters.h", "src/ngraph_encapsulate_clusters.cc", - "src/ngraph_freshness_tracker.h", + "src/ngraph_encapsulate_clusters.h", + "src/ngraph_encapsulate_op.cc", "src/ngraph_freshness_tracker.cc", - "src/ngraph_mark_for_clustering.h", + "src/ngraph_freshness_tracker.h", "src/ngraph_mark_for_clustering.cc", - "src/ngraph_rewrite_pass.cc", - "src/ngraph_rewrite_for_tracking.h", + "src/ngraph_mark_for_clustering.h", "src/ngraph_rewrite_for_tracking.cc", + "src/ngraph_rewrite_for_tracking.h", + "src/ngraph_rewrite_pass.cc", "src/ngraph_tracked_variable.cc", - "src/ngraph_utils.h", "src/ngraph_utils.cc", + "src/ngraph_utils.h", + "src/ngraph_version_utils.h", + "src/tf_deadness_analysis.cc", + "src/tf_deadness_analysis.h", "src/tf_graphcycles.cc", + "src/tf_graphcycles.h", "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", @@ -64,17 +65,19 @@ tf_cc_test( name = "ngraph_tf_tests", size = "small", srcs = [ - "test/tf_exec.cpp", "test/conversions.cpp", - "test/padding.cpp", "test/graph_rewrites/assign_clusters.cc", - "test/test_utilities.h", - "test/test_utilities.cpp", + "test/graph_rewrites/deadness_test.cc", + "test/main.cpp", + "test/opexecuter.cpp", + "test/opexecuter.h", + "test/padding.cpp", + "test/test_array_ops.cpp", "test/test_math_ops.cpp", "test/test_nn_ops.cpp", - "test/opexecuter.h", - "test/opexecuter.cpp", - "test/main.cpp", + "test/test_utilities.cpp", + "test/test_utilities.h", + "test/tf_exec.cpp", ], deps = [ ":ngraph_tf", |