Merge branch 'master' into mvafin/pt_fe/quantize_regular_ops

mvafin · Jul 20, 2023 · bcff971 · bcff971
2 parents b916324 + bc26142
commit bcff971
Show file tree

Hide file tree

Showing 55 changed files with 3,694 additions and 873 deletions.
diff --git a/cmake/developer_package/packaging/common-libraries.cmake b/cmake/developer_package/packaging/common-libraries.cmake
@@ -67,17 +67,6 @@ macro(ov_override_component_names)
     # merge C++ and C runtimes
     set(OV_CPACK_COMP_CORE_C "${OV_CPACK_COMP_CORE}")
     set(OV_CPACK_COMP_CORE_C_DEV "${OV_CPACK_COMP_CORE_DEV}")
-    # merge all pythons into a single component
-    set(OV_CPACK_COMP_PYTHON_OPENVINO "pyopenvino")
-    set(OV_CPACK_COMP_PYTHON_IE_API "${OV_CPACK_COMP_PYTHON_OPENVINO}")
-    set(OV_CPACK_COMP_PYTHON_NGRAPH "${OV_CPACK_COMP_PYTHON_OPENVINO}")
-    # merge all C / C++ samples as a single samples component
-    set(OV_CPACK_COMP_CPP_SAMPLES "samples")
-    set(OV_CPACK_COMP_C_SAMPLES "${OV_CPACK_COMP_CPP_SAMPLES}")
-    # move requirements.txt to core-dev
-    # set(OV_CPACK_COMP_OPENVINO_DEV_REQ_FILES "${OV_CPACK_COMP_CORE_DEV}")
-    # move core_tools to core-dev
-    # set(OV_CPACK_COMP_CORE_TOOLS "${OV_CPACK_COMP_CORE_DEV}")
 endmacro()
 
 ov_override_component_names()
@@ -102,15 +91,14 @@ macro(ov_define_component_include_rules)
     set(OV_CPACK_COMP_PYTHON_SAMPLES_EXCLUDE_ALL EXCLUDE_FROM_ALL)
     # python
     set(OV_CPACK_COMP_PYTHON_OPENVINO_EXCLUDE_ALL EXCLUDE_FROM_ALL)
-    set(OV_CPACK_COMP_PYTHON_IE_API_EXCLUDE_ALL ${OV_CPACK_COMP_PYTHON_OPENVINO_EXCLUDE_ALL})
-    set(OV_CPACK_COMP_PYTHON_NGRAPH_EXCLUDE_ALL ${OV_CPACK_COMP_PYTHON_OPENVINO_EXCLUDE_ALL})
+    set(OV_CPACK_COMP_PYTHON_BENCHMARK_APP_EXCLUDE_ALL ${OV_CPACK_COMP_PYTHON_OPENVINO_EXCLUDE_ALL})
+    set(OV_CPACK_COMP_PYTHON_OVC_EXCLUDE_ALL ${OV_CPACK_COMP_PYTHON_OPENVINO_EXCLUDE_ALL})
     # we don't pack artifacts of setup.py install, because it's called explicitly in conda / brew
     # or not used at all like in cases with conan / vcpkg
     set(OV_CPACK_COMP_PYTHON_OPENVINO_PACKAGE_EXCLUDE_ALL ${OV_CPACK_COMP_PYTHON_OPENVINO_EXCLUDE_ALL})
     # we don't need wheels in package, it's used installed only in open source distribution
     set(OV_CPACK_COMP_PYTHON_WHEELS_EXCLUDE_ALL EXCLUDE_FROM_ALL)
     # tools
-    set(OV_CPACK_COMP_CORE_TOOLS_EXCLUDE_ALL EXCLUDE_FROM_ALL)
     set(OV_CPACK_COMP_OPENVINO_DEV_REQ_FILES_EXCLUDE_ALL EXCLUDE_FROM_ALL)
     set(OV_CPACK_COMP_DEPLOYMENT_MANAGER_EXCLUDE_ALL EXCLUDE_FROM_ALL)
     # scripts

diff --git a/cmake/developer_package/packaging/debian/debian.cmake b/cmake/developer_package/packaging/debian/debian.cmake
@@ -61,17 +61,9 @@ macro(ov_override_component_names)
     # merge C++ and C runtimes
     set(OV_CPACK_COMP_CORE_C "${OV_CPACK_COMP_CORE}")
     set(OV_CPACK_COMP_CORE_C_DEV "${OV_CPACK_COMP_CORE_DEV}")
