Merge remote-tracking branch 'origin/master' into shrestha/tag_rc3

Author: Shrestha Malik

CMakeLists.txt

@@ -248,7 +248,7 @@ if (NOT USE_PRE_BUILT_NGRAPH)
     ExternalProject_Add(
         ext_ngraph
         GIT_REPOSITORY https://github.com/NervanaSystems/ngraph
-        GIT_TAG v0.27.1-rc.1
+        GIT_TAG v0.28.0-rc.0
         CMAKE_ARGS 
             -DNGRAPH_DISTRIBUTED_ENABLE=${NGRAPH_DISTRIBUTED_ENABLE}
             -DNGRAPH_INSTALL_PREFIX=${NGRAPH_ARTIFACTS_DIR}

README.md

@@ -88,7 +88,7 @@ Once TensorFlow's dependencies are installed, clone the `ngraph-bridge` repo:
 
         git clone https://github.com/tensorflow/ngraph-bridge.git
         cd ngraph-bridge
-        git checkout v0.22.0-rc1
+        git checkout v0.22.0-rc2
 
 Run the following Python script to build TensorFlow, nGraph, and the bridge. Use Python 3.5:
 

bazel/WORKSPACE

@@ -55,11 +55,11 @@ tf_workspace(path_prefix = "", tf_repo_name = "org_tensorflow")
 http_archive(
     name = "ngraph",
     build_file = "//:bazel/ngraph.BUILD",
-    sha256 = "903991dfdb63304bc08bebab68e0fcb3e62690763b886c42178f363a0beb00f4",
-    strip_prefix = "ngraph-0.27.1-rc.1",
+    sha256 = "be59da1e04840b3980d3bcba7925b99ac2007e37e3952ef7c77caedba9734654",
+    strip_prefix = "ngraph-0.28.0-rc.0",
     urls = [
-        "https://mirror.bazel.build/github.com/NervanaSystems/ngraph/archive/v0.27.1-rc.1.tar.gz",
-        "https://github.com/NervanaSystems/ngraph/archive/v0.27.1-rc.1.tar.gz"
+        "https://mirror.bazel.build/github.com/NervanaSystems/ngraph/archive/v0.28.0-rc.0.tar.gz",
+        "https://github.com/NervanaSystems/ngraph/archive/v0.28.0-rc.0.tar.gz"
     ],
 )
 

bazel/ngraph.BUILD

@@ -68,12 +68,13 @@ cc_library(
         "-fstack-protector-all",
         '-D SHARED_LIB_PREFIX=\\"lib\\"',
         '-D SHARED_LIB_SUFFIX=\\".so\\"',
-        '-D NGRAPH_VERSION=\\"v0.27.1-rc.1\\"',
+        '-D NGRAPH_VERSION=\\"v0.28.0-rc.0\\"',
         "-D NGRAPH_DEX_ONLY",
         '-D PROJECT_ROOT_DIR=\\"\\"',
         '-D NGRAPH_STATIC_LIB_ENABLE',
         '-D NGRAPH_DYNAMIC_COMPONENTS_ENABLE',
         '-D NGRAPH_ENABLE_CPU_CONV_AUTO',
+        '-D NGRAPH_USE_LEGACY_MKLDNN',
         "-march=native",
         "-mtune=native",
         "-Wall",
@@ -111,9 +112,10 @@ cc_library(
         "-fstack-protector-all",
         '-D SHARED_LIB_PREFIX=\\"lib\\"',
         '-D SHARED_LIB_SUFFIX=\\".so\\"',
-        '-D NGRAPH_VERSION=\\"v0.27.1-rc.1\\"',
+        '-D NGRAPH_VERSION=\\"v0.28.0-rc.0\\"',
         "-D NGRAPH_DEX_ONLY",
         '-D PROJECT_ROOT_DIR=\\"\\"',
+        '-D NGRAPH_USE_LEGACY_MKLDNN',
     ] + CXX_ABI,
     linkopts = [
         "-Wl,-z,noexecstack",
@@ -270,10 +272,11 @@ cc_library(
         "-fstack-protector-all",
         '-D SHARED_LIB_PREFIX=\\"lib\\"',
         '-D SHARED_LIB_SUFFIX=\\".so\\"',
-        '-D NGRAPH_VERSION=\\"v0.27.1-rc.1\\"',
+        '-D NGRAPH_VERSION=\\"v0.28.0-rc.0\\"',
         "-D NGRAPH_DEX_ONLY",
         '-D PROJECT_ROOT_DIR=\\"\\"',
         '-D NGRAPH_CPU_STATIC_LIB_ENABLE',
+        '-D NGRAPH_USE_LEGACY_MKLDNN=\\"TRUE\\"',
         "-march=native",
         "-mtune=native",
         "-Wall",

build_ngtf.py

@@ -53,7 +53,7 @@ def main():
     '''
 
     # Component versions
-    ngraph_version = "v0.27.1-rc.1"
+    ngraph_version = "v0.28.0-rc.0"
     tf_version = "v1.14.0"
 
     # Command line parser options

python/setup.in.py

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