IntenseWebs/openvino
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[GPU] Fixed static init order for serialization (#19768)

Browse Source
This commit is contained in:
Vladimir Paramuzov 2023-09-13 00:31:05 +04:00 committed by GitHub
parent d1a8c8f914
commit 541f2dc62f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
203 changed files with 128 additions and 326 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/intel_gpu/include/intel_gpu/graph/serialization/binary_buffer.hpp
View File

@ -104,12 +104,10 @@ public:
#define ASSIGN_TYPE_NAME(cls_name) \
namespace cldnn { \
const std::string cls_name::type_for_serialization = #cls_name; \
}
#define BIND_BINARY_BUFFER_WITH_TYPE(cls_name) \
namespace cldnn { \
const std::string cls_name::type_for_serialization = #cls_name; \
BIND_TO_BUFFER(BinaryOutputBuffer, cls_name) \
BIND_TO_BUFFER(BinaryInputBuffer, cls_name) \
}

15
src/plugins/intel_gpu/include/intel_gpu/graph/serialization/bind.hpp
View File

@ -11,9 +11,12 @@
#include "buffer.hpp"
#include "static_instance.hpp"
#define DECLARE_OBJECT_TYPE_SERIALIZATION \
static const std::string type_for_serialization; \
std::string get_type() const override { return type_for_serialization; }
#define DECLARE_OBJECT_TYPE_SERIALIZATION(cls_name) \
static const std::string& get_type_info_s() { \
static const std::string type_name = #cls_name; \
return type_name; \
} \
const std::string& get_type_info() const override { return get_type_info_s(); }
#define BIND_TO_BUFFER(buffer, type) \
template <> \
@ -101,7 +104,7 @@ public:
private:
buffer_binder() {
saver_storage<BufferType>::instance().set_save_function({T::type_for_serialization, save});
saver_storage<BufferType>::instance().set_save_function({T::get_type_info_s(), save});
}
buffer_binder(const buffer_binder&) = delete;
@ -130,7 +133,7 @@ public:
private:
buffer_binder() {
def<BufferType>::instance().set_load_function(
{T::type_for_serialization, [](BufferType& buffer, std::unique_ptr<void, void_deleter<void>>& result_ptr) {
{T::get_type_info_s(), [](BufferType& buffer, std::unique_ptr<void, void_deleter<void>>& result_ptr) {
std::unique_ptr<T> derived_ptr = std::unique_ptr<T>(new T());
derived_ptr->load(buffer);
result_ptr.reset(derived_ptr.release());
@ -153,7 +156,7 @@ public:
private:
buffer_binder() {
dif<BufferType>::instance().set_load_function(
{T::type_for_serialization, [](BufferType& buffer, std::unique_ptr<void, void_deleter<void>>& result_ptr, engine& engine) {
{T::get_type_info_s(), [](BufferType& buffer, std::unique_ptr<void, void_deleter<void>>& result_ptr, engine& engine) {
std::unique_ptr<T> derived_ptr = std::unique_ptr<T>(new T(engine));
derived_ptr->load(buffer);
result_ptr.reset(derived_ptr.release());

4
src/plugins/intel_gpu/include/intel_gpu/graph/serialization/polymorphic_serializer.hpp
View File

@ -18,7 +18,7 @@ template <typename BufferType, typename T>
class Serializer<BufferType, std::unique_ptr<T>, typename std::enable_if<std::is_base_of<OutputBuffer<BufferType>, BufferType>::value>::type> {
public:
static void save(BufferType& buffer, const std::unique_ptr<T>& ptr) {
const auto& type = ptr->get_type();
const auto& type = ptr->get_type_info();
buffer << type;
const auto save_func = saver_storage<BufferType>::instance().get_save_function(type);
save_func(buffer, ptr.get());
@ -51,7 +51,7 @@ template <typename BufferType, typename T>
class Serializer<BufferType, std::shared_ptr<T>, typename std::enable_if<std::is_base_of<OutputBuffer<BufferType>, BufferType>::value>::type> {
public:
static void save(BufferType& buffer, const std::shared_ptr<T>& ptr) {
const std::string& type = ptr->get_type();
const std::string& type = ptr->get_type_info();
buffer << type;
if (type.compare("NONE") != 0) {
const auto save_func = saver_storage<BufferType>::instance().get_save_function(type);

2
src/plugins/intel_gpu/include/intel_gpu/primitives/activation.hpp
View File

@ -82,8 +82,6 @@ struct activation : public primitive_base<activation> {
activation_function(activation_func::none),
additional_params({0.f, 0.f}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @brief Constructs Relu primitive.
/// @param id This primitive id.
/// @param input Input primitive id.

2
src/plugins/intel_gpu/include/intel_gpu/primitives/adaptive_pooling.hpp
View File

@ -20,8 +20,6 @@ struct adaptive_pooling : public primitive_base<adaptive_pooling> {
mode{adaptive_pooling_mode::average},
output_size{} {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @brief Constructs AdaptiveAvgPooling primitive.
/// @param id This primitive id.
/// @param input Input primitive id.

2
src/plugins/intel_gpu/include/intel_gpu/primitives/arg_max_min.hpp
View File

@ -27,8 +27,6 @@ struct arg_max_min : public primitive_base<arg_max_min> {
values_first(false),
stable(false) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @brief Constructs arg_max_min primitive.
/// @param id This primitive id.
/// @param input Input primitive id.

2
src/plugins/intel_gpu/include/intel_gpu/primitives/assign.hpp
View File

@ -17,8 +17,6 @@ struct assign : public primitive_base<assign> {
assign() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @brief Constructs Assign primitive.
/// @param id This primitive id
/// @param inputs Input parameters ids

2
src/plugins/intel_gpu/include/intel_gpu/primitives/batch_to_space.hpp
View File

@ -42,8 +42,6 @@ struct batch_to_space : public primitive_base<batch_to_space> {
batch_to_space() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @brief Constructs batch_to_space primitive.
/// @param id This primitive id.
/// @param input Input data primitive id.

2
src/plugins/intel_gpu/include/intel_gpu/primitives/binary_convolution.hpp
View File

@ -16,8 +16,6 @@ struct binary_convolution : public primitive_base<binary_convolution> {
binary_convolution() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @brief Constructs binary_convolution primitive.
/// @param id This primitive id.
/// @param input Input primitive id.

2
src/plugins/intel_gpu/include/intel_gpu/primitives/border.hpp
View File

@ -26,8 +26,6 @@ struct border : public primitive_base<border> {
border() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @brief whether the input is const or not
enum PAD_NON_CONST_INPUT {
BEGIN = 0x1,

2
src/plugins/intel_gpu/include/intel_gpu/primitives/broadcast.hpp
View File

@ -56,8 +56,6 @@ struct broadcast : public primitive_base<broadcast> {
broadcast() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @brief Constructs broadcast primitive / layer.
///
/// @param id An identifier of new primitive.

2
src/plugins/intel_gpu/include/intel_gpu/primitives/bucketize.hpp
View File

@ -13,8 +13,6 @@ struct bucketize : primitive_base<bucketize> {
bucketize() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @brief Constructs bucketize primitive.
/// @param id This primitive id.
/// @param inputs Input primitives ids.

2
src/plugins/intel_gpu/include/intel_gpu/primitives/concatenation.hpp
View File

@ -35,8 +35,6 @@ struct concatenation : public primitive_base<concatenation> {
concatenation() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @li Constructs concatenation primitive.
/// @param id This primitive id.
/// @param input Vector of input primitives ids.

2
src/plugins/intel_gpu/include/intel_gpu/primitives/convert_color.hpp
View File

@ -14,8 +14,6 @@ struct convert_color : public primitive_base<convert_color> {
convert_color() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
enum color_format : uint32_t {
RGB, ///< RGB color format
BGR, ///< BGR color format, default in OpenVINO

6
src/plugins/intel_gpu/include/intel_gpu/primitives/convolution.hpp
View File

@ -15,8 +15,6 @@ struct convolution : public primitive_base<convolution> {
convolution() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @brief Constructs convolution primitive
/// @param id This primitive id.
/// @param input Input primitive id.
@ -313,8 +311,6 @@ struct deformable_interp : public primitive_base<deformable_interp> {
deformable_interp() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
deformable_interp(const primitive_id& id,
const std::vector<input_info>& inputs,
uint32_t groups,
@ -430,8 +426,6 @@ struct deformable_conv : public primitive_base<deformable_conv> {
deformable_conv() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
deformable_conv(const primitive_id& id,
const input_info& input,
const std::vector<primitive_id>& weights,

2
src/plugins/intel_gpu/include/intel_gpu/primitives/crop.hpp
View File

@ -46,8 +46,6 @@ struct crop : public primitive_base<crop> {
crop() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @brief Constructs crop primitive.
/// @param id This primitive id.
/// @param input Input primitive id.

2
src/plugins/intel_gpu/include/intel_gpu/primitives/ctc_greedy_decoder.hpp
View File

@ -13,8 +13,6 @@ struct ctc_greedy_decoder : public primitive_base<ctc_greedy_decoder> {
ctc_greedy_decoder() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @brief Constructs ctc_greedy_decoder primitive.
/// @param id This primitive id.
/// @param input Input primitive id (input, sequence_indicators, second_output(optional)).

2
src/plugins/intel_gpu/include/intel_gpu/primitives/ctc_loss.hpp
View File

@ -15,8 +15,6 @@ struct ctc_loss : primitive_base<ctc_loss> {
ctc_loss() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @brief Constructs ctc_loss primitive.
/// @param id This primitive id.
/// @param inputs Input primitives ids.

4
src/plugins/intel_gpu/include/intel_gpu/primitives/cum_sum.hpp
View File

@ -6,15 +6,11 @@
#include "primitive.hpp"
namespace cldnn {
struct cum_sum : public primitive_base<cum_sum> {
CLDNN_DECLARE_PRIMITIVE(cum_sum)
cum_sum() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @brief Constructs cum_sum primitive.
/// @param id This primitive id.
/// @param input Input primitive id.

2
src/plugins/intel_gpu/include/intel_gpu/primitives/custom_gpu_primitive.hpp
View File

@ -18,8 +18,6 @@ struct custom_gpu_primitive : public primitive_base<custom_gpu_primitive> {
custom_gpu_primitive() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @brief Custom primitive kernel argument type
enum arg_type {
arg_input,

2
src/plugins/intel_gpu/include/intel_gpu/primitives/data.hpp
View File

@ -17,8 +17,6 @@ struct data : public primitive_base<data> {
data() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @brief Constructs data primitive.
/// @param id This primitive id.
/// @param mem @ref memory object which contains data.

2
src/plugins/intel_gpu/include/intel_gpu/primitives/deconvolution.hpp
View File

@ -20,8 +20,6 @@ struct deconvolution : public primitive_base<deconvolution> {
deconvolution() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @brief Constructs deconvolution primitive.
/// @param id This primitive id.
/// @param input Input primitive id.

2
src/plugins/intel_gpu/include/intel_gpu/primitives/depth_to_space.hpp
View File

@ -22,8 +22,6 @@ struct depth_to_space : public primitive_base<depth_to_space> {
depth_to_space() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @brief Constructs depth_to_space primitive.
/// @param id This primitive id.
/// @param input Input dictionary primitive id.

2
src/plugins/intel_gpu/include/intel_gpu/primitives/detection_output.hpp
View File

@ -42,8 +42,6 @@ struct detection_output : public primitive_base<detection_output> {
clip_after_nms(false),
objectness_score(0.0f) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @brief Constructs detection output primitive.
/// @param id This primitive id.
/// @param inputs Inputs for primitive id.

2
src/plugins/intel_gpu/include/intel_gpu/primitives/dft.hpp
View File

@ -29,8 +29,6 @@ struct dft : public primitive_base<dft> {
dft() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @brief Constructs DFT primitive.
/// @param id This primitive id.
/// @param input Input primitive id.

2
src/plugins/intel_gpu/include/intel_gpu/primitives/eltwise.hpp
View File

@ -71,8 +71,6 @@ struct eltwise : public primitive_base<eltwise> {
eltwise() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @brief Constructs eltwise primitive.
/// @param id This primitive id.
/// @param input Input primitive id.

2
src/plugins/intel_gpu/include/intel_gpu/primitives/embedding_bag.hpp
View File

@ -14,8 +14,6 @@ struct embedding_bag : public primitive_base<embedding_bag> {
embedding_bag() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @brief Select type of embedding_bag operation
enum embedding_bag_type {
packed_sum,

2
src/plugins/intel_gpu/include/intel_gpu/primitives/experimental_detectron_detection_output.hpp
View File

@ -16,8 +16,6 @@ struct experimental_detectron_detection_output : public primitive_base<experimen
experimental_detectron_detection_output() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @brief Constructs experimental_detectron_detection_output primitive
/// @param id This primitive id
/// @param input_rois input rois

2
src/plugins/intel_gpu/include/intel_gpu/primitives/experimental_detectron_generate_proposals_single_image.hpp
View File

@ -15,8 +15,6 @@ struct experimental_detectron_generate_proposals_single_image
experimental_detectron_generate_proposals_single_image() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @brief Constructs experimental_detectron_generate_proposals_single_image primitive
/// @param id This primitive id
/// @param input_im_info image size info

4
src/plugins/intel_gpu/include/intel_gpu/primitives/experimental_detectron_prior_grid_generator.hpp
View File

@ -8,8 +8,6 @@
namespace cldnn {
/// @brief Constructs experimental_detectron_prior_grid_generator primitive.
struct experimental_detectron_prior_grid_generator
: public primitive_base<experimental_detectron_prior_grid_generator> {
@ -17,8 +15,6 @@ struct experimental_detectron_prior_grid_generator
experimental_detectron_prior_grid_generator() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
experimental_detectron_prior_grid_generator(const primitive_id& id,
const std::vector<input_info>& inputs,
bool flatten,

2
src/plugins/intel_gpu/include/intel_gpu/primitives/experimental_detectron_roi_feature_extractor.hpp
View File

@ -14,8 +14,6 @@ struct experimental_detectron_roi_feature_extractor : public primitive_base<expe
experimental_detectron_roi_feature_extractor() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @brief Constructs experimental_detectron_roi_feature_extractor primitive
/// @param id This primitive id
/// @param inputs Inputs for primitive id (ROIs, {pyramid levels, ...}, second_output)

4
src/plugins/intel_gpu/include/intel_gpu/primitives/experimental_detectron_topk_rois.hpp
View File

@ -10,8 +10,6 @@
namespace cldnn {
/// @brief ExperimentalDetectronTopKROIs-6 primitive
/// @details
struct experimental_detectron_topk_rois : public primitive_base<experimental_detectron_topk_rois> {
@ -19,8 +17,6 @@ struct experimental_detectron_topk_rois : public primitive_base<experimental_det
experimental_detectron_topk_rois() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/**
* Construct ExperimentalDetectronTopKROIs privitive.
* @param id primitive id

2
src/plugins/intel_gpu/include/intel_gpu/primitives/extract_image_patches.hpp
View File

@ -23,8 +23,6 @@ struct extract_image_patches : public primitive_base<extract_image_patches> {
extract_image_patches() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @brief Constructs select primitive.
/// @param id This primitive id.
/// @param input Input primitive id containing input 4-D tensor.

2
src/plugins/intel_gpu/include/intel_gpu/primitives/eye.hpp
View File

@ -14,8 +14,6 @@ struct eye : public primitive_base<eye> {
eye() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @brief Constructs eye primitive.
/// @param id This primitive id.
/// @param inputs List of primitive ids.

2
src/plugins/intel_gpu/include/intel_gpu/primitives/fully_connected.hpp
View File

@ -35,8 +35,6 @@ struct fully_connected : public primitive_base<fully_connected> {
fully_connected() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @brief Constructs fully connected layer.
/// @param id This primitive id.
/// @param input Input primitive id.

2
src/plugins/intel_gpu/include/intel_gpu/primitives/gather.hpp
View File

@ -16,8 +16,6 @@ struct gather : public primitive_base<gather> {
gather() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @brief Constructs gather primitive.
/// @param id This primitive id.
/// @param dict Input dictionary primitive id.

2
src/plugins/intel_gpu/include/intel_gpu/primitives/gather_elements.hpp
View File

@ -14,8 +14,6 @@ struct gather_elements : public primitive_base<gather_elements> {
gather_elements() : primitive_base("", {}), output_format({}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @brief Constructs gather_elements primitive.
/// @param id This primitive id.
/// @param data Input data primitive id.

2
src/plugins/intel_gpu/include/intel_gpu/primitives/gather_nd.hpp
View File

@ -14,8 +14,6 @@ struct gather_nd : public primitive_base<gather_nd> {
gather_nd() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @brief Constructs gather_nd primitive.
///
/// @param id This primitive id.

2
src/plugins/intel_gpu/include/intel_gpu/primitives/gather_tree.hpp
View File

@ -15,8 +15,6 @@ struct gather_tree : public primitive_base<gather_tree> {
gather_tree() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @brief Constructs gather tree primitive / layer.
///
/// @param id An identifier of new primitive.

2
src/plugins/intel_gpu/include/intel_gpu/primitives/gemm.hpp
View File

@ -27,8 +27,6 @@ struct gemm : public primitive_base<gemm> {
gemm() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @brief Constructs gemm layer.
/// @brief Primitive id containing first matrix
/// @brief Primitive id containing second matrix

2
src/plugins/intel_gpu/include/intel_gpu/primitives/generate_proposals.hpp
View File

@ -15,8 +15,6 @@ struct generate_proposals
generate_proposals() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @brief Constructs generate_proposals primitive
/// @param id This primitive id
/// @param input_im_info image size info

4
src/plugins/intel_gpu/include/intel_gpu/primitives/grid_sample.hpp
View File

@ -10,8 +10,6 @@
#include "primitive.hpp"
namespace cldnn {
using GridSampleOp = ov::op::v9::GridSample;
/// @brief GridSample-9 primitive.
@ -20,8 +18,6 @@ struct grid_sample : primitive_base<grid_sample> {
grid_sample() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @brief Constructs grid_sample primitive.
/// @param id This primitive id.
/// @param inputs Input primitives ids.

2
src/plugins/intel_gpu/include/intel_gpu/primitives/grn.hpp
View File

@ -13,8 +13,6 @@ struct grn : public primitive_base<grn> {
grn() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @brief Constructs grn primitive.
/// @param id This primitive id.
/// @param input Input primitive id.

2
src/plugins/intel_gpu/include/intel_gpu/primitives/input_layout.hpp
View File

@ -20,8 +20,6 @@ struct input_layout : public primitive_base<input_layout> {
input_layout() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @brief Constructs input layout primitive.
/// @param id This primitive id.
/// @param layout Defines layout for the data will be passed to network.

2
src/plugins/intel_gpu/include/intel_gpu/primitives/loop.hpp
View File

@ -55,8 +55,6 @@ struct loop : public primitive_base<loop> {
loop() : primitive_base("", {}),
max_iteration(0) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
struct io_primitive_map {
/// @brief Constructs a mapping from external input/output primitive to input/output primitive in body topology
///

4
src/plugins/intel_gpu/include/intel_gpu/primitives/lrn.hpp
View File

@ -6,8 +6,6 @@
#include "primitive.hpp"
namespace cldnn {
typedef enum { /*:int32_t*/
lrn_norm_region_across_channel,
lrn_norm_region_within_channel
@ -29,8 +27,6 @@ struct lrn : public primitive_base<lrn> {
lrn() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @brief Constructs LRN primitive.
/// @param id This primitive id.
/// @param input Input primitive id.

6
src/plugins/intel_gpu/include/intel_gpu/primitives/lstm.hpp
View File

@ -53,8 +53,6 @@ struct lstm : public primitive_base<lstm> {
lstm() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @brief Constructs lstm layer.
/// @param id This primitive id.
/// @param input Vector of primitive id.
@ -230,8 +228,6 @@ struct lstm_gemm : public primitive_base<lstm_gemm> {
lstm_gemm() : primitive_base("", {}),
direction(0) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @brief Constructs lstm layer.
/// @param id This primitive id.
/// @param input input primitive id.
@ -319,8 +315,6 @@ struct lstm_elt : public primitive_base<lstm_elt> {
lstm_elt() : primitive_base("", {}), clip(0), input_forget(0), offset_order(lstm_weights_order::iofz), direction(0) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
using vec_activation = std::vector<activation_func>;
using vec_activation_param = std::vector<activation_additional_params>;

2
src/plugins/intel_gpu/include/intel_gpu/primitives/lstm_dynamic.hpp
View File

@ -22,8 +22,6 @@ struct lstm_dynamic : public primitive_base<lstm_dynamic> {
lstm_dynamic() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @brief Constructs lstm_dynamic layer.
/// @param id This primitive id.
/// @param input Primitive id of input layer.

2
src/plugins/intel_gpu/include/intel_gpu/primitives/lstm_dynamic_input.hpp
View File

@ -22,8 +22,6 @@ struct lstm_dynamic_input : public primitive_base<lstm_dynamic_input> {
lstm_dynamic_input() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @brief Constructs lstm_dynamic layer.
/// @param id This primitive id.
/// @param input Primitive id of input layer.

2
src/plugins/intel_gpu/include/intel_gpu/primitives/lstm_dynamic_timeloop.hpp
View File

@ -23,8 +23,6 @@ struct lstm_dynamic_timeloop
lstm_dynamic_timeloop() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @brief Constructs lstm_dynamic layer.
/// @param id This primitive id.
/// @param input Primitive id of input layer.

2
src/plugins/intel_gpu/include/intel_gpu/primitives/matrix_nms.hpp
View File

@ -16,8 +16,6 @@ struct matrix_nms : public primitive_base<matrix_nms> {
matrix_nms() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
enum decay_function { gaussian, linear };
enum sort_result_type {

2
src/plugins/intel_gpu/include/intel_gpu/primitives/multiclass_nms.hpp
View File

@ -19,8 +19,6 @@ struct multiclass_nms : public primitive_base<multiclass_nms> {
multiclass_nms() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
enum class sort_result_type : int32_t {
classid, // sort selected boxes by class id (ascending) in each batch element
score, // sort selected boxes by score (descending) in each batch element

2
src/plugins/intel_gpu/include/intel_gpu/primitives/mutable_data.hpp
View File

@ -18,8 +18,6 @@ struct mutable_data : public primitive_base<mutable_data> {
mutable_data() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @brief Enum type to specify function for data filling.
enum filler_type { no_fill, zero, one, xavier };

2
src/plugins/intel_gpu/include/intel_gpu/primitives/mvn.hpp
View File

@ -14,8 +14,6 @@ struct mvn : public primitive_base<mvn> {
mvn() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @brief Constructs mvn primitive.
/// @param id This primitive id.
/// @param input Input primitive id.

2
src/plugins/intel_gpu/include/intel_gpu/primitives/non_max_suppression.hpp
View File

@ -22,8 +22,6 @@ struct non_max_suppression : public primitive_base<non_max_suppression> {
center_point_box(false),
sort_result_descending(false) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @brief Creates non max suppression primitive.
/// @param id This primitive id.
/// @param boxes_positions Id of primitive with bounding boxes.

4
src/plugins/intel_gpu/include/intel_gpu/primitives/non_zero.hpp
View File

@ -13,8 +13,6 @@ struct count_nonzero : public primitive_base<count_nonzero> {
count_nonzero() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @brief Constructs count_nonzero primitive.
/// @param id This primitive id.
/// @param data Input data primitive id.
@ -33,8 +31,6 @@ struct gather_nonzero : public primitive_base<gather_nonzero> {
gather_nonzero() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @brief Constructs gather_nonzero primitive.
/// @param id This primitive id.
/// @param data Input data primitive id.

2
src/plugins/intel_gpu/include/intel_gpu/primitives/normalize.hpp
View File

@ -29,8 +29,6 @@ struct normalize : public primitive_base<normalize> {
normalize() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @brief Constructs normalize primitive.
/// @param id This primitive id.
/// @param input Input primitive id.

2
src/plugins/intel_gpu/include/intel_gpu/primitives/one_hot.hpp
View File

@ -35,8 +35,6 @@ struct one_hot : public primitive_base<one_hot> {
one_hot() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @brief Constructs one-hot primitive layer.
/// @param id An identifier of new primitive.
/// @param input An identifier of primitive which is an input for newly created one-hot primitive.

2
src/plugins/intel_gpu/include/intel_gpu/primitives/permute.hpp
View File

@ -21,8 +21,6 @@ struct permute : public primitive_base<permute> {
permute() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @brief Constructs permute primitive.
/// @param id This primitive id.
/// @param input Input primitive id.

2
src/plugins/intel_gpu/include/intel_gpu/primitives/pooling.hpp
View File

@ -34,8 +34,6 @@ struct pooling : public primitive_base<pooling> {
pooling() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @brief Constructs pooling primitive.
/// @param id This primitive id.
/// @param input Input primitive id.

3
src/plugins/intel_gpu/include/intel_gpu/primitives/primitive.hpp
View File

@ -203,7 +203,7 @@ public:
size_t num_outputs;
virtual std::string get_type() const { return "NONE"; }
virtual const std::string& get_type_info() const = 0;
virtual void save(BinaryOutputBuffer& ob) const {
ob << type_string();
ob << id;
@ -313,6 +313,7 @@ struct primitive_info {
}
#define CLDNN_DECLARE_PRIMITIVE(PType) \
DECLARE_OBJECT_TYPE_SERIALIZATION(PType) \
CLDNN_DEFINE_TYPE_ID(PType) \
CLDNN_DEFINE_TYPE_STRING(PType)

2
src/plugins/intel_gpu/include/intel_gpu/primitives/prior_box.hpp
View File

@ -23,8 +23,6 @@ struct prior_box : public primitive_base<prior_box> {
prior_box() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
using PriorBoxV0Op = ov::op::v0::PriorBox;
using PriorBoxV8Op = ov::op::v8::PriorBox;
using PriorBoxClusteredOp = ov::op::v0::PriorBoxClustered;

4
src/plugins/intel_gpu/include/intel_gpu/primitives/proposal.hpp
View File

@ -10,8 +10,6 @@
#include "intel_gpu/graph/serialization/vector_serializer.hpp"
namespace cldnn {
#define CLDNN_ROI_VECTOR_SIZE 5
struct proposal : public primitive_base<proposal> {
@ -37,8 +35,6 @@ struct proposal : public primitive_base<proposal> {
shift_anchors(false),
normalize(false) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
proposal(const primitive_id& id,
const input_info& cls_scores,
const input_info& bbox_pred,

2
src/plugins/intel_gpu/include/intel_gpu/primitives/pyramid_roi_align.hpp
View File

@ -26,8 +26,6 @@ struct pyramid_roi_align : public primitive_base<pyramid_roi_align> {
pyramid_roi_align() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @param id This primitive id.
/// @param rois Input RoI boxes as tuple [x1, y1, x2, y2] describing two opposite corners of the region.
/// @param P2 First level of the image pyramid.

2
src/plugins/intel_gpu/include/intel_gpu/primitives/quantize.hpp
View File

@ -38,8 +38,6 @@ struct quantize : public primitive_base<quantize> {
quantize() : primitive_base("", {}), levels(0) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @brief levels The number of quantization levels.
int levels;

4
src/plugins/intel_gpu/include/intel_gpu/primitives/random_uniform.hpp
View File

@ -10,8 +10,6 @@
namespace cldnn {
/// @brief RandomUniform-8 primitive
/// @details
struct random_uniform : public primitive_base<random_uniform> {
@ -22,8 +20,6 @@ struct random_uniform : public primitive_base<random_uniform> {
op_seed(0),
output_shape{} {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/**
* Construct Random Uniform privitive.
* @param id primitive id

2
src/plugins/intel_gpu/include/intel_gpu/primitives/range.hpp
View File

@ -12,8 +12,6 @@ struct range: public primitive_base<range> {
range() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @brief Constructs range primitive.
/// @param id This primitive id.
/// @param inputs Input primitive id vector.

2
src/plugins/intel_gpu/include/intel_gpu/primitives/read_value.hpp
View File

@ -17,8 +17,6 @@ struct read_value : public primitive_base<read_value> {
read_value() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @brief Constructs ReadValue primitive.
/// @param id This primitive id
/// @param inputs Input parameters ids

2
src/plugins/intel_gpu/include/intel_gpu/primitives/reduce.hpp
View File

@ -44,8 +44,6 @@ struct reduce : public primitive_base<reduce> {
reduce() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @brief Constructs reduce primitive
/// @param id This primitive id
/// @param input Input primitive id

2
src/plugins/intel_gpu/include/intel_gpu/primitives/region_yolo.hpp
View File

@ -16,8 +16,6 @@ struct region_yolo : public primitive_base<region_yolo> {
region_yolo() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @brief Constructs region_yolo primitive.
/// @param id This primitive id.
/// @param input Input primitive id.

2
src/plugins/intel_gpu/include/intel_gpu/primitives/reorder.hpp
View File

@ -69,8 +69,6 @@ struct reorder : public primitive_base<reorder> {
output_format(format::any),
mean_mode(reorder_mean_mode::subtract) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @brief reorder memory types
enum class memory_type {
buffer,

2
src/plugins/intel_gpu/include/intel_gpu/primitives/reorg_yolo.hpp
View File

@ -16,8 +16,6 @@ struct reorg_yolo : public primitive_base<reorg_yolo> {
reorg_yolo() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @brief Constructs region_yolo primitive.
/// @param id This primitive id.
/// @param input Input primitive id.

2
src/plugins/intel_gpu/include/intel_gpu/primitives/resample.hpp
View File

@ -17,8 +17,6 @@ struct resample : public primitive_base<resample> {
resample() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
using InterpolateOp = ov::op::util::InterpolateBase;
/// @brief Constructs Resample primitive.

2
src/plugins/intel_gpu/include/intel_gpu/primitives/reshape.hpp
View File

@ -17,8 +17,6 @@ struct reshape : public primitive_base<reshape> {
reshape() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
enum reshape_mode : uint32_t {
base,
squeeze,

2
src/plugins/intel_gpu/include/intel_gpu/primitives/reverse.hpp
View File

@ -15,8 +15,6 @@ struct reverse : public primitive_base<reverse> {
reverse() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @brief Constructs reverse primitive.
/// @param id This primitive id.
/// @param input Input primitive id.

2
src/plugins/intel_gpu/include/intel_gpu/primitives/reverse_sequence.hpp
View File

@ -15,8 +15,6 @@ struct reverse_sequence : public primitive_base<reverse_sequence> {
reverse_sequence() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @brief Constructs reverse_sequence primitive.
/// @param id This primitive id.
/// @param input Input primitive id.

2
src/plugins/intel_gpu/include/intel_gpu/primitives/roi_align.hpp
View File

@ -15,8 +15,6 @@ struct roi_align : public primitive_base<roi_align> {
roi_align() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @brief Pooling mode for the @ref roi_align
enum PoolingMode { max, avg };

4
src/plugins/intel_gpu/include/intel_gpu/primitives/roi_pooling.hpp
View File

@ -8,8 +8,6 @@
#include <vector>
namespace cldnn {
struct roi_pooling : public primitive_base<roi_pooling> {
CLDNN_DECLARE_PRIMITIVE(roi_pooling)
@ -27,8 +25,6 @@ struct roi_pooling : public primitive_base<roi_pooling> {
spatial_bins_x(1),
spatial_bins_y(1) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
roi_pooling(const primitive_id& id,
const input_info& input_data,
const input_info& input_rois,

2
src/plugins/intel_gpu/include/intel_gpu/primitives/roll.hpp
View File

@ -15,8 +15,6 @@ struct roll : primitive_base<roll> {
roll() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @brief Constructs roll primitive.
/// @param id This primitive id.
/// @param input Input primitive id.

2
src/plugins/intel_gpu/include/intel_gpu/primitives/scatter_elements_update.hpp
View File

@ -14,8 +14,6 @@ struct scatter_elements_update : public primitive_base<scatter_elements_update>
scatter_elements_update() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @brief Constructs scatter_elements_update primitive.
/// @param id This primitive id.
/// @param dict Input data primitive id.

2
src/plugins/intel_gpu/include/intel_gpu/primitives/scatter_nd_update.hpp
View File

@ -14,8 +14,6 @@ struct scatter_nd_update : public primitive_base<scatter_nd_update> {
scatter_nd_update() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @brief Constructs scatter_nd_update primitive.
/// @param id This primitive id.
/// @param dict Input data primitive id.

2
src/plugins/intel_gpu/include/intel_gpu/primitives/scatter_update.hpp
View File

@ -14,8 +14,6 @@ struct scatter_update : public primitive_base<scatter_update> {
scatter_update() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
enum scatter_update_axis {
along_b,
along_f,

2
src/plugins/intel_gpu/include/intel_gpu/primitives/select.hpp
View File

@ -22,8 +22,6 @@ struct select : public primitive_base<select> {
select() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @brief Constructs select primitive.
/// @param id This primitive id.
/// @param mask Input primitive id with values needed for select computation.

2
src/plugins/intel_gpu/include/intel_gpu/primitives/shape_of.hpp
View File

@ -14,8 +14,6 @@ struct shape_of : public primitive_base<shape_of> {
shape_of() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @brief Constructs shape_of primitive.
/// @param id This primitive id.
/// @param input Input primitive id.

2
src/plugins/intel_gpu/include/intel_gpu/primitives/shuffle_channels.hpp
View File

@ -15,8 +15,6 @@ struct shuffle_channels : public primitive_base<shuffle_channels> {
shuffle_channels() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @brief Constructs shuffle_channels primitive.
/// @param id This primitive id.
/// @param input Input dictionary primitive id.

2
src/plugins/intel_gpu/include/intel_gpu/primitives/slice.hpp
View File

@ -14,8 +14,6 @@ struct slice : public primitive_base<slice> {
slice() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @brief Constructs slice primitive.
/// @param id This primitive id.
/// @param inputs List of primitive ids.

2
src/plugins/intel_gpu/include/intel_gpu/primitives/softmax.hpp
View File

@ -20,8 +20,6 @@ struct softmax : public primitive_base<softmax> {
softmax() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @brief Constructs softmax primitive.
/// @param id This primitive id.
/// @param input Input primitive id.

2
src/plugins/intel_gpu/include/intel_gpu/primitives/space_to_batch.hpp
View File

@ -38,8 +38,6 @@ struct space_to_batch : public primitive_base<space_to_batch> {
space_to_batch() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @brief Constructs space_to_batch primitive.
/// @param id This primitive id.
/// @param input Input data primitive id.

2
src/plugins/intel_gpu/include/intel_gpu/primitives/space_to_depth.hpp
View File

@ -44,8 +44,6 @@ struct space_to_depth : public primitive_base<space_to_depth> {
space_to_depth() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
enum depth_mode {
depth_first,
blocks_first

2
src/plugins/intel_gpu/include/intel_gpu/primitives/strided_slice.hpp
View File

@ -16,8 +16,6 @@ struct strided_slice : public primitive_base<strided_slice> {
strided_slice() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @brief Constructs strided_slice primitive.
/// @param id This primitive id.
/// @param input Input data primitive id.

2
src/plugins/intel_gpu/include/intel_gpu/primitives/tile.hpp
View File

@ -14,8 +14,6 @@ struct tile : public primitive_base<tile> {
tile() : primitive_base("", {}) {}
DECLARE_OBJECT_TYPE_SERIALIZATION
/// @brief Constructs tile primitive with static input.
/// @param id This primitive id.
/// @param repeats Per-dimension replication factor.

2
src/plugins/intel_gpu/src/graph/impls/common/condition.cpp
View File

@ -13,7 +13,7 @@ namespace cldnn {
namespace common {
struct condition_impl : typed_primitive_impl<condition> {
DECLARE_OBJECT_TYPE_SERIALIZATION
DECLARE_OBJECT_TYPE_SERIALIZATION(cldnn::common::condition_impl)
std::unique_ptr<primitive_impl> clone() const override {
return make_unique<condition_impl>(*this);

2
src/plugins/intel_gpu/src/graph/impls/common/loop.cpp
View File

@ -16,7 +16,7 @@ struct loop_impl : typed_primitive_impl<loop> {
using parent = typed_primitive_impl<loop>;
using parent::parent;
DECLARE_OBJECT_TYPE_SERIALIZATION
DECLARE_OBJECT_TYPE_SERIALIZATION(cldnn::common::loop_impl)
std::unique_ptr<primitive_impl> clone() const override {
return make_unique<loop_impl>(*this);

2
src/plugins/intel_gpu/src/graph/impls/common/wait_for_events.cpp
View File

@ -23,7 +23,7 @@ public:
wait_for_events_impl() : primitive_impl() {}
DECLARE_OBJECT_TYPE_SERIALIZATION
DECLARE_OBJECT_TYPE_SERIALIZATION(cldnn::common::wait_for_events_impl)
std::unique_ptr<primitive_impl> clone() const override {
return make_unique<wait_for_events_impl>(*this);

2
src/plugins/intel_gpu/src/graph/impls/cpu/activation.cpp
View File

@ -58,7 +58,7 @@ struct activation_impl : public typed_primitive_impl<activation> {
std::shared_ptr<ov::op::Op> op;
DECLARE_OBJECT_TYPE_SERIALIZATION
DECLARE_OBJECT_TYPE_SERIALIZATION(cldnn::cpu::activation_impl)
std::unique_ptr<primitive_impl> clone() const override {
return make_unique<activation_impl>(*this);

2
src/plugins/intel_gpu/src/graph/impls/cpu/assign.cpp
View File

@ -16,7 +16,7 @@ struct assign_impl : public typed_primitive_impl<assign> {
std::string variable_id;
DECLARE_OBJECT_TYPE_SERIALIZATION
DECLARE_OBJECT_TYPE_SERIALIZATION(cldnn::cpu::assign_impl)
std::unique_ptr<primitive_impl> clone() const override {
return make_unique<assign_impl>(*this);

2
src/plugins/intel_gpu/src/graph/impls/cpu/broadcast.cpp
View File

@ -23,7 +23,7 @@ struct broadcast_impl : public typed_primitive_impl<broadcast> {
std::shared_ptr<ov::op::v3::Broadcast> op;
DECLARE_OBJECT_TYPE_SERIALIZATION
DECLARE_OBJECT_TYPE_SERIALIZATION(cldnn::cpu::broadcast_impl)
std::unique_ptr<primitive_impl> clone() const override {
return make_unique<broadcast_impl>(*this);

2
src/plugins/intel_gpu/src/graph/impls/cpu/concat.cpp
View File

@ -21,7 +21,7 @@ struct concatenation_impl : public typed_primitive_impl<concatenation> {
std::shared_ptr<ov::op::v0::Concat> op;
DECLARE_OBJECT_TYPE_SERIALIZATION
DECLARE_OBJECT_TYPE_SERIALIZATION(cldnn::cpu::concatenation_impl)
std::unique_ptr<primitive_impl> clone() const override {
return make_unique<concatenation_impl>(*this);

2
src/plugins/intel_gpu/src/graph/impls/cpu/crop.cpp
View File

@ -21,7 +21,7 @@ struct crop_impl : public typed_primitive_impl<crop> {
std::shared_ptr<ov::op::Op> op;
DECLARE_OBJECT_TYPE_SERIALIZATION
DECLARE_OBJECT_TYPE_SERIALIZATION(cldnn::cpu::crop_impl)
std::unique_ptr<primitive_impl> clone() const override {
return make_unique<crop_impl>(*this);

2
src/plugins/intel_gpu/src/graph/impls/cpu/detection_output.cpp
View File

@ -43,7 +43,7 @@ public:
enum NMSType {CAFFE, MXNET};
NMSType nms_type = NMSType::CAFFE;
DECLARE_OBJECT_TYPE_SERIALIZATION
DECLARE_OBJECT_TYPE_SERIALIZATION(cldnn::cpu::detection_output_impl)
std::unique_ptr<primitive_impl> clone() const override {
return make_unique<detection_output_impl>(*this);

Some files were not shown because too many files have changed in this diff Show More