-    # merge all pythons into a single component
-    set(OV_CPACK_COMP_PYTHON_OPENVINO "pyopenvino")
-    set(OV_CPACK_COMP_PYTHON_IE_API "${OV_CPACK_COMP_PYTHON_OPENVINO}")
-    set(OV_CPACK_COMP_PYTHON_NGRAPH "${OV_CPACK_COMP_PYTHON_OPENVINO}")
     # merge all C / C++ samples as a single samples component
     set(OV_CPACK_COMP_CPP_SAMPLES "samples")
     set(OV_CPACK_COMP_C_SAMPLES "${OV_CPACK_COMP_CPP_SAMPLES}")
-    # move requirements.txt to core-dev
-    # set(OV_CPACK_COMP_OPENVINO_DEV_REQ_FILES "${OV_CPACK_COMP_CORE_DEV}")
-    # move core_tools to core-dev
-    # set(OV_CPACK_COMP_CORE_TOOLS "${OV_CPACK_COMP_CORE_DEV}")
 endmacro()
 
 ov_override_component_names()
@@ -105,14 +97,13 @@ macro(ov_define_component_include_rules)
     else()
         set(OV_CPACK_COMP_PYTHON_OPENVINO_PACKAGE_EXCLUDE_ALL EXCLUDE_FROM_ALL)
     endif()
+    set(OV_CPACK_COMP_PYTHON_BENCHMARK_APP_EXCLUDE_ALL ${OV_CPACK_COMP_PYTHON_OPENVINO_PACKAGE_EXCLUDE_ALL})
+    set(OV_CPACK_COMP_PYTHON_OVC_EXCLUDE_ALL ${OV_CPACK_COMP_PYTHON_OPENVINO_PACKAGE_EXCLUDE_ALL})
     # we don't pack python components itself, we pack artifacts of setup.py install
     set(OV_CPACK_COMP_PYTHON_OPENVINO_EXCLUDE_ALL EXCLUDE_FROM_ALL)
-    set(OV_CPACK_COMP_PYTHON_IE_API_EXCLUDE_ALL ${OV_CPACK_COMP_PYTHON_OPENVINO_EXCLUDE_ALL})
-    set(OV_CPACK_COMP_PYTHON_NGRAPH_EXCLUDE_ALL ${OV_CPACK_COMP_PYTHON_OPENVINO_EXCLUDE_ALL})
     # we don't need wheels in Debian packages
     set(OV_CPACK_COMP_PYTHON_WHEELS_EXCLUDE_ALL EXCLUDE_FROM_ALL)
     # tools
-    set(OV_CPACK_COMP_CORE_TOOLS_EXCLUDE_ALL EXCLUDE_FROM_ALL)
     set(OV_CPACK_COMP_OPENVINO_DEV_REQ_FILES_EXCLUDE_ALL EXCLUDE_FROM_ALL)
     set(OV_CPACK_COMP_DEPLOYMENT_MANAGER_EXCLUDE_ALL EXCLUDE_FROM_ALL)
     # scripts

diff --git a/cmake/developer_package/packaging/nsis.cmake b/cmake/developer_package/packaging/nsis.cmake
@@ -62,13 +62,12 @@ macro(ov_define_component_include_rules)
     unset(OV_CPACK_COMP_C_SAMPLES_EXCLUDE_ALL)
     unset(OV_CPACK_COMP_PYTHON_SAMPLES_EXCLUDE_ALL)
     # python
-    unset(OV_CPACK_COMP_PYTHON_IE_API_EXCLUDE_ALL)
-    unset(OV_CPACK_COMP_PYTHON_NGRAPH_EXCLUDE_ALL)
     unset(OV_CPACK_COMP_PYTHON_OPENVINO_EXCLUDE_ALL)
+    set(OV_CPACK_COMP_PYTHON_BENCHMARK_APP_EXCLUDE_ALL ${OV_CPACK_COMP_PYTHON_OPENVINO_EXCLUDE_ALL})
+    set(OV_CPACK_COMP_PYTHON_OVC_EXCLUDE_ALL ${OV_CPACK_COMP_PYTHON_OPENVINO_EXCLUDE_ALL})
     set(OV_CPACK_COMP_PYTHON_WHEELS_EXCLUDE_ALL EXCLUDE_FROM_ALL)
     set(OV_CPACK_COMP_PYTHON_OPENVINO_PACKAGE_EXCLUDE_ALL EXCLUDE_FROM_ALL)
     # tools
-    unset(OV_CPACK_COMP_CORE_TOOLS_EXCLUDE_ALL)
     unset(OV_CPACK_COMP_OPENVINO_DEV_REQ_FILES_EXCLUDE_ALL)
     unset(OV_CPACK_COMP_DEPLOYMENT_MANAGER_EXCLUDE_ALL)
     # scripts

