Merge pull request openvinotoolkit#3 from openvinotoolkit/master

Update forked branch

.ci/azure/linux.yml

@@ -30,6 +30,8 @@ jobs:
     WORK_DIR: $(Pipeline.Workspace)/_w
     BUILD_DIR: $(WORK_DIR)/build
     BIN_DIR: $(REPO_DIR)/bin/intel64/$(BUILD_TYPE)
+    INSTALL_DIR: $(WORK_DIR)/install_pkg
+    SETUPVARS: $(INSTALL_DIR)/bin/setupvars.sh
 
   steps:
   - script: |
@@ -52,10 +54,10 @@ jobs:
     displayName: 'System info'
 
   - script: |
-      echo TargetBranch: $(System.PullRequest.TargetBranch)
-      echo SourceBranch: $(Build.SourceBranch)
       rm -rf $(WORK_DIR) ; mkdir $(WORK_DIR)
       rm -rf $(BUILD_DIR) ; mkdir $(BUILD_DIR)
+      echo TargetBranch: $(System.PullRequest.TargetBranch)
+      echo SourceBranch: $(Build.SourceBranch)
     displayName: 'Make dir'
 
   - checkout: self
@@ -112,6 +114,10 @@ jobs:
   - script: ls -alR $(REPO_DIR)/bin/
     displayName: 'List files'
 
+  - script: cmake -DCMAKE_INSTALL_PREFIX=$(INSTALL_DIR) -P cmake_install.cmake
+    workingDirectory: $(BUILD_DIR)
+    displayName: 'Install'
+
   - script: $(BIN_DIR)/unit-test --gtest_print_time=1 --gtest_filter=-backend_api.config_unsupported:*IE_GPU* --gtest_output=xml:TEST-NGraphUT.xml
     displayName: 'nGraph UT'
     continueOnError: false

.ci/azure/mac.yml

@@ -30,6 +30,8 @@ jobs:
     WORK_DIR: $(Pipeline.Workspace)/_w
     BUILD_DIR: $(WORK_DIR)/build
     BIN_DIR: $(REPO_DIR)/bin/intel64/$(BUILD_TYPE)
+    INSTALL_DIR: $(WORK_DIR)/install_pkg
+    SETUPVARS: $(INSTALL_DIR)/bin/setupvars.sh
 
   steps:
   - script: |
@@ -99,6 +101,10 @@ jobs:
   - script: ls -alR $(REPO_DIR)/bin/
     displayName: 'List files'
 
+  - script: cmake -DCMAKE_INSTALL_PREFIX=$(INSTALL_DIR) -P cmake_install.cmake
+    workingDirectory: $(BUILD_DIR)
+    displayName: 'Install'
+
   - script: $(BIN_DIR)/unit-test --gtest_print_time=1 --gtest_filter=-backend_api.config_unsupported:*IE_GPU*:IE_CPU.onnx_model_sigmoid --gtest_output=xml:TEST-NGraphUT.xml
     displayName: 'nGraph UT'
     continueOnError: false

.ci/azure/windows.yml

@@ -33,6 +33,8 @@ jobs:
     MSVS_VARS_PATH: C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat
     MSVC_COMPILER_PATH: C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Tools\MSVC\14.24.28314\bin\Hostx64\x64\cl.exe
     TEST_ENV_PATH: $(REPO_DIR)\inference-engine\temp\tbb\bin;$(REPO_DIR)\inference-engine\temp\opencv_4.5.1\opencv\bin;%PATH%
+    INSTALL_DIR: $(WORK_DIR)\install_pkg
+    SETUPVARS: $(INSTALL_DIR)\bin\setupvars.bat
 
   steps:
   - script: |
@@ -103,6 +105,10 @@ jobs:
   - script: dir $(REPO_DIR)\bin\ /s
     displayName: 'List files'
 
+  - script: cmake -DCMAKE_INSTALL_PREFIX=$(INSTALL_DIR) -P cmake_install.cmake
+    workingDirectory: $(BUILD_DIR)
+    displayName: 'Install'
+
   - script: |
       set PATH=$(TEST_ENV_PATH)
       $(BIN_DIR)\unit-test --gtest_print_time=1 --gtest_filter=-backend_api.config_unsupported:*IE_GPU* --gtest_output=xml:TEST-NGraphUT.xml

