New release prep (#496)

* New release prep

* Added recursive copy of the include directory and fixed a typo

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.17.0-rc.1
+        GIT_TAG v0.18.0-rc.1
         CMAKE_ARGS 
             -DNGRAPH_DISTRIBUTED_ENABLE=${NGRAPH_DISTRIBUTED_ENABLE}
             -DNGRAPH_INSTALL_PREFIX=${NGRAPH_ARTIFACTS_DIR}

README.md

@@ -47,8 +47,8 @@ a variety of nGraph-enabled backends: CPU, GPU, and custom silicon like the
 This will produce something like this:
 
         TensorFlow version:  1.13.1
-        nGraph bridge version: b'0.12.0-rc4'
-        nGraph version used for this build: b'0.17.0-rc.1+045b71e'
+        nGraph bridge version: b'0.12.0-rc5'
+        nGraph version used for this build: b'0.18.0-rc.1+55e1e17'
         TensorFlow version used for this build: v1.13.1-0-g6612da8951
         CXX11_ABI flag used for this build: 1
 

bazel/WORKSPACE

@@ -25,11 +25,11 @@ tf_configure(
 http_archive(
     name = "ngraph",
     build_file = "//:bazel/ngraph.BUILD",
-    sha256 = "517f2430ab1434021c2c4e3daf6f52cc855e4134632ed7c517a2c9c4b2c28f6b",
-    strip_prefix = "ngraph-0.17.0-rc.1",
+    sha256 = "8a0618901d96e016684fb9dc2b2e29fb648e5b32085bfbc6cc24b152bab5e8aa",
+    strip_prefix = "ngraph-0.18.0-rc.1",
     urls = [
-        "https://mirror.bazel.build/github.com/NervanaSystems/ngraph/archive/v0.17.0-rc.1.tar.gz",
-        "https://github.com/NervanaSystems/ngraph/archive/v0.17.0-rc.1.tar.gz",
+        "https://mirror.bazel.build/github.com/NervanaSystems/ngraph/archive/v0.18.0-rc.1.tar.gz",
+        "https://github.com/NervanaSystems/ngraph/archive/v0.18.0-rc.1.tar.gz",
     ],
 )
 

build_ngtf.py

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

python/CreatePipWhl.cmake

@@ -47,8 +47,10 @@ if (PYTHON)
     file(GLOB NGRAPH_LIB_FILES "${NGTF_INSTALL_DIR}/${LIB_SUFFIX}/lib*")
 
     # Copy the ngraph_bridge include from install
+    message(STATUS "NGTF_INSTALL_DIR: ${NGTF_INSTALL_DIR}")
+    
     file(
-        COPY "${NGTF_INSTALL_DIR}/include" 
+        COPY "${NGRAPH_INSTALL_DIR}/include" 
         DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/python/ngraph_bridge"
     )
 

python/setup.in.py

@@ -39,7 +39,7 @@ def get_tag(self):
 
 setup( 
     name='ngraph_tensorflow_bridge',
-    version='0.12.0rc4',
+    version='0.12.0rc5',
     description='Intel nGraph compiler and runtime for TensorFlow',
     long_description=long_description,
     long_description_content_type="text/markdown",
@@ -52,7 +52,7 @@ def get_tag(self):
     package_data=
     {
         'ngraph_bridge': [
-            "include/ngraph/*",
+            "include/ngraph/**/*",
             @ngraph_libraries@ @license_files@ @licence_top_level@
         ],
     },

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 "-rc4"
+#define NG_TF_VERSION_SUFFIX "-rc5"
 
 #define VERSION_STR_HELPER(x) #x
 #define VERSION_STR(x) VERSION_STR_HELPER(x)