Skip to content

Commit

Permalink
Merge branch 'master' into fix_bf16_convert_model
Browse files Browse the repository at this point in the history
  • Loading branch information
popovaan authored Apr 18, 2024
2 parents 16191ed + cac2777 commit 01dca05
Show file tree
Hide file tree
Showing 47 changed files with 964 additions and 942 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ temp/
CMakeLists.txt.user
docs/IE_PLUGIN_DG/html/
CMakeUserPresets.json
venv

*.project
*.cproject
Expand Down Expand Up @@ -73,4 +74,4 @@ coverage
/src/plugins/intel_cpu/tools/commit_slider/*.json
/src/plugins/intel_cpu/tools/commit_slider/slider_cache/*
/src/plugins/intel_cpu/thirdparty/ComputeLibrary/build/*
.github/GITHUB_OUTPUT
.github/GITHUB_OUTPUT
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -165,4 +165,4 @@ endif()
# provides a callback function to describe each component in repo
include(cmake/packaging/packaging.cmake)

ov_cpack(${OV_CPACK_COMPONENTS_ALL})
ov_cpack(${OV_CPACK_COMPONENTS_ALL})
2 changes: 2 additions & 0 deletions docs/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ function(build_docs)
set(ARTICLES_HELPER_SCRIPT "${SCRIPTS_DIR}/articles_helper.py")
set(COPY_IMAGES_SCRIPT "${SCRIPTS_DIR}/copy_images.py")
set(DOXYGEN_MAPPING_SCRIPT "${SCRIPTS_DIR}/create_mapping.py")
set(DOCS_MAPPING_SCRIPT "${SCRIPTS_DIR}/create_doc_mapping.py")
set(BREATHE_APIDOC_SCRIPT "${SCRIPTS_DIR}/apidoc.py")

# Doxygen/Sphinx setup
Expand Down Expand Up @@ -107,6 +108,7 @@ function(build_docs)
POST_BUILD
COMMAND ${Python3_EXECUTABLE} ${COPY_IMAGES_SCRIPT} ${DOXYGEN_XML_OUTPUT} ${SPHINX_SOURCE_DIR}
COMMAND ${Python3_EXECUTABLE} ${DOXYGEN_MAPPING_SCRIPT} ${DOXYGEN_XML_OUTPUT} ${DOCS_BUILD_DIR} ${OpenVINO_SOURCE_DIR}/../
COMMAND ${Python3_EXECUTABLE} ${DOCS_MAPPING_SCRIPT} ${DOCS_BUILD_DIR} ${ARTICLES_EN_DIR}
COMMAND ${CMAKE_COMMAND} -E copy_directory ${SPHINX_SETUP_DIR} ${SPHINX_SOURCE_DIR}
${post_commands}
VERBATIM)
Expand Down
186 changes: 0 additions & 186 deletions docs/home.rst

This file was deleted.

1 change: 0 additions & 1 deletion docs/index.html

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
import xml.etree.ElementTree as ET
from sphinx_sitemap import setup as base_setup, get_locales, hreflang_formatter
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.util.logging import getLogger

logger = getLogger(__name__)

def setup(app):
app.add_config_value(
Expand All @@ -19,7 +23,9 @@ def 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)
return setup

Expand All @@ -30,11 +36,15 @@ def create_sitemap(app, exception):
urlset = app.builder.config.ov_sitemap_urlset
meta = app.builder.config.ov_sitemap_meta

site_url = app.builder.config.site_url
site_url = site_url.rstrip('/') + '/'
if not site_url:
print("sphinx-sitemap error: no site_url"
"are set in conf.py. Sitemap not built.")
site_url = app.builder.config.site_url or app.builder.config.html_baseurl
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",
)
return
if (not app.sitemap_links):
print("sphinx-sitemap warning: No pages generated for %s" %
Expand All @@ -51,7 +61,7 @@ def create_sitemap(app, exception):
for item in urlset:
root.set(*item)

get_locales(app, exception)
locales = get_locales(app, exception)

if app.builder.config.version:
version = app.builder.config.version + '/'
Expand All @@ -78,7 +88,7 @@ def create_sitemap(app, exception):
ET.SubElement(namespace_element, tag_name).text = tag_value

if len(app.locales) > 0:
for lang in app.locales:
for lang in locales:
lang = lang + '/'
linktag = ET.SubElement(
url,
Expand All @@ -90,10 +100,10 @@ def create_sitemap(app, exception):
lang=lang, version=version, link=link
))

filename = app.outdir + "/" + app.config.sitemap_filename
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))
site_url, filename))
Loading

0 comments on commit 01dca05

Please sign in to comment.