Merge pull request #191 from tensorflow/sarkars/merge_from_master_to_18

sarkars/Upgrade to 25rc2 (#190)

Author: sayantan-nervana

CMakeLists.txt

@@ -234,7 +234,7 @@ if (NOT USE_PRE_BUILT_NGRAPH)
     ExternalProject_Add(
         ext_ngraph
         GIT_REPOSITORY https://github.com/NervanaSystems/ngraph
-        GIT_TAG v0.25.0-rc.1
+        GIT_TAG v0.25.0-rc.2
         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.18.0-rc0
+        git checkout v0.18.0-rc1
 
 Run the following Python script to build TensorFlow, nGraph, and the bridge. Use Python 3.5:
 

bazel/WORKSPACE

@@ -25,11 +25,11 @@ tf_configure(
 http_archive(
     name = "ngraph",
     build_file = "//:bazel/ngraph.BUILD",
-    sha256 = "6ddba183d354cd70d714423dd6ebaedda0a14021b471a77f2c28d43ab67be46b",
-    strip_prefix = "ngraph-0.25.0-rc.1",
+    sha256 = "54bffb90bb6ed8081d549958368b4eb95b8544ff59bc38a0783e6e8b3e623d48",
+    strip_prefix = "ngraph-0.25.0-rc.2",
     urls = [
-        "https://mirror.bazel.build/github.com/NervanaSystems/ngraph/archive/v0.25.0-rc.1.tar.gz",
-        "https://github.com/NervanaSystems/ngraph/archive/v0.25.0-rc.1.tar.gz"
+        "https://mirror.bazel.build/github.com/NervanaSystems/ngraph/archive/v0.25.0-rc.2.tar.gz",
+        "https://github.com/NervanaSystems/ngraph/archive/v0.25.0-rc.2.tar.gz"
     ],
 )
 

build_ngtf.py

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

ngraph_bridge/version.cc

@@ -32,7 +32,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 "-rc1"
 
 #define VERSION_STR_HELPER(x) #x
 #define VERSION_STR(x) VERSION_STR_HELPER(x)

python/setup.in.py

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