From b85cb9b3b6fcd830fbf8d2b9e6bf333cb247c79b Mon Sep 17 00:00:00 2001 From: Sayantan Sarkar Date: Tue, 30 Jul 2019 18:53:59 -0700 Subject: [PATCH 1/2] Upgrade to ngcore24 --- CMakeLists.txt | 2 +- README.md | 2 +- bazel/WORKSPACE | 8 ++++---- build_ngtf.py | 2 +- ngraph_bridge/version.cc | 2 +- python/setup.in.py | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f3b00b0d8..91bd72ab2 100644 --- a/CMakeLists.txt +++ b/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.24.0-rc.2 + GIT_TAG v0.24.0 CMAKE_ARGS -DNGRAPH_DISTRIBUTED_ENABLE=${NGRAPH_DISTRIBUTED_ENABLE} -DNGRAPH_INSTALL_PREFIX=${NGRAPH_ARTIFACTS_DIR} diff --git a/README.md b/README.md index 217787693..24d2b9668 100644 --- a/README.md +++ b/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.17.0-rc2 + git checkout v0.17.0-rc3 Run the following Python script to build TensorFlow, nGraph, and the bridge. Use Python 3.5: diff --git a/bazel/WORKSPACE b/bazel/WORKSPACE index 20600872d..617a3ec78 100644 --- a/bazel/WORKSPACE +++ b/bazel/WORKSPACE @@ -25,11 +25,11 @@ tf_configure( http_archive( name = "ngraph", build_file = "//:bazel/ngraph.BUILD", - sha256 = "fba0fb45225c6eb068cfea16decdcef6d0e1552ab2d5f90f4940fa1059e60481", - strip_prefix = "ngraph-0.24.0-rc.2", + sha256 = "19788f421416a74659d7b38ef9d777baf4d935881b11cb1598629bc0ea16d99b", + strip_prefix = "ngraph-0.24.0", urls = [ - "https://mirror.bazel.build/github.com/NervanaSystems/ngraph/archive/v0.24.0-rc.2.tar.gz", - "https://github.com/NervanaSystems/ngraph/archive/v0.24.0-rc.2.tar.gz" + "https://mirror.bazel.build/github.com/NervanaSystems/ngraph/archive/v0.24.0.tar.gz", + "https://github.com/NervanaSystems/ngraph/archive/v0.24.0.tar.gz" ], ) diff --git a/build_ngtf.py b/build_ngtf.py index d06f65417..5f86a20f9 100755 --- a/build_ngtf.py +++ b/build_ngtf.py @@ -53,7 +53,7 @@ def main(): ''' # Component versions - ngraph_version = "v0.24.0-rc.2" + ngraph_version = "v0.24.0" tf_version = "v1.14.0" # Command line parser options diff --git a/ngraph_bridge/version.cc b/ngraph_bridge/version.cc index c16ea6e4f..f90bb18ea 100644 --- a/ngraph_bridge/version.cc +++ b/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 "-rc2" +#define NG_TF_VERSION_SUFFIX "-rc3" #define VERSION_STR_HELPER(x) #x #define VERSION_STR(x) VERSION_STR_HELPER(x) diff --git a/python/setup.in.py b/python/setup.in.py index 296775f5a..b40555c68 100644 --- a/python/setup.in.py +++ b/python/setup.in.py @@ -59,7 +59,7 @@ def get_tag(self): setup( name='ngraph_tensorflow_bridge', - version='0.17.0rc2', + version='0.17.0rc3', description='Intel nGraph compiler and runtime for TensorFlow', long_description=long_description, long_description_content_type="text/markdown", From 21b3bd938a1a58b9f78b164922ae62469fc0d21a Mon Sep 17 00:00:00 2001 From: Sayantan Sarkar Date: Thu, 1 Aug 2019 11:31:23 -0700 Subject: [PATCH 2/2] Fix README --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 24d2b9668..e10fd0512 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,7 @@ environment. The requirements for building nGraph bridge are identical to the requirements for building TensorFlow from source. For more information, review the [TensorFlow configuration] details. -##### Prepare you build environment +##### Prepare your build environment Install the following requirements before building `nGraph-bridge`. @@ -115,7 +115,7 @@ To use the `ngraph-tensorflow-bridge`, activate the following `virtualenv` to st source build_cmake/venv-tf-py3/bin/activate -Alternatively, you can also install the TensorFlow and nGraph bridge outside of a `virtualenv`. The Python `whl` files are located in the `build_cmake/artifacts/` and `build_cmake/artifats/tensorflow` directories, respectively. +Alternatively, you can also install the TensorFlow and nGraph bridge outside of a `virtualenv`. The Python `whl` files are located in the `build_cmake/artifacts/` and `build_cmake/artifacts/tensorflow` directories, respectively. Select the help option of `build_ngtf.py` script to learn more about various build options and how to build other backends. @@ -219,7 +219,7 @@ results = sess.run(output_operation.outputs[0], { elapsed = time.time() - start print('Time elapsed: %f seconds' % elapsed) ``` -Observe that the ouput time runs faster than TensorFlow native (i.e., without nGraph). +Observe that the output time runs faster than TensorFlow native (i.e., without nGraph). #### Add additional backends