diff --git a/cmake/developer_package/packaging/packaging.cmake b/cmake/developer_package/packaging/packaging.cmake
@@ -154,13 +154,12 @@ macro(ov_define_component_names)
     set(OV_CPACK_COMP_C_SAMPLES "c_samples")
     set(OV_CPACK_COMP_PYTHON_SAMPLES "python_samples")
     # python
-    set(OV_CPACK_COMP_PYTHON_IE_API "pyie")
-    set(OV_CPACK_COMP_PYTHON_NGRAPH "pyngraph")
     set(OV_CPACK_COMP_PYTHON_OPENVINO "pyopenvino")
+    set(OV_CPACK_COMP_PYTHON_BENCHMARK_APP "benchmark_app")
+    set(OV_CPACK_COMP_PYTHON_OVC "ovc")
     set(OV_CPACK_COMP_PYTHON_OPENVINO_PACKAGE "pyopenvino_package")
     set(OV_CPACK_COMP_PYTHON_WHEELS "python_wheels")
     # tools
-    set(OV_CPACK_COMP_CORE_TOOLS "core_tools")
     set(OV_CPACK_COMP_OPENVINO_DEV_REQ_FILES "openvino_dev_req_files")
     set(OV_CPACK_COMP_DEPLOYMENT_MANAGER "deployment_manager")
     # scripts
@@ -184,15 +183,12 @@ macro(ov_define_component_include_rules)
     unset(OV_CPACK_COMP_C_SAMPLES_EXCLUDE_ALL)
     unset(OV_CPACK_COMP_PYTHON_SAMPLES_EXCLUDE_ALL)
     # python
-    unset(OV_CPACK_COMP_PYTHON_IE_API_EXCLUDE_ALL)
-    unset(OV_CPACK_COMP_PYTHON_NGRAPH_EXCLUDE_ALL)
     unset(OV_CPACK_COMP_PYTHON_OPENVINO_EXCLUDE_ALL)
-    unset(OV_CPACK_COMP_PYTHON_WHEELS_EXCLUDE_ALL)
-    # TODO: think about python entry points
-    # maybe we can create entry points without python interpreter and use it in debian / rpm as well?
+    unset(OV_CPACK_COMP_PYTHON_BENCHMARK_APP_EXCLUDE_ALL)
+    unset(OV_CPACK_COMP_PYTHON_OVC_EXCLUDE_ALL)
     set(OV_CPACK_COMP_PYTHON_OPENVINO_PACKAGE_EXCLUDE_ALL EXCLUDE_FROM_ALL)
+    unset(OV_CPACK_COMP_PYTHON_WHEELS_EXCLUDE_ALL)
     # tools
-    unset(OV_CPACK_COMP_CORE_TOOLS_EXCLUDE_ALL)
     set(OV_CPACK_COMP_OPENVINO_DEV_REQ_FILES_EXCLUDE_ALL EXCLUDE_FROM_ALL)
     unset(OV_CPACK_COMP_DEPLOYMENT_MANAGER_EXCLUDE_ALL)
     # scripts

diff --git a/cmake/developer_package/packaging/rpm/rpm.cmake b/cmake/developer_package/packaging/rpm/rpm.cmake
@@ -56,18 +56,9 @@ macro(ov_override_component_names)
     # merge C++ and C runtimes
     set(OV_CPACK_COMP_CORE_C "${OV_CPACK_COMP_CORE}")
     set(OV_CPACK_COMP_CORE_C_DEV "${OV_CPACK_COMP_CORE_DEV}")
-    # merge all pythons into a single component
-    set(OV_CPACK_COMP_PYTHON_OPENVINO "pyopenvino")
-    set(OV_CPACK_COMP_PYTHON_IE_API "${OV_CPACK_COMP_PYTHON_OPENVINO}")
-    set(OV_CPACK_COMP_PYTHON_NGRAPH "${OV_CPACK_COMP_PYTHON_OPENVINO}")
     # merge all C / C++ samples as a single samples component
     set(OV_CPACK_COMP_CPP_SAMPLES "samples")
     set(OV_CPACK_COMP_C_SAMPLES "${OV_CPACK_COMP_CPP_SAMPLES}")
-    # set(OV_CPACK_COMP_PYTHON_SAMPLES "${OV_CPACK_COMP_CPP_SAMPLES}")
-    # move requirements.txt to core-dev
-    # set(OV_CPACK_COMP_OPENVINO_DEV_REQ_FILES "${OV_CPACK_COMP_CORE_DEV}")
-    # move core_tools to core-dev
-    # set(OV_CPACK_COMP_CORE_TOOLS "${OV_CPACK_COMP_CORE_DEV}")
 endmacro()
 
 ov_override_component_names()
