Release 1.0.1 (openvinotoolkit#205)

* Updated OCM for FakeQuantMinMaxVars type conditions (openvinotoolkit#195)

* Add clone and cd steps on the top (openvinotoolkit#194)

* Memory usage fix for directory of images (openvinotoolkit#192)

* GPU_FP16 is added into CheckBackends (openvinotoolkit#190)

* GPU_FP16 is added into CheckBackends

* Update the count for number of devices

Co-authored-by: Chandrakant Khandelwal <chandrakant.khandelwal@intel.com>

* Add image tagging option in examples (openvinotoolkit#193)

* Added image tagging

* Update rename user options in code and readme

* Update readme for image rename example

* Update OVTF version string (openvinotoolkit#196)

* Update code based on scan reports (openvinotoolkit#199)

* Revert subprocess check_output to Popen

* Revert Popen to check_output in test_utils

Co-authored-by: Suryaprakash Shanmugam <suryaprakash.shanmugam@intel.com>

* Refactor code & Bug fixes (openvinotoolkit#200)

* Revert change in build script that was causing OV build to fail (openvinotoolkit#202)

* Add note for macOS Python3.6 support (openvinotoolkit#204)

Co-authored-by: Chandrakant Khandelwal <chandrakant.khandelwal@intel.com>
Co-authored-by: Aditya Sanivarapu <adityax.sanivarapu@intel.com>
Co-authored-by: Mustafa Cavus <mustafa.cavus@intel.com>
Co-authored-by: pratiksha123507 <pratikshax.bapusaheb.vanse@intel.com>

Author: 5 people

README.md

@@ -18,7 +18,7 @@ This repository contains the source code of **OpenVINO™ integration with Tenso
 ### Prerequisites
 
 - Ubuntu 18.04, 20.04 or macOS 11.2.3
-- Python* 3.6, 3.7, 3.8 or 3.9
+- Python* 3.6<sup>1</sup>, 3.7, 3.8 or 3.9
 - TensorFlow* v2.5.1
 
 Check our [Interactive Installation Table](https://openvinotoolkit.github.io/openvino_tensorflow/) for a menu of installation options. The table will help you configure the installation process.
@@ -52,7 +52,7 @@ To see if **OpenVINO™ integration with TensorFlow** is properly installed, run
 This should produce an output like:
 
         TensorFlow version:  2.5.1
-        OpenVINO integration with TensorFlow version: b'1.0.0'
+        OpenVINO integration with TensorFlow version: b'1.0.1'
         OpenVINO version used for this build: b'2021.4.1'
         TensorFlow version used for this build: v2.5.1
         CXX11_ABI flag used for this build: 0
@@ -97,3 +97,5 @@ We will review your contribution as soon as possible. If any additional fixes or
 
 ---
 \* Other names and brands may be claimed as the property of others.
+
+<sup>1</sup> Python 3.6 support is available only for Ubuntu

README_cn.md

@@ -53,7 +53,7 @@
 它会生成以下输出：
 
         TensorFlow version:  2.5.1
-        OpenVINO integration with TensorFlow version: b'1.0.0'
+        OpenVINO integration with TensorFlow version: b'1.0.1'
         OpenVINO version used for this build: b'2021.4.1'
         TensorFlow version used for this build: v2.5.1
         CXX11_ABI flag used for this build: 0

build_ov.py

@@ -38,13 +38,13 @@ def main():
 
     if not os.path.isdir(arguments.output_dir):
         os.makedirs(arguments.output_dir)
-    assert os.path.exists(
-        arguments.output_dir), "path doesn't exist {0}".format(
-            arguments.output_dir)
+    if not os.path.exists(arguments.output_dir):
+        raise AssertionError("Path doesn't exist {0}".format(
+            arguments.output_dir))
     os.chdir(arguments.output_dir)
-    assert os.path.exists(
-        arguments.output_dir), "Directory doesn't exist {0}".format(
-            arguments.output_dir)
+    if not os.path.exists(arguments.output_dir):
+        raise AssertionError("Directory doesn't exist {0}".format(
+            arguments.output_dir))
     if not os.path.isdir(os.path.join(arguments.output_dir, "openvino")):
         # Download OpenVINO
         download_repo(
@@ -54,19 +54,19 @@ def main():
             submodule_update=True)
     else:
         pwd = os.getcwd()
-        assert os.path.exists(
-            arguments.output_dir), "path doesn't exist {0}".format(
-                arguments.output_dir)
+        if not os.path.exists(arguments.output_dir):
+            raise AssertionError("Path doesn't exist {0}".format(
+                arguments.output_dir))
         os.chdir(os.path.join(arguments.output_dir, "openvino"))
         call(["git", "fetch"])
         command_executor(["git", "checkout", openvino_version])
         call(["git", "pull"])
-        assert os.path.exists(pwd), "Path doesn't exist {0}".format(pwd)
+        if not os.path.exists(pwd):
+            raise AssertionError("Path doesn't exist {0}".format(pwd))
         os.chdir(pwd)
-    assert os.path.exists(
-        os.path.join(arguments.output_dir,
-                     "openvino")), "Path doesn't exist {0}/openvino".format(
-                         arguments.output_dir)
+    if not os.path.exists(os.path.join(arguments.output_dir, "openvino")):
+        raise AssertionError("Path doesn't exist {0}/openvino".format(
+            arguments.output_dir))
     openvino_src_dir = os.path.join(arguments.output_dir, "openvino")
     print("OV_SRC_DIR: ", openvino_src_dir)
 
@@ -98,4 +98,4 @@ def main():
     # ./build_ovtf.py --use_openvino_from_location /prebuilt/ov/dir/artifacts/openvino
     # cd ..; mkdir ovtf_2; cd ovtf_2
     # git clone https://github.com/openvinotoolkit/openvino_tensorflow.git
-    # ./build_ovtf.py --use_openvino_from_location /prebuilt/ov/dir/artifacts/openvino
+    # ./build_ovtf.py --use_openvino_from_location /prebuilt/ov/dir/artifacts/openvino

build_ovtf.py

@@ -52,7 +52,7 @@ def main():
 
     # Component versions
     tf_version = "v2.5.1"
-    ovtf_version = "v1.0.0"
+    ovtf_version = "v1.0.1"
     use_intel_tf = False
 
     # Command line parser options
@@ -163,10 +163,11 @@ def main():
     arguments = parser.parse_args()
 
     if arguments.cxx11_abi_version == "1" and not arguments.build_tf_from_source:
-        assert (tf_version == arguments.tf_version), (
-            "Currently ABI1 Tensorflow %s wheel is unavailable. " %
-            arguments.tf_version +
-            "Please consider adding --build_tf_from_source")
+        if not (tf_version == arguments.tf_version):
+            raise AssertionError(
+                "Currently ABI1 Tensorflow %s wheel is unavailable. " %
+                arguments.tf_version +
+                "Please consider adding --build_tf_from_source")
 
     # Update the build time tensorflow version with the user specified version
     tf_version = arguments.tf_version
@@ -186,55 +187,65 @@ def main():
     # Default directories
     build_dir = arguments.build_dir
 
-    assert not (
-        arguments.use_tensorflow_from_location != '' and
-        arguments.build_tf_from_source), (
+    if (arguments.use_tensorflow_from_location != '' and
+            arguments.build_tf_from_source):
+        raise AssertionError(
             "\"use_tensorflow_from_location\" and \"build_tf_from_source\" "
             "cannot be used together.")
-
-    assert not (arguments.openvino_version not in [
-        "2021.4.1", "2021.4", "2021.3", "2021.2"
-    ]), (
-        "Only 2021.2, 2021.3, 2021.4 and 2021.4.1 OpenVINO versions are supported"
-    )
+    if (arguments.openvino_version not in [
+            "2021.4.1", "2021.4", "2021.3", "2021.2"
+    ]):
+        raise AssertionError(
+            "Only 2021.2, 2021.3, 2021.4 and 2021.4.1 OpenVINO versions are supported"
+        )
 
     if arguments.use_openvino_from_location != '':
+        if not os.path.isdir(arguments.use_openvino_from_location):
+            raise AssertionError("Path doesn't exist {0}".format(
+                arguments.use_openvino_from_location))
         ver_file = arguments.use_openvino_from_location + \
                       '/deployment_tools/inference_engine/version.txt'
-        assert os.path.exists(ver_file), "Path doesn't exist {0}".format(
-            ver_file)
+        if not os.path.exists(ver_file):
+            raise AssertionError("Path doesn't exist {0}".format(ver_file))
         with open(ver_file) as f:
             line = f.readline()
-            assert line.find(arguments.openvino_version) != -1, "OpenVINO version " + \
-                arguments.openvino_version + \
-                " does not match the version specified in use_openvino_from_location"
+            if not line.find(arguments.openvino_version) != -1:
+                raise AssertionError("OpenVINO version " + \
+                 arguments.openvino_version + \
+                    " does not match the version specified in use_openvino_from_location")
 
     version_check((not arguments.build_tf_from_source),
                   (arguments.use_tensorflow_from_location != ''),
                   arguments.disable_cpp_api)
 
     if arguments.use_tensorflow_from_location != '':
         # Check if the prebuilt folder has necessary files
-        assert os.path.isdir(
-            arguments.use_tensorflow_from_location
-        ), "Prebuilt TF path " + arguments.use_tensorflow_from_location + " does not exist"
+        if not os.path.isdir(arguments.use_tensorflow_from_location):
+            raise AssertionError("Prebuilt TF path " +
+                                 arguments.use_tensorflow_from_location +
+                                 " does not exist")
         loc = arguments.use_tensorflow_from_location + '/artifacts/tensorflow'
-        assert os.path.isdir(
-            loc), "Could not find artifacts/tensorflow directory"
+        if not os.path.isdir(loc):
+            raise AssertionError(
+                "Could not find artifacts/tensorflow directory")
         found_whl = False
         found_libtf_fw = False
         found_libtf_cc = False
-        assert os.path.exists(loc), "Path doesn't exist {0}".format(loc)
+        if not os.path.exists(loc):
+            raise AssertionError("Path doesn't exist {0}".format(loc))
         for i in os.listdir(loc):
             if '.whl' in i:
                 found_whl = True
             if 'libtensorflow_cc' in i:
                 found_libtf_cc = True
             if 'libtensorflow_framework' in i:
                 found_libtf_fw = True
-        assert found_whl, "Did not find TF whl file"
-        assert found_libtf_fw, "Did not find libtensorflow_framework"
-        assert found_libtf_cc, "Did not find libtensorflow_cc"
+        if not found_whl:
+            raise AssertionError("Did not find TF whl file")
+        if not found_libtf_fw:
+            raise AssertionError("Did not find libtensorflow_framework")
+        if not found_libtf_cc:
+            raise AssertionError("Did not find libtensorflow_cc")
 
     try:
         os.makedirs(build_dir)
@@ -246,8 +257,8 @@ def main():
     openvino_tf_src_dir = os.path.abspath(pwd)
     print("OVTF SRC DIR: " + openvino_tf_src_dir)
     build_dir_abs = os.path.abspath(build_dir)
-    assert os.path.exists(build_dir_abs), "Directory doesn't exist {}".format(
-        build_dir_abs)
+    if not os.path.exists(build_dir_abs):
+        raise AssertionError("Directory doesn't exist {}".format(build_dir_abs))
     os.chdir(build_dir)
 
     venv_dir = 'venv-tf-py3'
@@ -256,12 +267,13 @@ def main():
         artifacts_location = os.path.abspath(arguments.artifacts_dir)
 
     artifacts_location = os.path.abspath(artifacts_location)
-    print("ARTIFACTS location: " + artifacts_location)
 
     #If artifacts doesn't exist create
     if not os.path.isdir(artifacts_location):
         os.mkdir(artifacts_location)
 
+    print("ARTIFACTS location: " + artifacts_location)
+
     #install virtualenv
     install_virtual_env(venv_dir)
 
@@ -275,8 +287,6 @@ def main():
     if (arguments.target_arch):
         target_arch = arguments.target_arch
 
-    print("Target Arch: %s" % target_arch)
-
     # The cxx_abi flag is translated to _GLIBCXX_USE_CXX11_ABI
     # For gcc older than 5.3, this flag is set to 0 and for newer ones,
     # this is set to 1
@@ -293,26 +303,28 @@ def main():
         # The tf whl should be in use_tensorflow_from_location/artifacts/tensorflow
         tf_whl_loc = os.path.abspath(arguments.use_tensorflow_from_location +
                                      '/artifacts/tensorflow')
-        assert os.path.exists(tf_whl_loc), "path doesn't exist {0}".format(
-            tf_whl_loc)
+        if not os.path.exists(tf_whl_loc):
+            raise AssertionError("path doesn't exist {0}".format(tf_whl_loc))
         possible_whl = [i for i in os.listdir(tf_whl_loc) if '.whl' in i]
-        assert len(
-            possible_whl
-        ) == 1, "Expected one TF whl file, but found " + len(possible_whl)
+        if not len(possible_whl) == 1:
+            raise AssertionError("Expected one TF whl file, but found " +
+                                 len(possible_whl))
         # Make sure there is exactly 1 TF whl
         tf_whl = os.path.abspath(tf_whl_loc + '/' + possible_whl[0])
-        assert os.path.isfile(tf_whl), "Did not find " + tf_whl
+        if not os.path.isfile(tf_whl):
+            raise AssertionError("Did not find " + tf_whl)
         # Install the found TF whl file
         command_executor(["pip", "install", "--force-reinstall", "-U", tf_whl])
         tf_cxx_abi = get_tf_cxxabi()
 
-        assert (arguments.cxx11_abi_version == tf_cxx_abi), (
-            "Desired ABI version and user built tensorflow library provided with "
-            "use_tensorflow_from_location are incompatible")
+        if not (arguments.cxx11_abi_version == tf_cxx_abi):
+            raise AssertionError(
+                "Desired ABI version and user built tensorflow library provided with "
+                "use_tensorflow_from_location are incompatible")
 
         cwd = os.getcwd()
-        assert os.path.exists(tf_whl_loc), "Path doesn't exist {0}".format(
-            tf_whl_loc)
+        if not os.path.exists(tf_whl_loc):
+            raise AssertionError("Path doesn't exist {0}".format(tf_whl_loc))
         os.chdir(tf_whl_loc)
         tf_in_artifacts = os.path.join(
             os.path.abspath(artifacts_location), "tensorflow")
@@ -324,11 +336,11 @@ def main():
         tf_version = get_tf_version()
         copy_tf_to_artifacts(tf_version, tf_in_artifacts, tf_whl_loc,
                              use_intel_tf)
-        assert os.path.exists(cwd), "Path doesn't exist {0}".format(cwd)
+        if not os.path.exists(cwd):
+            raise AssertionError("Path doesn't exist {0}".format(cwd))
         os.chdir(cwd)
     else:
         if not arguments.build_tf_from_source:
-            print("Using TensorFlow version", tf_version)
             print("Install TensorFlow")
 
             if arguments.cxx11_abi_version == "0":
@@ -342,43 +354,49 @@ def main():
                 if tags.interpreter == "cp36":
                     command_executor([
                         "pip", "install", "--force-reinstall",
-                        "https://github.com/openvinotoolkit/openvino_tensorflow/releases/download/v1.0.0/tensorflow_abi1-2.5.1-cp36-cp36m-manylinux2010_x86_64.whl"
+                        "https://github.com/openvinotoolkit/openvino_tensorflow/releases/download/v1.0.1/tensorflow_abi1-2.5.1-cp36-cp36m-manylinux2010_x86_64.whl"
                     ])
                 if tags.interpreter == "cp37":
                     command_executor([
                         "pip", "install", "--force-reinstall",
-                        "https://github.com/openvinotoolkit/openvino_tensorflow/releases/download/v1.0.0/tensorflow_abi1-2.5.1-cp37-cp37m-manylinux2010_x86_64.whl"
+                        "https://github.com/openvinotoolkit/openvino_tensorflow/releases/download/v1.0.1/tensorflow_abi1-2.5.1-cp37-cp37m-manylinux2010_x86_64.whl"
                     ])
                 if tags.interpreter == "cp38":
                     command_executor([
                         "pip", "install", "--force-reinstall",
-                        "https://github.com/openvinotoolkit/openvino_tensorflow/releases/download/v1.0.0/tensorflow_abi1-2.5.1-cp38-cp38-manylinux2010_x86_64.whl"
+                        "https://github.com/openvinotoolkit/openvino_tensorflow/releases/download/v1.0.1/tensorflow_abi1-2.5.1-cp38-cp38-manylinux2010_x86_64.whl"
+                    ])
+                if tags.interpreter == "cp39":
+                    command_executor([
+                        "pip", "install", "--force-reinstall",
+                        "https://github.com/openvinotoolkit/openvino_tensorflow/releases/download/v1.0.1/tensorflow_abi1-2.5.1-cp39-cp39-manylinux2010_x86_64.whl"
                     ])
-
                 # ABI 1 TF required latest numpy
                 command_executor(
                     ["pip", "install", "--force-reinstall", "-U numpy"])
 
             tf_cxx_abi = get_tf_cxxabi()
 
-            assert (arguments.cxx11_abi_version == tf_cxx_abi), (
-                "Desired ABI version and tensorflow library installed with "
-                "pip are incompatible")
+            if not (arguments.cxx11_abi_version == tf_cxx_abi):
+                raise AssertionError(
+                    "Desired ABI version and tensorflow library installed with "
+                    "pip are incompatible")
 
             tf_src_dir = os.path.join(artifacts_location, "tensorflow")
             print("TF_SRC_DIR: ", tf_src_dir)
             # Download TF source for enabling TF python tests
             pwd_now = os.getcwd()
-            assert os.path.exists(
-                artifacts_location), "Path doesn't exist {0}".format(
-                    artifacts_location)
+            if not os.path.exists(artifacts_location):
+                raise AssertionError(
+                    "Path doesn't exist {0}".format(artifacts_location))
             os.chdir(artifacts_location)
             print("DOWNLOADING TF: PWD", os.getcwd())
             download_repo("tensorflow",
                           "https://github.com/tensorflow/tensorflow.git",
                           tf_version)
-            assert os.path.exists(pwd_now), "Path doesn't exist {0}".format(
-                pwd_now)
+            print("Using TensorFlow version", tf_version)
+            if not os.path.exists(pwd_now):
+                raise AssertionError("Path doesn't exist {0}".format(pwd_now))
             os.chdir(pwd_now)
             # Finally, copy the libtensorflow_framework.so to the artifacts
             if (tf_version.startswith("v1.") or (tf_version.startswith("1."))):
@@ -396,8 +414,9 @@ def main():
             tf_lib_file = os.path.join(tf_lib_dir, tf_fmwk_lib_name)
             print("SYSCFG LIB: ", tf_lib_file)
             dst_dir = os.path.join(artifacts_location, "tensorflow")
-            assert os.path.exists(
-                dst_dir), "Directory doesn't exist {0}".format(dst_dir)
+            if not os.path.exists(dst_dir):
+                raise AssertionError(
+                    "Directory doesn't exist {0}".format(dst_dir))
             if not os.path.isdir(dst_dir):
                 os.mkdir(dst_dir)
             dst = os.path.join(dst_dir, tf_fmwk_lib_name)
@@ -532,11 +551,11 @@ def main():
                                   openvino_tf_cmake_flags, verbosity)
 
     # Make sure that the openvino_tensorflow whl is present in the artfacts directory
-    assert os.path.exists(artifacts_location), "Path not found {}".format(
-        artifacts_location)
-    assert os.path.isfile(os.path.join(
-        artifacts_location,
-        ov_tf_whl)), "Cannot locate nGraph whl in the artifacts location"
+    if not os.path.exists(artifacts_location):
+        raise AssertionError("Path not found {}".format(artifacts_location))
+    if not os.path.isfile(os.path.join(artifacts_location, ov_tf_whl)):
+        raise AssertionError(
+            "Cannot locate nGraph whl in the artifacts location")
     if not os.path.isfile(os.path.join(artifacts_location, ov_tf_whl)):
         raise Exception("Cannot locate nGraph whl in the artifacts location")
 
@@ -578,8 +597,8 @@ def main():
         command_executor(['ln', '-sf', link_src, link_dst], verbose=True)
 
     # Run a quick test
-    assert os.path.exists(artifacts_location), "Path doesn't exist {}".format(
-        artifacts_location)
+    if not os.path.exists(artifacts_location):
+        raise AssertionError("Path doesn't exist {}".format(artifacts_location))
     install_openvino_tf(tf_version, venv_dir,
                         os.path.join(artifacts_location, ov_tf_whl))