Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[NPUW] Update compiler DQ query in LLMCompiledModel #28343

Merged
merged 9 commits into from
Jan 14, 2025
+27 −20
Merged

[NPUW] Update compiler DQ query in LLMCompiledModel #28343

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1496131
Update compiler DQ query
smirnov-alexey Jan 9, 2025
a29f38d
Align logic
smirnov-alexey Jan 13, 2025
7cbd00c
Merge branch 'master' of https://github.com/openvinotoolkit/openvino …
smirnov-alexey Jan 13, 2025
4d0ad23
Fix clang format
smirnov-alexey Jan 13, 2025
2876598
Fix build
smirnov-alexey Jan 13, 2025
301026d
Merge branch 'master' into as/npuw_llm_compiled_dq
smirnov-alexey Jan 13, 2025
493f65a
Merge branch 'master' into as/npuw_llm_compiled_dq
smirnov-alexey Jan 14, 2025
8eacf6c
Merge branch 'master' into as/npuw_llm_compiled_dq
smirnov-alexey Jan 14, 2025
773d48d
Merge branch 'master' into as/npuw_llm_compiled_dq
smirnov-alexey Jan 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 27 additions & 20 deletions src/plugins/intel_npu/src/plugin/npuw/llm_compiled_model.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,11 +309,11 @@ std::optional<NPUDesc> extract_npu_descriptor(const std::shared_ptr<const ov::IP

const std::string arch = plugin->get_property(ov::device::architecture.name(), ov::AnyMap{}).as<std::string>();
const int64_t max_tiles = plugin->get_property(ov::intel_npu::max_tiles.name(), ov::AnyMap{}).as<int64_t>();

bool compiler_dq = false;
const auto device_caps =
plugin->get_property(ov::device::capabilities.name(), ov::AnyMap{}).as<std::vector<std::string>>();
if (std::find(device_caps.begin(), device_caps.end(), "COMPILER_DYNAMIC_QUANTIZATION") != device_caps.end()) {
const auto supported_properties =
plugin->get_property(ov::supported_properties.name(), ov::AnyMap{}).as<std::vector<ov::PropertyName>>();
if (std::find(supported_properties.begin(), supported_properties.end(), "NPU_COMPILER_DYNAMIC_QUANTIZATION") !=
supported_properties.end()) {
compiler_dq = true;
}
return std::make_optional(NPUDesc{arch, max_tiles, compiler_dq});
Expand All @@ -328,7 +328,7 @@ std::optional<ov::Any> pop_option(ov::AnyMap& config, const std::string& option_
return std::nullopt;
}

ov::AnyMap get_baseline_common_config() {
ov::AnyMap get_baseline_common_config(const std::optional<NPUDesc>& npudesc) {
ov::AnyMap config = {
{"NPU_COMPILATION_MODE_PARAMS", "compute-layers-with-higher-precision=Sqrt,Power,ReduceMean,Add_RMSNorm"},
{"NPUW_DEVICES", "NPU"},
Expand All @@ -339,11 +339,19 @@ ov::AnyMap get_baseline_common_config() {
{"NPUW_WEIGHTS_BANK", "shared"},
{"NPUW_SLICE_OUT", "YES"},
{"NPUW_FUNCALL_ASYNC", "YES"}};
// FIXME: this config logic is getting more and more complex
if (npudesc.has_value() && npudesc->compiler_dq) {
config.emplace("NPUW_DQ", "YES");
config.emplace("NPUW_DQ_FULL", "NO");
config.emplace("NPU_COMPILER_DYNAMIC_QUANTIZATION", "YES");
config.erase("NPUW_DCOFF_TYPE");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought it's not needed when NPUW_DQ: YES.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Needed in case config.emplace("NPUW_DQ_FULL", "NO");

config.erase("NPUW_DCOFF_SCALE");
}
return config;
}

ov::AnyMap get_default_common_config(const std::shared_ptr<ov::Model>& model) {
auto config = get_baseline_common_config();
ov::AnyMap get_default_common_config(const std::shared_ptr<ov::Model>& model, const std::optional<NPUDesc>& npudesc) {
auto config = get_baseline_common_config(npudesc);
const char* npu_l0 = std::getenv("DISABLE_OPENVINO_GENAI_NPU_L0");
if (npu_l0 && std::atoi(npu_l0) == 1) {
config.emplace("NPUW_WEIGHTS_BANK_ALLOC", "CPU");
Expand All @@ -354,38 +362,37 @@ ov::AnyMap get_default_common_config(const std::shared_ptr<ov::Model>& model) {
}

ov::AnyMap get_default_prefill_config(const std::shared_ptr<ov::Model>& model, const std::optional<NPUDesc>& npudesc) {
auto config = get_default_common_config(model);
if (is_cw_compressed(model)) {
config.emplace("NPUW_DQ", "YES");
} else {
config.emplace("NPUW_PMM", "NO");
}
auto config = get_default_common_config(model, npudesc);
if (npudesc.has_value() && npudesc->arch == "4000" && npudesc->max_tiles != -1) {
config.emplace("NPU_DPU_GROUPS", npudesc->max_tiles);
}
if (npudesc.has_value() && npudesc->compiler_dq) {
config.emplace("NPUW_DQ_FULL", "NO");
// Specify NPUW DQ if Compiler DQ is not enabled
if (!npudesc.has_value() || !npudesc->compiler_dq) {
if (is_cw_compressed(model)) {
config.emplace("NPUW_DQ", "YES");
} else {
config.emplace("NPUW_PMM", "NO");
}
}
return config;
}

ov::AnyMap get_default_generate_config(const std::shared_ptr<ov::Model>& model,
const std::optional<NPUDesc>& npudesc,
const ::intel_npu::npuw::llm::GenerateHint hint) {
auto config = get_default_common_config(model);
auto config = get_default_common_config(model, npudesc);
if (hint == ::intel_npu::npuw::llm::GenerateHint::BEST_PERF) {
config.emplace("NPUW_ONLINE_PIPELINE", "NONE");
}
// NB: Unconditionally set for generation model
config.emplace("NPUW_DQ", "YES");
if (npudesc.has_value() && npudesc->arch == "4000") {
config.emplace("NPU_DPU_GROUPS", 4);
}
if (hint == ::intel_npu::npuw::llm::GenerateHint::FAST_COMPILE) {
config.emplace("NPUW_UNFOLD_IREQS", "YES");
}
if (npudesc.has_value() && npudesc->compiler_dq) {
config.emplace("NPUW_DQ_FULL", "NO");
// Specify NPUW DQ if Compiler DQ is not enabled
if (!npudesc.has_value() || !npudesc->compiler_dq) {
config.emplace("NPUW_DQ", "YES");
}
return config;
}
Expand Down
Loading