@@ -101,14 +92,13 @@ macro(ov_define_component_include_rules)
     else()
         set(OV_CPACK_COMP_PYTHON_OPENVINO_PACKAGE_EXCLUDE_ALL EXCLUDE_FROM_ALL)
     endif()
+    set(OV_CPACK_COMP_PYTHON_BENCHMARK_APP_EXCLUDE_ALL ${OV_CPACK_COMP_PYTHON_OPENVINO_PACKAGE_EXCLUDE_ALL})
+    set(OV_CPACK_COMP_PYTHON_OVC_EXCLUDE_ALL ${OV_CPACK_COMP_PYTHON_OPENVINO_PACKAGE_EXCLUDE_ALL})
     # we don't pack python components itself, we pack artifacts of setup.py install
     set(OV_CPACK_COMP_PYTHON_OPENVINO_EXCLUDE_ALL EXCLUDE_FROM_ALL)
-    set(OV_CPACK_COMP_PYTHON_IE_API_EXCLUDE_ALL ${OV_CPACK_COMP_PYTHON_OPENVINO_EXCLUDE_ALL})
-    set(OV_CPACK_COMP_PYTHON_NGRAPH_EXCLUDE_ALL ${OV_CPACK_COMP_PYTHON_OPENVINO_EXCLUDE_ALL})
     # we don't need wheels in RPM packages
     set(OV_CPACK_COMP_PYTHON_WHEELS_EXCLUDE_ALL EXCLUDE_FROM_ALL)
     # tools
-    set(OV_CPACK_COMP_CORE_TOOLS_EXCLUDE_ALL EXCLUDE_FROM_ALL)
     set(OV_CPACK_COMP_OPENVINO_DEV_REQ_FILES_EXCLUDE_ALL EXCLUDE_FROM_ALL)
     set(OV_CPACK_COMP_DEPLOYMENT_MANAGER_EXCLUDE_ALL EXCLUDE_FROM_ALL)
     # scripts

diff --git a/docs/_static/css/custom.css b/docs/_static/css/custom.css
@@ -111,28 +111,6 @@ ul#navbar-main-elements > li:hover {
 }
 
 
-/* Footer */
-/* =================================================== */
-footer iframe {
-    background-color: white;
-    width: 100%;
-    border: none;
-    height: 70px;
-}
-
-@media screen and (min-width: 860px) {
-    footer iframe {
-        height: 60px;
-    }
-}
-
-@media screen and (max-width: 596px) {
-    footer iframe {
-        height: 85px;
-    }
-}
-
-
 /* Doc version dropdown formatting override */
 /* =================================================== */
 [aria-labelledby="version-selector"]  {
@@ -1025,8 +1003,8 @@ table#model-accuracy-and-perf-int8-fp32-table td.data {
     box-shadow: 0 0 5px 2px #a8a8a8;
 }
 
