Merge branch 'master' into softmax_cross_entropy_loss_for_onnx_fe

Author: AJThePro99

.gitattributes

@@ -67,3 +67,5 @@
 *.svg filter=lfs diff=lfs merge=lfs -text
 .github/scripts/workflow_rerun/tests/data/log_archive_with_error.zip filter=lfs diff=lfs merge=lfs -text
 .github/scripts/workflow_rerun/tests/data/log_archive_wo_error.zip filter=lfs diff=lfs merge=lfs -text
+*.pdf filter=lfs diff=lfs merge=lfs -text
+*.xlsx filter=lfs diff=lfs merge=lfs -text

.github/workflows/build_doc.yml

@@ -14,7 +14,7 @@ permissions: read-all
 
 jobs:
   Build_Doc:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     if: ${{ github.repository_owner == 'openvinotoolkit' }}
     steps:
       - name: Clone OpenVINO

.github/workflows/job_pytorch_models_tests.yml

@@ -22,7 +22,7 @@ permissions: read-all
 jobs:
   PyTorch_Models_Tests:
     name: PyTorch Models tests
-    timeout-minutes: ${{ inputs.model_scope == 'precommit' && 45 || 400 }}
+    timeout-minutes: ${{ inputs.model_scope == 'precommit' && 60 || 400 }}
     runs-on: ${{ inputs.runner }}
     container: ${{ fromJSON(inputs.container) }}
     defaults:

.github/workflows/py_checks.yml

@@ -24,7 +24,7 @@ permissions: read-all
 
 jobs:
   linters:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     if: ${{ github.repository_owner == 'openvinotoolkit' }}
     steps:
       - name: Clone OpenVINO

docs/openvino_custom_sphinx_sitemap/openvino_custom_sphinx_sitemap/__init__.py

@@ -1,127 +1,90 @@
 import xml.etree.ElementTree as ET
 import queue
 from pathlib import Path
-from sphinx_sitemap import setup as base_setup, get_locales, hreflang_formatter, add_html_link, record_builder_type
+from sphinx_sitemap import setup as base_setup, add_html_link, record_builder_type
 from sphinx.util.logging import getLogger
 
 logger = getLogger(__name__)
 
 def setup(app):
-    app.add_config_value(
-        'ov_sitemap_urlset',
-        default=None,
-        rebuild=''
-    )
-    
-    app.add_config_value(
-        'ov_sitemap_meta',
-        default=None,
-        rebuild=''
-    )
+    app.add_config_value('ov_sitemap_urlset', default=None, rebuild='')
+    app.add_config_value('ov_sitemap_meta', default=None, rebuild='')
+    app.connect("builder-inited", record_builder_type)
+    app.connect("html-page-context", add_html_link)
+    app.connect('build-finished', lambda app, exc: create_sitemap(app, exc, ['google', 'coveo']))
 
     setup = base_setup(app)
+
     for listener in app.events.listeners['build-finished']:
         if listener.handler.__name__ == 'create_sitemap':
             app.disconnect(listener.id)
-        
-    app.connect("builder-inited", record_builder_type)
-    app.connect("html-page-context", add_html_link)
-    app.connect('build-finished', create_sitemap)
+    
     app.parallel_safe = True
     app.parallel_read_safe = True
     app.parallel_write_safe = True
     return setup
 
-
-def create_sitemap(app, exception):
-    """Generates the sitemap.xml from the collected HTML page links"""
-
-    urlset = app.builder.config.ov_sitemap_urlset
+def create_sitemap(app, exception, searchers):
     meta = app.builder.config.ov_sitemap_meta
-
     site_url = app.builder.config.site_url
 
     if site_url:
         site_url.rstrip("/") + "/"
     else:
-        logger.warning(
-            "sphinx-sitemap: html_baseurl is required in conf.py." "Sitemap not built.",
-            type="sitemap",
-            subtype="configuration",
-        )
+        logger.warning("sphinx-sitemap: html_baseurl is required in conf.py. Sitemap not built.", type="sitemap", subtype="configuration")
         return
-    if (not app.sitemap_links):
-        print("sphinx-sitemap warning: No pages generated for %s" %
-              app.config.sitemap_filename)
+
+    if not app.sitemap_links:
+        print(f"sphinx-sitemap warning: No pages generated.")
         return
 
-    ET.register_namespace('xhtml', "http://www.w3.org/1999/xhtml")
+    all_links = []
+    while True:
+        try:
+            all_links.append(app.sitemap_links.get_nowait())
+        except queue.Empty:
+            break
 
