Publishing 2019 R1.0.1 content

diff --git a/inference-engine/cmake/dependencies.cmake b/inference-engine/cmake/dependencies.cmake
index a541357..d8ae9e1 100644 (file)
--- a/inference-engine/cmake/dependencies.cmake
+++ b/inference-engine/cmake/dependencies.cmake
@@ -100,7 +100,7 @@ elseif(LINUX)
             ENVIRONMENT "TBBROOT")
 else(APPLE)
     RESOLVE_DEPENDENCY(TBB
-            ARCHIVE_MAC "tbb2019_20190130_mac.tgz"
+            ARCHIVE_MAC "tbb2019_20190414_mac.tgz"
             TARGET_PATH "${TEMP}/tbb"
             ENVIRONMENT "TBBROOT"
             VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*")

diff --git a/inference-engine/cmake/features.cmake b/inference-engine/cmake/features.cmake
index b6d2266..054988c 100644 (file)
--- a/inference-engine/cmake/features.cmake
+++ b/inference-engine/cmake/features.cmake
@@ -44,9 +44,15 @@ set (IE_DEBUG_POSTFIX_WIN "d")
 set (IE_RELEASE_POSTFIX_WIN "")
 set (IE_DEBUG_POSTFIX_LIN "")
 set (IE_RELEASE_POSTFIX_LIN "")
+set (IE_DEBUG_POSTFIX_MAC "d")
+set (IE_RELEASE_POSTFIX_MAC "")
+
 if (WIN32)
     set (IE_DEBUG_POSTFIX ${IE_DEBUG_POSTFIX_WIN})
     set (IE_RELEASE_POSTFIX ${IE_RELEASE_POSTFIX_WIN})
+elseif(APPLE)
+    set (IE_DEBUG_POSTFIX ${IE_DEBUG_POSTFIX_MAC})
+    set (IE_RELEASE_POSTFIX ${IE_RELEASE_POSTFIX_MAC})
 else()
     set (IE_DEBUG_POSTFIX ${IE_DEBUG_POSTFIX_LIN})
     set (IE_RELEASE_POSTFIX ${IE_RELEASE_POSTFIX_LIN})
@@ -94,6 +100,8 @@ ie_option (ENABLE_DEBUG_SYMBOLS "generates symbols for debugging" OFF)
 
 ie_option (ENABLE_PYTHON "enables ie python bridge build" OFF)
 
+ie_option (TREAT_WARNING_AS_ERROR "Treat build warnings as errors" ON)
+
 ie_option(ENABLE_CPPLINT "Enable cpplint checks during the build" OFF)
 ie_option(ENABLE_CPPLINT_REPORT "Build cpplint report instead of failing the build" OFF)
 

diff --git a/inference-engine/cmake/share/InferenceEngineConfig.cmake.in b/inference-engine/cmake/share/InferenceEngineConfig.cmake.in
index 860870b..42b2df7 100644 (file)
--- a/inference-engine/cmake/share/InferenceEngineConfig.cmake.in
+++ b/inference-engine/cmake/share/InferenceEngineConfig.cmake.in
@@ -108,6 +108,14 @@ else()
                                             FOUND_VAR INFERENCEENGINE_FOUND
                                             REQUIRED_VARS IE_RELEASE_LIBRARY IE_DEBUG_LIBRARY IE_INCLUDE_DIR
                                             FAIL_MESSAGE "Inference Engine cannot be found at ${_IE_ROOT_LIBRARY}. Please consult InferenceEgnineConfig.cmake module's help page.")
+    elseif (APPLE)
+        find_library(IE_RELEASE_LIBRARY inference_engine@IE_RELEASE_POSTFIX_MAC@ "${IE_LIB_DIR}")
+        find_library(IE_DEBUG_LIBRARY inference_engine@IE_DEBUG_POSTFIX_MAC@ "${IE_LIB_DIR}")
+        find_package_handle_standard_args(  InferenceEngine
+                                            FOUND_VAR INFERENCEENGINE_FOUND
+                                            REQUIRED_VARS IE_RELEASE_LIBRARY IE_DEBUG_LIBRARY IE_INCLUDE_DIR
+                                            FAIL_MESSAGE "Inference Engine cannot be found at ${_IE_ROOT_LIBRARY}. Please consult InferenceEgnineConfig.cmake module's help page.")
+
     else()
         find_library(IE_LIBRARY inference_engine@IE_RELEASE_POSTFIX_LIN@ "${IE_LIB_DIR}")
         find_package_handle_standard_args(  InferenceEngine
@@ -132,6 +140,12 @@ else()
                     MAP_IMPORTED_CONFIG_RELEASE Release
                     MAP_IMPORTED_CONFIG_RELWITHDEBINFO Release
                     INTERFACE_INCLUDE_DIRECTORIES "${IE_INCLUDE_DIR}")