-.newsletter-btn,
-.newsletter-btn:focus {
+.newsletter-submit-btn,
+.newsletter-submit-btn:focus {
     background: #cdedff;
     color: rgba(0, 104, 181, 1);
     border: 0;
@@ -1043,19 +1021,19 @@ table#model-accuracy-and-perf-int8-fp32-table td.data {
     outline: none;
 }
 
-.newsletter-btn:hover,
-.newsletter-btn:active {
+.newsletter-submit-btn:hover,
+.newsletter-submit-btn:active {
     background: #00A3F6;
     color: white;
     outline: none;
 }
 
-.newsletter-btn:disabled {
+.newsletter-submit-btn:disabled {
     background: #a8a8a8;
     color: white;
 }
 
-.newsletter-btn:before {
+.newsletter-submit-btn:before {
     font-family: "Font Awesome 5 Free";
     content: "\f0e0\00a0"; 
     font-size: 1rem;
@@ -1140,3 +1118,10 @@ table#model-accuracy-and-perf-int8-fp32-table td.data {
 input:-webkit-autofill {
     -webkit-box-shadow: 0 0 0px 1000px white inset;
 }
+
+
+/* Splide carousel */
+.splide__slide {
+    margin-right: 2rem;
+    overflow: hidden;
+}
diff --git a/docs/_static/css/homepage_style.css b/docs/_static/css/homepage_style.css
@@ -3,6 +3,7 @@
 #openvino-documentation > h1 {
     display: none;
 }
+
 h1 {
     /*font-size: var(--pst-font-size-h2);*/
     /*margin-bottom: 3rem;*/
@@ -13,12 +14,14 @@ h1 {
 #ov-homepage-banner, .openvino-diagram, .ov-homepage-higlight-grid {
     margin-bottom: 90px!important;
 }
+
 #ov-homepage-banner {
     padding: 2rem;
     background-color: #76CEFF;
     background-image: linear-gradient(346deg, #728EFA 0%, #76CEFF 50%, #BBE8BD 100%);
     border-bottom: 5px solid #0068b5;
 }
+
 #ov-homepage-banner p:first-of-type {
     margin-top: 0;
     margin-bottom: 1rem;
@@ -30,64 +33,92 @@ h1 {
     line-height: 1em;
     text-align: left;
 }
+
 #ov-homepage-banner .line-block {
+    line-height: 1.5;
     text-align: left;
     color: #000000;
 }
+
 .ov-homepage-banner-btn {
     transition: 0.7s;
     font-weight: bold;
     background-color: #0068b5;
     color: #ffffff !important;
 }
+
 .ov-homepage-banner-btn:hover {
     background-color: white!important;
     color: var(--sd-color-primary)!important;
 }
+
 #ov-homepage-banner > p:nth-child(3) {
     margin-bottom: 0;
 }
+
+#ov-homepage-banner a,
+#ov-homepage-banner a:visited {
+    text-decoration: none;
+    color: #00A3F6;
+    transition: .7s;
+    font-weight: 600;
+}
+
+#ov-homepage-banner a:hover {
+    color: #653171;
+}
+
 .openvino-diagram {
     width: 65%;
     margin-bottom: 3rem;
 }
+
 @media (max-width: 720px) {
     .openvino-diagram {
         width: 90%;
     }
 }
+
 .ov-homepage-higlight-grid {
     padding: 0;
 }
+
 .ov-homepage-higlight-grid > div {
     justify-content:space-evenly;
     row-gap: 20px;
 }
+
 .ov-homepage-higlight-grid > div > div.sd-col {
     width: 230px;
     min-height: 300px;
     padding: 0;
     margin-inline: 5px;
 }
+
 .ov-homepage-higlight-grid .sd-card {
     box-shadow: 0 0 20px 5px #f3f3f3!important;
     transition: 0.5s;
     overflow: hidden;
 }
+
 .ov-homepage-higlight-grid .sd-card-hover:hover {
     border-color: var(--sd-color-card-border)!important;
     transform: scale(1.00)!important;
 }
+
 .ov-homepage-higlight-grid .sd-shadow-sm:hover {
     box-shadow: 0 0 10px 2px rgba(108,36,240,0.3) !important;
 }
+
 .ov-homepage-higlight-grid .sd-card-title {
     height: 52.781px;
     margin-bottom: 2rem;
 }
+
 .ov-homepage-higlight-grid .sd-card-text {
     font-size: 0.9rem;
 }
+
 .ov-homepage-higlight-grid .sd-card::after {
     align-self: flex-end;
     display: block;
@@ -101,26 +132,32 @@ h1 {
     height: 3rem;
     background-color: #CDEDFF;
 }
+
 .ov-homepage-feature-grid .sd-col {
     padding: 0;
     max-width: 48%;
 }
+
 .ov-homepage-feature-grid .sd-card {
     border: none;
     box-shadow: 0 0 20px 2px #f3f3f3!important;
     /* box-shadow: none!important; */
 }
+
 .ov-homepage-feature-grid .sd-row {
     gap: 1rem;
     justify-content: center;
 }
+
+
 /* =================================================================== */
 /* @media screen and (min-width: 720px) {
     main.col-xl-7.bd-content {
         flex: 0 0 75%!important;
         max-width: 75%!important;
     }
 }*/
+
 @media screen and (max-width: 535px) {
     .ov-homepage-feature-grid .sd-row {
         flex-direction: column;
@@ -129,4 +166,4 @@ h1 {
     .ov-homepage-feature-grid .sd-col {
         max-width: 100%;
     }
-}
+}
diff --git a/docs/_static/html/newsletter.html b/docs/_static/html/newsletter.html
@@ -264,7 +264,7 @@ <h3 class="newsletter-heading">Newsletter</h3>
                 </div>
                 <div class="form-group">
                     <input type="text" class="newsletter-input" name="emailAddress" id="newsletterEmail" placeholder="Enter your email" required>
-                    <button class="newsletter-btn" type="submit">SUBMIT </button>
+                    <button class="newsletter-submit-btn" type="submit">SUBMIT </button>
                 </div>
             </form>
             <div class="message-box animated fade-up"></div>