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). --- tensorflow/workspace.bzl | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) (limited to 'tensorflow/workspace.bzl') diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl index 5d90d0fe64..951cb8a89d 100644 --- a/tensorflow/workspace.bzl +++ b/tensorflow/workspace.bzl @@ -833,15 +833,26 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""): ) tf_http_archive( - name = "ngraph", - urls = [ - "https://mirror.bazel.build/github.com/NervanaSystems/ngraph/archive/v0.5.0.tar.gz", - "https://github.com/NervanaSystems/ngraph/archive/v0.5.0.tar.gz", - ], - sha256 = "cb35d3d98836f615408afd18371fb13e3400711247e0d822ba7f306c45e9bb2c", - strip_prefix = "ngraph-0.5.0", - build_file = clean_dep("//third_party/ngraph:ngraph.BUILD"), - ) + name = "tbb", + urls = [ + "https://mirror.bazel.build/github.com/01org/tbb/archive/tbb_2018.zip", + "https://github.com/01org/tbb/archive/tbb_2018.zip", + ], + sha256 = "724686f90bcda78f13b76f297d964008737ccd6399328143c1c0093e73ae6a13", + strip_prefix = "tbb-tbb_2018", + build_file = clean_dep("//third_party/ngraph:tbb.BUILD"), + ) + + # tf_http_archive( + # name = "ngraph", + # urls = [ + # "https://mirror.bazel.build/github.com/NervanaSystems/ngraph/archive/v0.5.0.tar.gz", + # "https://github.com/NervanaSystems/ngraph/archive/v0.5.0.tar.gz", + # ], + # sha256 = "cb35d3d98836f615408afd18371fb13e3400711247e0d822ba7f306c45e9bb2c", + # strip_prefix = "ngraph-0.5.0", + # build_file = clean_dep("//third_party/ngraph:ngraph.BUILD"), + # ) tf_http_archive( name = "nlohmann_json_lib", -- 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 'tensorflow/workspace.bzl') 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 bd1fd82712706592b9a6d34a6bac1b1f438eb00f Mon Sep 17 00:00:00 2001 From: avijit-nervana Date: Fri, 7 Sep 2018 19:16:04 -0700 Subject: Updated the ngraph-tf and ngraph releases. --- WORKSPACE | 12 ------------ tensorflow/workspace.bzl | 40 ++++++++++++++++++++-------------------- 2 files changed, 20 insertions(+), 32 deletions(-) (limited to 'tensorflow/workspace.bzl') diff --git a/WORKSPACE b/WORKSPACE index 15aa24f3c1..f1d0ed565d 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -80,15 +80,3 @@ new_http_archive( ], ) -new_local_repository( - name = "ngraph", - path = "/nfs/site/home/avijitch/workspace/tf-upstream/ngraph", - 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 0ff695d9f8..79b3df1e51 100755 --- a/tensorflow/workspace.bzl +++ b/tensorflow/workspace.bzl @@ -841,16 +841,16 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""): build_file = clean_dep("//third_party/ngraph:tbb.BUILD"), ) - # tf_http_archive( - # name = "ngraph", - # urls = [ - # "https://mirror.bazel.build/github.com/NervanaSystems/ngraph/archive/v0.5.0.tar.gz", - # "https://github.com/NervanaSystems/ngraph/archive/v0.5.0.tar.gz", - # ], - # sha256 = "cb35d3d98836f615408afd18371fb13e3400711247e0d822ba7f306c45e9bb2c", - # strip_prefix = "ngraph-0.5.0", - # build_file = clean_dep("//third_party/ngraph:ngraph.BUILD"), - # ) + 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", + ], + sha256 = "", + strip_prefix = "ngraph-0.7.0", + build_file = clean_dep("//third_party/ngraph:ngraph.BUILD"), + ) tf_http_archive( name = "nlohmann_json_lib", @@ -863,16 +863,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.5.0.tar.gz", + "https://github.com/NervanaSystems/ngraph-tf/archive/v0.5.0.tar.gz", + ], + sha256 = "23b4566d8e40d6f1f236b0ffe3905dd964ae42ca54bacff67f24abcefd443afb", + strip_prefix = "ngraph-tf-0.5.0", + build_file = clean_dep("//third_party/ngraph:ngraph_tf.BUILD"), + ) ############################################################################## # BIND DEFINITIONS -- cgit v1.2.3 From 2032512ba1de376baadfa9f3983e3edbc67a6731 Mon Sep 17 00:00:00 2001 From: avijit-nervana Date: Fri, 7 Sep 2018 19:21:19 -0700 Subject: Updated the sha256 for ngraph --- tensorflow/workspace.bzl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tensorflow/workspace.bzl') diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl index 79b3df1e51..9a82c724b7 100755 --- a/tensorflow/workspace.bzl +++ b/tensorflow/workspace.bzl @@ -847,7 +847,7 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""): "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", ], - sha256 = "", + sha256 = "34434b6d5993ac5233538c84f498840db7ac91df82e225c379ee7c8f6de644a5", strip_prefix = "ngraph-0.7.0", build_file = clean_dep("//third_party/ngraph:ngraph.BUILD"), ) -- cgit v1.2.3