Drop 14.1

Author: smarcink

CMakeLists.txt

@@ -406,6 +406,13 @@ mark_as_advanced(CLDNN__INCLUDE_CORE)
 
 # ======================================================================================================
 
+# Include and build: Serialization feature of clDNN framework.
+set(CLDNN__INCLUDE_SERIALIZATION ON CACHE BOOL "Include and build: clDNN serialization feature.")
+mark_as_advanced(CLDNN__INCLUDE_SERIALIZATION)
+
+# ======================================================================================================
+
+
 # Include and build: Kernel selector for clDNN framework.
 set(CLDNN__INCLUDE_KERNEL_SELECTOR ON CACHE BOOL "Include and build: clDNN kernel selector.")
 mark_as_advanced(CLDNN__INCLUDE_KERNEL_SELECTOR)
@@ -613,6 +620,9 @@ set(Boost_USE_STATIC_LIBS    ON)
 set(Boost_USE_DEBUG_RUNTIME  ON)
 set(Boost_USE_STATIC_RUNTIME ${CLDNN__COMPILE_LINK_USE_STATIC_RUNTIME})
 set(CLDNN__BOOST_USAGE system date_time program_options filesystem)
+if(CLDNN__INCLUDE_SERIALIZATION)
+  list(APPEND CLDNN__BOOST_USAGE serialization)
+endif()
 find_package(Boost "${CLDNN__BOOST_VERSION}" EXACT REQUIRED
       COMPONENTS ${CLDNN__BOOST_USAGE}
     )
@@ -722,6 +732,7 @@ message(STATUS "[clDNN]  - boost ver. used to build:          ${CLDNN__BOOST_VER
 message(STATUS "[clDNN]")
 message(STATUS "[clDNN]  - Include/Build cldnn core:          ${CLDNN__INCLUDE_CORE}")
 message(STATUS "[clDNN]  - Include/Build kernel selector:     ${CLDNN__INCLUDE_KERNEL_SELECTOR}")
+message(STATUS "[clDNN]  - Include/Build serialization:       ${CLDNN__INCLUDE_SERIALIZATION}")
 message(STATUS "[clDNN]  - Include/Build tests:               ${CLDNN__INCLUDE_TESTS}")
 message(STATUS "[clDNN]  - Include/Build core internal tests: ${CLDNN__INCLUDE_CORE_INTERNAL_TESTS}")
 message(STATUS "[clDNN]  - Include/Build tutorial:            ${CLDNN__INCLUDE_TUTORIAL}")
@@ -882,6 +893,7 @@ foreach(__CLDNN_CompilerFlagName IN ITEMS "CMAKE_CXX_FLAGS" "CMAKE_C_FLAGS")
             SET_RAW
             "/arch:SSE2"
             "/sdl"
+			"/bigobj"
         )
       else()
         intel_config_flag_apply_settings(
@@ -890,6 +902,7 @@ foreach(__CLDNN_CompilerFlagName IN ITEMS "CMAKE_CXX_FLAGS" "CMAKE_C_FLAGS")
                 ALL_PATTERN ""
                 SET_RAW
                 "/sdl"
+				"/bigobj"
             )
       endif()
     endif()

README.md

@@ -45,6 +45,17 @@ You can find more information [here](https://software.intel.com/en-us/openvino-t
 
 ## Changelog
 
+### Drop 14.1
+    New features:
+    - network serialization
+    - 3D support for: Acitvation, Reorder, Eltwise, Reshape, Deconvolution
+    Bug fixes:
+    - concatenation fix for different input formats
+    UX:
+    - added 2019.4 intel ocl icd
+    - refactored bfyx_f16 format
+    - added i32 and i64 support for select primitive
+
 ### Drop 14.0
     New features:
     - 3 spatial dimensions support in convolution primitive (3D convolution)

api/C/cldnn.h

@@ -213,7 +213,6 @@ typedef enum /*:int32_t*/
     cldnn_build_option_tuning_config,           ///< Tuning config.
     cldnn_build_option_graph_dumps_dir,         ///< Specifies a directory to which stages of network compilation should be dumped.
     cldnn_build_option_serialization,           ///< Specifies a name of files to which serialization should be dumped.
-    cldnn_build_option_load_program,            ///< Specifies a name of load_program process.
     cldnn_build_option_learning_config,         ///< User defined learning parameters.
     cldnn_build_option_detection_output_gpu     ///< Run detection output layer always on GPU, regardless performance
 } cldnn_build_option_type;
@@ -280,7 +279,6 @@ typedef enum /*:int32_t*/
     cldnn_format_o_i_yx_i16_o16,///< format used for blocked convolution
     cldnn_format_os_iyx_osv16,  ///< format used only for convolution weights: os - output feature maps slice, i - input feature maps, yx - spatials, sv16 - 16 values of single slice.
                                 ///< \n \image html os_iyx_osv16.jpg