cmake/developer_package/IEDevScriptsConfig.cmake

@@ -46,13 +46,7 @@ endif()
 function(set_temp_directory temp_variable source_tree_dir)
     if (DEFINED ENV{DL_SDK_TEMP} AND NOT $ENV{DL_SDK_TEMP} STREQUAL "")
         message(STATUS "DL_SDK_TEMP environment is set : $ENV{DL_SDK_TEMP}")
-
-        if (WIN32)
-            string(REPLACE "\\" "\\\\" temp $ENV{DL_SDK_TEMP})
-        else()
-            set(temp $ENV{DL_SDK_TEMP})
-        endif()
-
+        file(TO_CMAKE_PATH $ENV{DL_SDK_TEMP} temp)
         if (ENABLE_ALTERNATIVE_TEMP)
             set(ALTERNATIVE_PATH ${source_tree_dir}/temp)
         endif()

cmake/developer_package/compile_flags/os_flags.cmake

@@ -271,6 +271,7 @@ else()
     ie_add_compiler_flags(-fdiagnostics-show-option)
     ie_add_compiler_flags(-Wundef)
     ie_add_compiler_flags(-Wreturn-type)
+    ie_add_compiler_flags(-Wunused-variable)
 
     # Disable noisy warnings
 

cmake/developer_package/message.cmake

@@ -11,12 +11,17 @@ if(UNIX AND ENABLE_ERROR_HIGHLIGHT)
 
         list(GET ARGV 0 MessageType)
         list(REMOVE_AT ARGV 0)
+
+        foreach(arg IN LISTS ARGV)
+            set(_msg "${_msg}${arg}")
+        endforeach()
+
         if(MessageType STREQUAL FATAL_ERROR OR MessageType STREQUAL SEND_ERROR)
-            _message(${MessageType} "${RED}${ARGV}${RESET}")
+            _message(${MessageType} "${RED}${_msg}${RESET}")
         elseif(MessageType STREQUAL WARNING)
-            _message(${MessageType} "${YELLOW}${ARGV}${RESET}")
+            _message(${MessageType} "${YELLOW}${_msg}${RESET}")
         else()
-            _message(${MessageType} "${ARGV}")
+            _message(${MessageType} "${_msg}")
         endif()
     endfunction()
 endif()

docs/CMakeLists.txt

@@ -3,6 +3,10 @@
 #
 
 if(NOT ENABLE_DOCKER)
+    if(CMAKE_COMPILER_IS_GNUCXX)
+        ie_add_compiler_flags(-Wall)
+    endif()
+
     add_subdirectory(snippets)
 
     # Detect nGraph

docs/MO_DG/prepare_model/customize_model_optimizer/Customize_Model_Optimizer.md

@@ -735,7 +735,8 @@ to enable or disable execution of the transformation during a model conversion.
 2. Attribute `id` specifies a unique transformation string identifier. This transformation identified can be used to
 enable (disable) the transformation by setting environment variable `MO_ENABLED_TRANSFORMS` (`MO_DISABLED_TRANSFORMS`)
 with a comma separated list of `id`s. The environment variables override the value of the `enabled` attribute of the
-transformation. Optional attribute.
+transformation. Instead of using `id` attribute value you can add fully defined class name to `MO_ENABLED_TRANSFORMS` 
+(`MO_DISABLED_TRANSFORMS`) variable, `extensions.back.NonmalizeToNormalizeL2.NormalizeToNormalizeL2` for example. Optional attribute.
 3. Attribute `run_not_recursively` specifies whether the transformation should be executed in the sub-graphs, for
 example, body of the [TensorIterator](../../../ops/infrastructure/TensorIterator_1.md) and
 [Loop](../../../ops/infrastructure/Loop_5.md). Default value is `True`.

docs/nGraph_DG/nGraphTransformation.md

@@ -253,6 +253,13 @@ To eliminate operation, nGraph has special method that considers all limitations
 `replace_output_update_name` in case of successful replacement it automatically preserves friendly name and runtime info.
   
 