-    root = ET.Element("urlset")
+    unique_links = set(all_links)
 
-    if not urlset:
-        root.set("xmlns", "http://www.sitemaps.org/schemas/sitemap/0.9")
-    else:
-        for item in urlset:
-            root.set(*item)
+    for searcher in searchers:
+        ET.register_namespace('xhtml', "http://www.w3.org/1999/xhtml")
+        namespaces = {"xmlns": "http://www.sitemaps.org/schemas/sitemap/0.9"}
 
-    locales = get_locales(app)
+        if searcher == "coveo":
+            namespaces["xmlns:coveo"] = "https://www.coveo.com/en/company/about-us"
 
-    if app.builder.config.version:
-        version = app.builder.config.version + '/'
-    else:
-        version = ""
+        root = ET.Element("urlset", namespaces)
+        version = app.builder.config.version + '/' if app.builder.config.version else ""
 
-    unique_links = set()
-    while True:
-        try:
-            link = app.env.app.sitemap_links.get_nowait()  # type: ignore
-            if link in unique_links:
-                continue
-            unique_links.add(link)
-        except queue.Empty:
-            break
+        for link in unique_links:
+            url = ET.SubElement(root, "url")
+            lang = app.builder.config.language + "/" if app.builder.config.language else ""
+            scheme = app.config.sitemap_url_scheme
+            ET.SubElement(url, "loc").text = site_url + scheme.format(lang=lang, version=version, link=link)
+
+            if searcher == "coveo":
+                process_coveo_meta(meta, url, link)
+            elif searcher == "google":
+                from datetime import datetime
+                today_date = datetime.now().strftime('%Y-%m-%d')
+                ET.SubElement(url, "lastmod").text = today_date
+                ET.SubElement(url, "changefreq").text = "monthly"
+                ET.SubElement(url, "priority").text = "0.5"
+
+        filename = Path(app.outdir) / f"sitemap_{searcher}.xml"
+        ET.ElementTree(root).write(filename, xml_declaration=True, encoding='utf-8', method="xml")
+        print(f"sitemap_{searcher}.xml was generated for URL {site_url} in {filename}")
 
-        url = ET.SubElement(root, "url")
-        
-        if app.builder.config.language:
-            lang = app.builder.config.language + "/"
-        else:
-            lang = ""
-
-        scheme = app.config.sitemap_url_scheme 
-        ET.SubElement(url, "loc").text = site_url + scheme.format(
-            lang=lang, version=version, link=link
-        )
-
-        process_coveo_meta(meta, url, link)
-
-        for lang in locales:
-            lang = lang + "/"
-            ET.SubElement(
-                url,
-                "{http://www.w3.org/1999/xhtml}link",
-                rel="alternate",
-                hreflang=hreflang_formatter(lang.rstrip("/")),
-                href=site_url + scheme.format(lang=lang, version=version, link=link),
-            )
-
-    filename = Path(app.outdir) / app.config.sitemap_filename
-    ET.ElementTree(root).write(filename,
-                               xml_declaration=True,
-                               encoding='utf-8',
-                               method="xml")
-    print("%s was generated for URL %s in %s" % (app.config.sitemap_filename,
-          site_url, filename))
 
 def process_coveo_meta(meta, url, link):
     if not meta:
         return
-
+    
     for namespace, values in meta:
         namespace_element = ET.SubElement(url, namespace)
         loc_element = url.find("loc")
-
+        
         for tag_name, tag_value in values.items():
             if tag_name == 'ovdoctype':
                 ET.SubElement(namespace_element, tag_name).text = process_link(link)
@@ -140,24 +103,18 @@ def extract_categories(link):
     segments = path.split('/')[1:]
     if segments and segments[-1].endswith('.html'):
         segments = segments[:-1]
-
     if segments:
         segments = segments[1:]
-
     if segments and '.' in segments[0]:
         year, *rest = segments[0].split('.')
         if year.isdigit() and len(year) == 4:
             segments[0] = year
-
     segments = [format_segment(segment) for segment in segments]
-
     if segments:
         hierarchy = ['|'.join(segments[:i]) for i in range(1, len(segments) + 1)]
         return ';'.join(hierarchy)
-    
     return "No category"
 
 def format_segment(segment):
     if segment == 'c_cpp_api': segment = 'C/C++_api'
-
     return ' '.join(word.capitalize() for word in segment.replace('-', ' ').replace('_', ' ').split())