-    cldnn_format_oiyx_o16,      ///< format used only for convolution weights: os - output feature maps slice, i - input feature maps, yx - spatials, sv16 - 16 values of single slice.
     cldnn_format_os_iyx_osv32,  ///< format used only for convolution weights: os - output feature maps slice, i - input feature maps, yx - spatials, sv32 - 32 values of single slice.
     cldnn_format_os_iyx_osv64,  ///< format used only for convolution weights: os - output feature maps slice, i - input feature maps, yx - spatials, sv64 - 64 values of single slice.
     cldnn_format_bs_xs_xsv8_bsv8, ///< format used only for fully connected weights: bs - batch slice, xs - x slice, bsv8 - 8 values of single slice.
@@ -649,6 +647,11 @@ CLDNN_API void cldnn_get_event_profiling_info(cldnn_event event, cldnn_profiling
 /// @param[in] options_num Number of elements in the @p options array.
 CLDNN_API cldnn_program cldnn_build_program(cldnn_engine engine, cldnn_topology topology, cldnn_build_option* options, size_t options_num, cldnn_status* status);
 
+/// @brief Builds executable program based on the one serialized to file.
+/// @param[in] engine The engine which will be used to build the program.
+/// @param[in] file_name The base name of files from which program will be build.
+CLDNN_API cldnn_program cldnn_build_serialized_program(cldnn_engine engine, const char* file_name, const char* dump_path, cldnn_status* status);
+
 /// @brief Increment reference counter for the program object.
 CLDNN_API void cldnn_retain_program(cldnn_program program, cldnn_status* status);
 
@@ -666,6 +669,11 @@ CLDNN_API void cldnn_release_program(cldnn_program program, cldnn_status* status
 /// @param[in] options_num Number of elements in the @p options array.
 CLDNN_API        cldnn_network cldnn_build_network(cldnn_engine engine, cldnn_topology topology, cldnn_build_option* options, size_t options_num, cldnn_status* status);
 
+/// @brief Builds executable network based on serialized to file program.
+/// @param[in] engine The engine which will be used to build the program.
+/// @param[in] file_name The base name of files from which program will be build.
+CLDNN_API        cldnn_network cldnn_build_serialized_network(cldnn_engine engine, const char* file_name, const char* dump_path, cldnn_status* status);
+
 /// @brief Allocates memory for a new network which will be able to execute specified @p program.
 /// @param[in] program The program object which holds binaries compiled from some topology and engine. Multiple network objects can share the same program.
 CLDNN_API        cldnn_network cldnn_allocate_network(cldnn_program program, cldnn_status* status);

api/CPP/activation.hpp

@@ -114,8 +114,16 @@ struct activation : public primitive_base<activation, CLDNN_PRIMITIVE_DESC(activ
         dto.additional_params = additional_params;
         dto.additional_params_input = additional_params_input.c_str();
     }
+private:
+    activation() : primitive_base() {} // Constructor necessary for serialization process
+    CLDNN_SERIALIZATION_MEMBERS(
+        ar & CLDNN_SERIALIZATION_BASE_OBJECT_NVP_PRIMITIVE_BASE(activation) & CLDNN_SERIALIZATION_NVP(activation_func) 
+           & CLDNN_SERIALIZATION_NVP(additional_params.a) & CLDNN_SERIALIZATION_NVP(additional_params.b) 
+           & CLDNN_SERIALIZATION_NVP(additional_params_input);
+        )
 };
 /// @}
 /// @}
 /// @}
-}
+}
+CLDNN_SERIALIZATION_EXPORT_NODE_KEY(activation)

api/CPP/activation_grad.hpp

@@ -116,8 +116,15 @@ struct activation_grad : public primitive_base<activation_grad, CLDNN_PRIMITIVE_
         dto.additional_params = additional_params;
         dto.additional_params_input = additional_params_input.c_str();
     }
+private:
+    activation_grad() : primitive_base() {} // Constructor necessary for serialization process
+    CLDNN_SERIALIZATION_MEMBERS(
+        ar & CLDNN_SERIALIZATION_BASE_OBJECT_NVP_PRIMITIVE_BASE(activation_grad) & CLDNN_SERIALIZATION_NVP(activation_grad_func) 
+           & CLDNN_SERIALIZATION_NVP(additional_params.a) & CLDNN_SERIALIZATION_NVP(additional_params.b) & CLDNN_SERIALIZATION_NVP(additional_params_input);
+    )
 };
 /// @}
 /// @}
 /// @}
-}
+}
+CLDNN_SERIALIZATION_EXPORT_NODE_KEY(activation_grad)

api/CPP/apply_adam.hpp

@@ -139,8 +139,17 @@ struct apply_adam : public primitive_base<apply_adam, CLDNN_PRIMITIVE_DESC(apply
         dto.epsilon = epsilon;
         dto.dependency_id = dependency_id.c_str();
     }
