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

[LLM] [NPU] StaticLLMPipeline: Compiler DQ update #1515

Merged
merged 8 commits into from
Jan 14, 2025
Merged

[LLM] [NPU] StaticLLMPipeline: Compiler DQ update #1515

Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ba70ef1
Update DQ query
smirnov-alexey Jan 9, 2025
f5dd5b1
Unconditionally utilize compiler DQ
smirnov-alexey Jan 13, 2025
cc44a0d
DQ only when in supported props
smirnov-alexey Jan 13, 2025
fa76cf7
Add prefix
smirnov-alexey Jan 13, 2025
868a7ac
Align DQ behaviour
smirnov-alexey Jan 13, 2025
3c72f4d
Address review comments
smirnov-alexey Jan 13, 2025
24b1a63
Merge branch 'master' into as/npuw_dq
smirnov-alexey Jan 13, 2025
102a1d9
Merge branch 'master' into as/npuw_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
50 changes: 30 additions & 20 deletions src/cpp/src/llm_pipeline_static.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,17 +475,16 @@ std::optional<NPUDesc> extract_npu_descriptor(ov::Core& core) {
}
const auto arch = core.get_property("NPU", ov::device::architecture);
const auto max_tiles = core.get_property("NPU", ov::intel_npu::max_tiles);

bool compiler_dq = false;
const auto device_caps = core.get_property("NPU", ov::device::capabilities);
if (std::find(device_caps.begin(), device_caps.end(),
"COMPILER_DYNAMIC_QUANTIZATION") != device_caps.end()) {
const auto supported_properties = core.get_property("NPU", ov::supported_properties);
if (std::find(supported_properties.begin(), supported_properties.end(),
lmielick marked this conversation as resolved.
Show resolved Hide resolved
"NPU_COMPILER_DYNAMIC_QUANTIZATION") != supported_properties.end()) {
compiler_dq = true;
}
return std::make_optional(NPUDesc{arch, max_tiles, compiler_dq});
}

ov::AnyMap get_baseline_common_config() {
ov::AnyMap get_baseline_common_config(bool enable_compiler_dq) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Please pass the NPUDesc here instead - there's a request to get rid of "high-precision" options in the future as well.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

ov::AnyMap config = {
{ "NPU_COMPILATION_MODE_PARAMS", "compute-layers-with-higher-precision=Sqrt,Power,ReduceMean,Add_RMSNorm" },
{ "NPUW_DEVICES", "NPU" },
Expand All @@ -497,11 +496,23 @@ ov::AnyMap get_baseline_common_config() {
{ "NPUW_SLICE_OUT", "YES" },
{ "NPUW_FUNCALL_ASYNC", "YES" }
};
if (enable_compiler_dq) {
config.emplace("NPUW_DQ", "YES");
config.emplace("NPUW_DQ_FULL", "NO");
config.emplace("NPU_COMPILER_DYNAMIC_QUANTIZATION", true);
dmatveev marked this conversation as resolved.
Show resolved Hide resolved
config.erase("NPUW_DCOFF_TYPE");
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();
bool enable_compiler_dq(const std::optional<NPUDesc>& npudesc) {
dmatveev marked this conversation as resolved.
Show resolved Hide resolved
return npudesc.has_value() && npudesc->compiler_dq;
Copy link
Collaborator

Choose a reason for hiding this comment

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

What's the purpose of this function? Why don't just use npudesc.has_value() && npudesc->compiler_dq straightaway

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

}

ov::AnyMap get_default_common_config(const std::shared_ptr<ov::Model>& model,
const std::optional<NPUDesc>& npudesc) {
auto config = get_baseline_common_config(enable_compiler_dq(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 @@ -513,40 +524,39 @@ 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 (!enable_compiler_dq(npudesc)) {
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 GenerateHint hint) {
auto config = get_default_common_config(model);
auto config = get_default_common_config(model, npudesc);
if (hint == 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 == 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 (!enable_compiler_dq(npudesc)) {
config.emplace("NPUW_DQ", "YES");
}
return config;
}
Expand Down
Loading