+## Transformation conditional compilation 
+
+Transformation library has two internal macros to support conditional compilation feature.
+
+* `MATCHER_SCOPE(region)` - allows to disable the MatcherPass if matcher isn't used. The region name should be unique. This macro creates a local variable `matcher_name` which you should use as a matcher name.
+* `RUN_ON_FUNCTION_SCOPE(region)` - allows to disable run_on_function pass if it isn't used. The region name should be unique.
+
 ## Transformation writing essentials <a name="transformation_writing_essentials"></a>
 
 When developing a transformation, you need to follow these transformation rules:

docs/ops/pooling/MaxPool_1.md

@@ -67,7 +67,7 @@
 
 **Inputs**:
 
-*   **1**: 4D or 5D input tensor. Required.
+*   **1**: 3D, 4D or 5D input tensor. Required.
 
 **Mathematical Formulation**
 

docs/ops/reduction/ReduceMean_1.md

@@ -33,12 +33,11 @@
 
 **Detailed Description**
 
-Each element in the output is the result of reduction with finding the arithmetic mean operation along dimensions specified by the 2nd input:
+Each element in the output is the result of arithmetic mean reduction operation along dimensions specified by the 2nd input:
 
     output[i0, i1, ..., iN] = mean[j0,..., jN](x[j0, ..., jN]))
 
-Where indices i0, ..., iN run through all valid indices for the 1st input and finding the arithmetic mean `mean[j0, ..., jN]` have `jk = ik` for those dimensions `k` that are not in the set of indices specified by the 2nd input of the operation. 
-Corner cases:
+Where indices i0, ..., iN run through all valid indices for the 1st input and finding the arithmetic mean `mean[j0, ..., jN]` have `jk = ik` for those dimensions `k` that are not in the set of indices specified by the 2nd input of the operation. Corner cases:
 
 1. When the 2nd input is an empty list, then this operation does nothing, it is an identity. 
 2. When the 2nd input contains all dimensions of the 1st input, this means that a single reduction value is calculated for entire input tensor. 

docs/ops/sort/TopK_1.md

@@ -32,6 +32,14 @@
   * **Default value**: None
   * **Required**: *yes*
 
+* *index_element_type*
+
+  * **Description**: the type of output tensor with indices
+  * **Range of values**: "i64" or "i32"
+  * **Type**: string
+  * **Default value**: "i32"
+  * **Required**: *No*
+
 **Inputs**:
 
 *   **1**: Arbitrary tensor. Required.

docs/snippets/CMakeLists.txt

@@ -54,4 +54,12 @@ if(NGRAPH_ONNX_IMPORT_ENABLE)
     target_link_libraries(${TARGET_NAME} PRIVATE onnx_importer)
 endif()
 
-target_link_libraries(${TARGET_NAME} PRIVATE inference_engine_plugin_api ngraph inference_engine_transformations)
+if(NOT MSVC)
+    target_compile_options(${TARGET_NAME} PRIVATE -Wno-unused-variable)
+    if(CMAKE_COMPILER_IS_GNUCXX)
+        target_compile_options(${TARGET_NAME} PRIVATE -Wno-unused-but-set-variable)
+    endif()
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE inference_engine_plugin_api
+    ngraph inference_engine_transformations)

docs/snippets/MULTI3.cpp

@@ -8,7 +8,7 @@ int main() {
     auto cnnNetwork = ie.ReadNetwork("sample.xml");
     std::string allDevices = "MULTI:";
     std::vector<std::string> myriadDevices = ie.GetMetric("MYRIAD", METRIC_KEY(AVAILABLE_DEVICES));
-    for (int i = 0; i < myriadDevices.size(); ++i) {
+    for (size_t i = 0; i < myriadDevices.size(); ++i) {
         allDevices += std::string("MYRIAD.")
                                 + myriadDevices[i]
                                 + std::string(i < (myriadDevices.size() -1) ? "," : "");

docs/template_plugin/CMakeLists.txt

@@ -11,6 +11,10 @@ set(IE_MAIN_TEMPLATE_PLUGIN_SOURCE_DIR ${InferenceEngineTemplatePlugin_SOURCE_DI
 
 find_package(InferenceEngineDeveloperPackage REQUIRED)
 
+if(CMAKE_COMPILER_IS_GNUCXX)
+    ie_add_compiler_flags(-Wall)
+endif()
+
 add_subdirectory(src)
 
 if(ENABLE_TESTS)