+private:
+    apply_adam() : primitive_base() {} // Constructor necessary for serialization process
+    CLDNN_SERIALIZATION_MEMBERS(
+        ar & CLDNN_SERIALIZATION_BASE_OBJECT_NVP_PRIMITIVE_BASE(apply_adam) & CLDNN_SERIALIZATION_NVP(m) & CLDNN_SERIALIZATION_NVP(v) 
+           & CLDNN_SERIALIZATION_NVP(beta1_power) & CLDNN_SERIALIZATION_NVP(beta2_power) & CLDNN_SERIALIZATION_NVP(lr) 
+           & CLDNN_SERIALIZATION_NVP(beta1) & CLDNN_SERIALIZATION_NVP(beta2) & CLDNN_SERIALIZATION_NVP(epsilon) 
+           & CLDNN_SERIALIZATION_NVP(dependency_id);
+    )
 };
 /// @}
 /// @}
 /// @}
 }
+CLDNN_SERIALIZATION_EXPORT_NODE_KEY(apply_adam)

api/CPP/arg_max_min.hpp

@@ -104,8 +104,15 @@ namespace cldnn
             dto.with_axis = with_axis;
             dto.axis = static_cast<cldnn_arg_max_min_axis>(axis);
         }
+    private:
+        arg_max_min() : primitive_base() {} // Constructor necessary for serialization process
+        CLDNN_SERIALIZATION_MEMBERS(
+            ar & CLDNN_SERIALIZATION_BASE_OBJECT_NVP_PRIMITIVE_BASE(arg_max_min) & CLDNN_SERIALIZATION_NVP(top_k) 
+               & CLDNN_SERIALIZATION_NVP(output_type) & CLDNN_SERIALIZATION_NVP(axis) & CLDNN_SERIALIZATION_NVP(with_axis);
+        )
     };
     /// @}
     /// @}
     /// @}
-}
+}
+CLDNN_SERIALIZATION_EXPORT_NODE_KEY(arg_max_min)

api/CPP/average_unpooling.hpp

@@ -78,8 +78,15 @@ struct average_unpooling : public primitive_base<average_unpooling, CLDNN_PRIMIT
         dto.size = size;
         dto.output_size = output_size;
     }
+private:
+    average_unpooling() : primitive_base() {} // Constructor necessary for serialization process
+    CLDNN_SERIALIZATION_MEMBERS(
+        ar & CLDNN_SERIALIZATION_BASE_OBJECT_NVP_PRIMITIVE_BASE(average_unpooling) & CLDNN_SERIALIZATION_NVP(stride) 
+           & CLDNN_SERIALIZATION_NVP(size) & CLDNN_SERIALIZATION_NVP(output_size);
+    )
 };
 /// @}
 /// @}
 /// @}
-}
+}
+CLDNN_SERIALIZATION_EXPORT_NODE_KEY(average_unpooling)

api/CPP/batch_norm.hpp

@@ -224,8 +224,16 @@ struct batch_norm : public primitive_base<batch_norm, CLDNN_PRIMITIVE_DESC(batch
         dto.shift = shift.c_str();
         dto.epsilon = epsilon;
     }
+private:
+    batch_norm() : primitive_base() {} // Constructor necessary for serialization process
+    CLDNN_SERIALIZATION_MEMBERS(
+        ar & CLDNN_SERIALIZATION_BASE_OBJECT_NVP_PRIMITIVE_BASE(batch_norm) & CLDNN_SERIALIZATION_NVP(mean) 
+           & CLDNN_SERIALIZATION_NVP(variance) & CLDNN_SERIALIZATION_NVP(scale) & CLDNN_SERIALIZATION_NVP(shift) 
+           & CLDNN_SERIALIZATION_NVP(inv_variance) & CLDNN_SERIALIZATION_NVP(epsilon);
+    )
 };
 /// @}
 /// @}
 /// @}
 }
+CLDNN_SERIALIZATION_EXPORT_NODE_KEY(batch_norm)

api/CPP/batch_norm_grad.hpp

@@ -72,8 +72,14 @@ struct batch_norm_grad : public primitive_base<batch_norm_grad, CLDNN_PRIMITIVE_
     {
         dto.inv_variance = inv_variance.c_str();
     }
+private:
+    batch_norm_grad() : primitive_base() {} // Constructor necessary for serialization process
+    CLDNN_SERIALIZATION_MEMBERS(
+        ar & CLDNN_SERIALIZATION_BASE_OBJECT_NVP_PRIMITIVE_BASE(batch_norm_grad) & CLDNN_SERIALIZATION_NVP(inv_variance);
+    )
 };
 /// @}
 /// @}
 /// @}
-}
+}
+CLDNN_SERIALIZATION_EXPORT_NODE_KEY(batch_norm_grad)