+        elseif (APPLE)
+            set_target_properties(IE::inference_engine PROPERTIES
+                    IMPORTED_LOCATION_RELEASE "${IE_RELEASE_LIBRARY}"
+                    IMPORTED_LOCATION_DEBUG   "${IE_DEBUG_LIBRARY}"
+                    INTERFACE_INCLUDE_DIRECTORIES "${IE_INCLUDE_DIR}")
+            target_link_libraries(IE::inference_engine INTERFACE ${CMAKE_DL_LIBS})
         else()
             set_target_properties(IE::inference_engine PROPERTIES
                     IMPORTED_LOCATION "${IE_LIBRARY}"

diff --git a/inference-engine/samples/calibration_tool/README.md b/inference-engine/samples/calibration_tool/README.md
index 6e07559..da9d3eb 100644 (file)
--- a/inference-engine/samples/calibration_tool/README.md
+++ b/inference-engine/samples/calibration_tool/README.md
@@ -3,6 +3,8 @@
 Inference Engine Calibration Tool calibrates a given FP32 model so that is can be run in low-precision 8-bit integer
 mode while keeping the input data of this model in the original precision.
 
+> **NOTE**: INT8 models are currently supported only by the CPU plugin. For the full list of supported configurations, see the [Supported Devices](./docs/IE_DG/supported_plugins/Supported_Devices.md) topic.
+
 > **NOTE**: By default, Inference Engine samples and demos expect input with BGR channels order. If you trained your model to work with RGB order, you need to manually rearrange the default channels order in the sample or demo application or reconvert your model using the Model Optimizer tool with `--reverse_input_channels` argument specified. For more information about the argument, refer to **When to Specify Input Shapes** section of [Converting a Model Using General Conversion Parameters](./docs/MO_DG/prepare_model/convert_model/Converting_Model_General.md).
 
 ## Calibration Tool Options

diff --git a/inference-engine/samples/validation_app/README.md b/inference-engine/samples/validation_app/README.md
index 11c9ac7..dc6e941 100644 (file)
--- a/inference-engine/samples/validation_app/README.md
+++ b/inference-engine/samples/validation_app/README.md
@@ -157,7 +157,7 @@ The correct way to use such dataset is to specify the path as `-i <path>/dataset
 ### Dataset Format for Object Detection (VOC-like)
 
 Object Detection SSD models can be inferred on the original dataset that was used as a testing dataset during the model training.
-To prepare the VOC dataset, follow the steps below :
+To prepare the VOC dataset, follow the steps below:
 
 1. Download the pre-trained SSD-300 model from the SSD GitHub* repository at
    [https://github.com/weiliu89/caffe/tree/ssd](https://github.com/weiliu89/caffe/tree/ssd).
@@ -167,7 +167,7 @@ To prepare the VOC dataset, follow the steps below :
   $wget http://host.robots.ox.ac.uk/pascal/VOC/voc2007/VOCtest_06-Nov-2007.tar
   tar -xvf VOCtest_06-Nov-2007.tar
   ```
-3. Convert the model with the [Model Optimizer](docs/MO_DG/prepare_model/convert_model/Convert_Model_From_Caffe.md).
+3. Convert the model with the [Model Optimizer](./docs/MO_DG/prepare_model/convert_model/Convert_Model_From_Caffe.md).
 
 4. Create a proper `.txt` class file from the original `labelmap_voc.prototxt`. The new file must be in
 the following format:

diff --git a/inference-engine/src/extension/CMakeLists.txt b/inference-engine/src/extension/CMakeLists.txt
index b0078e2..19e7573 100644 (file)
--- a/inference-engine/src/extension/CMakeLists.txt
+++ b/inference-engine/src/extension/CMakeLists.txt
@@ -16,8 +16,11 @@ if (NOT(IE_MAIN_SOURCE_DIR))
     endif()
 endif()
 
-# treating warnings as errors
 if (WIN32)
+    if (TREAT_WARNING_AS_ERROR)
+        set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX") #treating warnings as errors
+    endif ()
+
     if (${CMAKE_CXX_COMPILER_ID} STREQUAL MSVC)
         set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4251 /wd4275 /wd4267") #disable some warnings
     endif()