Preparation for Release 0.10 (#388)

* Added support for using pre-built binaries
* Added a target_build option to specify the target flags to be used for building the s/w.
* Refactored the test_ngtf.py to be able to use the functions from outside
* Added testing with resnet50 training and inference models
* Added -j <num_cores>
* Updated the version number to v0.10.0-rc0.

Author: avijit-nervana

CMakeLists.txt

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

README.md

@@ -84,7 +84,7 @@ The installation prerequisites are the same as described in the TensorFlow
 
         git clone https://github.com/NervanaSystems/ngraph-tf.git
         cd ngraph-tf
-        git checkout v0.9.0
+        git checkout v0.10.0
 
 
 2. Next run the following Python script to build TensorFlow, nGraph and the bridge:

build_ngtf.py

@@ -14,6 +14,7 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 # ==============================================================================
+
 import argparse
 from argparse import RawTextHelpFormatter
 
@@ -305,6 +306,9 @@ def build_ngraph_tf(artifacts_location, ngtf_src_loc, venv_dir, cmake_flags, ver
     os.chdir(os.path.join("python", "dist"))
     ngtf_wheel_files = glob.glob("ngraph_tensorflow_bridge-*.whl")
     if (len(ngtf_wheel_files) != 1):
+        print("Multiple Python whl files exist. Please remove old wheels")
+        for whl in nnp_wheel_files:
+            print(whl)
         raise Exception("Error getting the ngraph-tf wheel file")
 
     output_wheel = ngtf_wheel_files[0]
@@ -372,6 +376,11 @@ def main():
         help="Display verbose error messages\n",
         action="store_true")
 
+    parser.add_argument(
+        '--target_arch',
+        help="Architecture flag to use (e.g., haswell, core-avx2 etc. Default \'native\'\n",
+    )
+
     parser.add_argument(
         '--use_prebuilt_binaries',
         help="Skip building nGraph and TensorFlow. Rather use \"build\" directory.\n" + 
@@ -406,7 +415,7 @@ def main():
     #-------------------------------
 
     # Component versions
-    ngraph_version = "v0.11.0"
+    ngraph_version = "v0.12.0-rc.0"
     tf_version = "v1.12.0"
 
     # Default directories
@@ -441,10 +450,13 @@ def main():
         # Setup the virtual env
         setup_venv(venv_dir)
 
-    #target_arch = 'native'
-    #if (platform.system() != 'Darwin'):
-    target_arch = 'core-avx2'
+    target_arch = 'native'
+    if (arguments.target_arch):
+        target_arch = arguments.target_arch
+
+    print("Target Arch: %s" % target_arch)
 
+    cxx_abi = 0
     if not use_prebuilt_binaries:
         # Download TensorFlow
         download_repo("tensorflow",
@@ -453,11 +465,13 @@ def main():
 
         # Build TensorFlow
         build_tensorflow(venv_dir, "tensorflow", artifacts_location, target_arch, verbosity)
+
+        # Install tensorflow
+        cxx_abi = install_tensorflow(venv_dir, artifacts_location)
     else:
         print("Skipping the TensorFlow build")
-
-    # Install tensorflow
-    cxx_abi = install_tensorflow(venv_dir, artifacts_location)
+        import tensorflow as tf
+        cxx_abi = tf.__cxx11_abi_flag__
 
     if not use_prebuilt_binaries:
         # Download nGraph

python/setup.in.py

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

src/version.cc

@@ -21,13 +21,13 @@
 // nGraph-TensorFlow bridge uses semantic versioning: see http://semver.org/
 
 #define NG_TF_MAJOR_VERSION 0
-#define NG_TF_MINOR_VERSION 9
+#define NG_TF_MINOR_VERSION 10
 #define NG_TF_PATCH_VERSION 0
 
 // The version suffix is used for pre-release version numbers
 // For example before v0.7.0 we may do a pre-release i.e., a release
 // candidate such as v0.7.0-rc0
-#define NG_TF_VERSION_SUFFIX ""
+#define NG_TF_VERSION_SUFFIX "-rc0"
 
 #define VERSION_STR_HELPER(x) #x
 #define VERSION_STR(x) VERSION_STR_HELPER(x)