Merge branch 'master' into r0.14

Author: avijit-nervana

CMakeLists.txt

@@ -239,7 +239,7 @@ if (NOT USE_PRE_BUILT_NGRAPH)
     ExternalProject_Add(
         ext_ngraph
         GIT_REPOSITORY https://github.com/NervanaSystems/ngraph
-        GIT_TAG v0.19.0
+        GIT_TAG v0.19.1
         CMAKE_ARGS 
             -DNGRAPH_DISTRIBUTED_ENABLE=${NGRAPH_DISTRIBUTED_ENABLE}
             -DNGRAPH_INSTALL_PREFIX=${NGRAPH_ARTIFACTS_DIR}

README.md

@@ -89,7 +89,7 @@ The installation prerequisites are the same as described in the TensorFlow
 
         git clone https://github.com/tensorflow/ngraph-bridge.git
         cd ngraph-bridge
-        git checkout v0.12.0
+        git checkout v0.14.0
 
 
 2. Next run the following Python script to build TensorFlow, nGraph and the bridge. Please use Python 3.5:
@@ -119,12 +119,12 @@ with nGraph backends. Please note that you can also install the TensorFlow and n
 
    This will produce something like this:
 
-        TensorFlow version:  <1.13.1>
-        nGraph bridge version: <b'0.14.0-rc0'>
-        nGraph version used for this build: <b'0.18.0+c5d52f1'>
-        TensorFlow version used for this build: <v1.13.1-0-g6612da8951>
+        TensorFlow version:  1.13.1
+        nGraph bridge version: b'0.14.0-rc0'
+        nGraph version used for this build: b'0.19.1+1cbad22'
+        TensorFlow version used for this build: v1.13.1-0-g6612da8951
         CXX11_ABI flag used for this build: 0
-        nGraph bridge built with Grappler: False
+        nGraph bridge built with Grappler: True
         nGraph bridge built with Variables and Optimizers Enablement: False
 
     Note: The version of the ngraph-tensorflow-bridge is not going to be exactly the same as when you build from source. This is due to delay in the source release and publishing the corresponding Python wheel. 

bazel/WORKSPACE

@@ -25,11 +25,11 @@ tf_configure(
 http_archive(
     name = "ngraph",
     build_file = "//:bazel/ngraph.BUILD",
-    sha256 = "41f8aae60d79a9d96b3db852c5594e843fcd1bbc2fe5bfe6a947fdbaf518a7e3",
-    strip_prefix = "ngraph-0.19.0",
+    sha256 = "b81fdfed63028d7e7ba91b85950d57974e1151e37bbf894cde757b583f09181c",
+    strip_prefix = "ngraph-0.19.1",
     urls = [
-        "https://mirror.bazel.build/github.com/NervanaSystems/ngraph/archive/v0.19.0.tar.gz",
-        "https://github.com/NervanaSystems/ngraph/archive/v0.19.0.tar.gz"
+        "https://mirror.bazel.build/github.com/NervanaSystems/ngraph/archive/v0.19.1.tar.gz",
+        "https://github.com/NervanaSystems/ngraph/archive/v0.19.1.tar.gz"
     ],
 )
 

bazel/ngraph.BUILD

@@ -37,6 +37,7 @@ cc_library(
         "src/ngraph/descriptor/layout/*.cpp",
         "src/ngraph/op/*.cpp",
         "src/ngraph/op/fused/*.cpp",
+        "src/ngraph/op/experimental/batch_mat_mul.cpp",
         "src/ngraph/op/experimental/dyn_broadcast.cpp",
         "src/ngraph/op/experimental/dyn_pad.cpp",
         "src/ngraph/op/experimental/dyn_reshape.cpp",
@@ -97,6 +98,7 @@ cc_binary(
         "src/ngraph/except.hpp",
         "src/ngraph/runtime/interpreter/*.cpp",
         "src/ngraph/state/rng_state.cpp",
+        "src/ngraph/runtime/hybrid/hybrid_tensor.cpp",
         "src/ngraph/runtime/hybrid/hybrid_backend.cpp",
         "src/ngraph/runtime/hybrid/hybrid_backend.hpp",
         "src/ngraph/runtime/hybrid/hybrid_executable.cpp",

build_ngtf.py

@@ -24,7 +24,7 @@ def main():
     '''
 
     # Component versions
-    ngraph_version = "v0.19.0"
+    ngraph_version = "v0.19.1"
     tf_version = "v1.13.1"
 
     # Command line parser options

python/setup.in.py

@@ -59,7 +59,7 @@ def get_tag(self):
 
 setup( 
     name='ngraph_tensorflow_bridge',
-    version='0.14.0rc0',
+    version='0.14.0',
     description='Intel nGraph compiler and runtime for TensorFlow',
     long_description=long_description,
     long_description_content_type="text/markdown",

src/ngraph_builder.cc

@@ -95,7 +95,8 @@ std::shared_ptr<TOpType> ConstructNgNode(const std::string& op_name,
                                          TArg&&... Args) {
   auto ng_node = std::make_shared<TOpType>(std::forward<TArg>(Args)...);
   ng_node->set_friendly_name(op_name);
-  ng_node->add_provenance_tag(op_name);
+  // Fails for now, so commenting out for now
+  // ng_node->add_provenance_tag(op_name);
   return ng_node;
 }
 
@@ -2238,7 +2239,7 @@ static Status TranslateLogSoftmaxOp(
   shared_ptr<ng::Node> ng_inp;
   TF_RETURN_IF_ERROR(GetInputNodes(ng_op_map, op, &ng_inp));
   auto inp_shape = ng_inp->get_shape();
-  int rank = inp_shape.size();
+  size_t rank = inp_shape.size();
   auto ng_axis = ng::AxisSet{rank - 1};
   // Batch i, class j
   // logsoftmax[i, j] = logits[i, j] - log(sum(exp(logits[i])))

src/version.cc

@@ -30,7 +30,7 @@
 // candidate such as v0.7.0-rc0
 // The code in master will always have the last released version number
 // with a suffix of '-master'
-#define NG_TF_VERSION_SUFFIX "-rc0"
+#define NG_TF_VERSION_SUFFIX ""
 
 #define VERSION_STR_HELPER(x) #x
 #define VERSION_STR(x) VERSION_STR_HELPER(x)

tools/test_utils.py

@@ -396,7 +396,7 @@ def run_resnet50_from_artifacts(ngraph_tf_src_dir, artifact_dir, batch_size,
         '--model=resnet50', '--batch_size=' + str(batch_size), '--num_batches',
         str(iterations), '--eval', '--eval_dir=' + eval_eventlog_dir
     ]
-    command_executor(cmd)
+    command_executor(cmd, True)
 
     os.chdir(root_pwd)