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

[IE CLDNN] Disable crop optimization only when the node is inside a loop body program (#6192)

Browse Source
This commit is contained in:
Taylor Yeonbok Lee 2021-06-16 23:47:08 +09:00 committed by GitHub
parent 5c55d390e8
commit b8313c4fae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inference-engine/thirdparty/clDNN/src/graph_optimizer/prepare_buffer_fusing.cpp vendored
View File

@ -283,7 +283,7 @@ void prepare_buffer_fusing::run(program_impl& p) {
} }
if (node.get_dependencies().size() == 1 && node.get_users().size() > 0) { if (node.get_dependencies().size() == 1 && node.get_users().size() > 0) {
if (node.get_dependency(0).is_type<lstm_elt>()) { if (p.is_loop_body() && node.get_dependency(0).is_type<lstm_elt>()) {
return; return;
} }
// optimization is available for cropping across depth(features) only // optimization is available for cropping across depth(features) only

2
inference-engine/thirdparty/clDNN/src/include/loop_inst.h vendored
View File

@ -266,7 +266,7 @@ public:
auto opts = get_program().get_options(); auto opts = get_program().get_options();
std::vector<primitive_id> output_names_vec(output_names.begin(), output_names.end()); std::vector<primitive_id> output_names_vec(output_names.begin(), output_names.end());
opts.set_option(build_option::outputs(output_names_vec)); opts.set_option(build_option::outputs(output_names_vec));
body_program = program_impl::build_program(get_program().get_engine(), body, opts, false); body_program = program_impl::build_program(get_program().get_engine(), body, opts, false, false, true);
} }
const primitive_id& get_trip_count_id() const { return get_primitive()->trip_count_id; } const primitive_id& get_trip_count_id() const { return get_primitive()->trip_count_id; }

8
inference-engine/thirdparty/clDNN/src/include/program_impl.h vendored
View File

@ -138,7 +138,8 @@ public:
topology_impl const& topology, topology_impl const& topology,
build_options const& options, build_options const& options,
bool is_internal, bool is_internal,
bool no_optimizations = false); bool no_optimizations = false,
bool is_body_program = false);
/* constructor used to build a program from subset of nodes of other program (used in propagate_constants) */ /* constructor used to build a program from subset of nodes of other program (used in propagate_constants) */
program_impl(engine& engine_ref, program_impl(engine& engine_ref,
std::set<std::shared_ptr<program_node>> const& nodes, std::set<std::shared_ptr<program_node>> const& nodes,
@ -153,6 +154,7 @@ public:
std::vector<program_node*>& get_outputs() { std::vector<program_node*>& get_outputs() {
return outputs; return outputs;
} // ToDo: redesign reorder-inputs pass to make it const as_well as get_engine and get options } // ToDo: redesign reorder-inputs pass to make it const as_well as get_engine and get options
bool is_loop_body() const { return is_body_program; }
bool is_debug_build() const { return options.get<build_option_type::debug>()->enabled(); } bool is_debug_build() const { return options.get<build_option_type::debug>()->enabled(); }
const nodes_ordering& get_processing_order() const; const nodes_ordering& get_processing_order() const;
nodes_ordering& get_processing_order(); nodes_ordering& get_processing_order();
@ -228,7 +230,8 @@ public:
const topology_impl& topology, const topology_impl& topology,
const build_options& options, const build_options& options,
bool is_internal = false, bool is_internal = false,
bool no_optimizations = false); bool no_optimizations = false,
bool is_body_program = false);
static ptr build_program(engine& engine, static ptr build_program(engine& engine,
const std::set<std::shared_ptr<program_node>>& nodes, const std::set<std::shared_ptr<program_node>>& nodes,
const build_options& options, const build_options& options,
@ -253,6 +256,7 @@ private:
nodes_ordering processing_order; nodes_ordering processing_order;
std::unique_ptr<pass_manager> pm; std::unique_ptr<pass_manager> pm;
std::shared_ptr<kernel_selector::TuningCache> tuning_cache; std::shared_ptr<kernel_selector::TuningCache> tuning_cache;
bool is_body_program;
std::map<primitive_id, std::shared_ptr<program_node>> nodes_map; std::map<primitive_id, std::shared_ptr<program_node>> nodes_map;

11
inference-engine/thirdparty/clDNN/src/program.cpp vendored
View File

@ -84,13 +84,15 @@ program_impl::program_impl(engine& engine_ref,
topology_impl const& topology, topology_impl const& topology,
build_options const& options, build_options const& options,
bool is_internal, bool is_internal,
bool no_optimizations) bool no_optimizations,
bool is_body_program)
: _engine(engine_ref), : _engine(engine_ref),
_stream(_engine.create_stream()), _stream(_engine.create_stream()),
program_state(_engine), program_state(_engine),
options(options), options(options),
processing_order(), processing_order(),
tuning_cache(nullptr) { tuning_cache(nullptr),
is_body_program(is_body_program) {
init_primitives(); init_primitives();
kernel_selector::KernelBase::ResetCounter(); kernel_selector::KernelBase::ResetCounter();
set_options(); set_options();
@ -163,8 +165,9 @@ program_impl::ptr program_impl::build_program(engine& engine,
const topology_impl& topology, const topology_impl& topology,
const build_options& options, const build_options& options,
bool is_internal, bool is_internal,
bool no_optimizations) { bool no_optimizations,
return std::make_shared<program_impl>(engine, topology, options, is_internal, no_optimizations); bool is_body_program) {
return std::make_shared<program_impl>(engine, topology, options, is_internal, no_optimizations, is_body_program);
} }
program_impl::ptr program_impl::build_program(engine& engine, program_impl::ptr program_impl::build_program(engine& engine,