Merge branch 'develop' into non_api_change

vshampor · Apr 14, 2023 · b139a70 · b139a70
2 parents 76920e8 + f9d4ca0
commit b139a70
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/.github/workflows/api_changes_check.yml b/.github/workflows/api_changes_check.yml
@@ -31,7 +31,9 @@ jobs:
         id: diff
         run: |
           cd html_build/html/$API_DOC_HTML_ROOT_RELATIVE_PATH
-          echo "changed_files=$(find . -name "*.html" -exec diff -qrBZ {} $GITHUB_WORKSPACE/previous_doc_state/$API_DOC_HTML_ROOT_RELATIVE_PATH/{} \;)" >> $GITHUB_OUTPUT
+          CHANGED_FILES=$(find . -name "*.html" -exec diff -qrBZ {} $GITHUB_WORKSPACE/previous_doc_state/$API_DOC_HTML_ROOT_RELATIVE_PATH/{} \;)
+          echo ${CHANGED_FILES}
+          echo "changed_files=${CHANGED_FILES}" >> $GITHUB_OUTPUT
       - uses: actions-ecosystem/action-add-labels@v1
         if: ${{ steps.diff.outputs.changed_files }} != ""
         with:

diff --git a/docs/api/source/conf.py b/docs/api/source/conf.py
@@ -7,7 +7,6 @@
 
 from sphinx.ext.autodoc import mock
 
-import nncf
 
 sys.path.insert(0, os.path.abspath('../../..'))
 
@@ -41,14 +40,15 @@ def collect_api_entities() -> List[str]:
     :return: A list of fully qualified names of API symbols.
     """
     modules = {}
-    skipped_modules = []
+    skipped_modules = {}  # type: Dict[str, str]
+    import nncf
     for importer, modname, ispkg in pkgutil.walk_packages(path=nncf.__path__,
                                                           prefix=nncf.__name__+'.',
                                                           onerror=lambda x: None):
         try:
             modules[modname] = importlib.import_module(modname)
-        except:
-            skipped_modules.append(modname)
+        except Exception as e:
+            skipped_modules[modname] = str(e)
 
     api_fqns = []
     for modname, module in modules.items():
@@ -62,7 +62,7 @@ def collect_api_entities() -> List[str]:
                         api_fqns.append(f"{modname}.{obj_name}")
 
     print()
-    skipped_str = '\n'.join(skipped_modules)
+    skipped_str = '\n'.join([f"{k}: {v}" for k, v in skipped_modules.items()])
     print(f"Skipped: {skipped_str}\n")
 
     print("API entities:")
@@ -71,7 +71,7 @@ def collect_api_entities() -> List[str]:
     return api_fqns
 
 
-with mock(['torch', 'onnx', 'openvino', 'tensorflow', 'tensorflow_addons']):
+with mock(['torch', 'torchvision', 'onnx', 'onnxruntime', 'openvino', 'tensorflow', 'tensorflow_addons']):
     api_fqns = collect_api_entities()
 
 module_fqns = set()

diff --git a/nncf/torch/__init__.py b/nncf/torch/__init__.py
@@ -17,7 +17,15 @@
 
 import torch
 from pkg_resources import parse_version
-torch_version = parse_version(torch.__version__).base_version
+
+try:
+    _torch_version = torch.__version__
+    torch_version = parse_version(_torch_version).base_version
+except:
+    nncf_logger.debug("Could not parse torch version")
+    _torch_version = '0.0.0'
+    torch_version = parse_version(_torch_version).base_version
+
 if parse_version(BKC_TORCH_VERSION).base_version != torch_version:
     warn_bkc_version_mismatch("torch", BKC_TORCH_VERSION, torch.__version__)