Skip to content

Commit 7ff5055

Browse files
committed
fix config name conflict.
Signed-off-by: xipingya <xiping.yan@intel.com>
1 parent dd34c84 commit 7ff5055

File tree

4 files changed

+16
-10
lines changed

4 files changed

+16
-10
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "configuration_qwen3_omni.hpp"
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#pragma once
2+
3+
namespace ov::genai::modeling::models {
4+
5+
}

src/cpp/src/modeling/models/qwen3_omni/processing_qwen3_omni.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -901,24 +901,24 @@ Qwen3OmniCode2WavConfig Qwen3OmniCode2WavConfig::from_json(const nlohmann::json&
901901
}
902902

903903
// ────────────────────────────────────────────────────────────────────────────
904-
// Qwen3OmniConfig (top-level)
904+
// Qwen3OmniProcessingConfig (top-level)
905905
// ────────────────────────────────────────────────────────────────────────────
906906

907-
void Qwen3OmniConfig::finalize() {
907+
void Qwen3OmniProcessingConfig::finalize() {
908908
thinker.finalize();
909909
talker.finalize();
910910
code2wav.finalize();
911911
}
912912

913-
void Qwen3OmniConfig::validate() const {
913+
void Qwen3OmniProcessingConfig::validate() const {
914914
thinker.validate();
915915
talker.validate();
916916
code2wav.validate();
917917
}
918918

919-
Qwen3OmniConfig Qwen3OmniConfig::from_json(const nlohmann::json& data) {
919+
Qwen3OmniProcessingConfig Qwen3OmniProcessingConfig::from_json(const nlohmann::json& data) {
920920
using ov::genai::utils::read_json_param;
921-
Qwen3OmniConfig cfg;
921+
Qwen3OmniProcessingConfig cfg;
922922

923923
read_json_param(data, "model_type", cfg.model_type);
924924
read_json_param(data, "architectures", cfg.architectures);
@@ -949,7 +949,7 @@ Qwen3OmniConfig Qwen3OmniConfig::from_json(const nlohmann::json& data) {
949949
return cfg;
950950
}
951951

952-
Qwen3OmniConfig Qwen3OmniConfig::from_json_file(const std::filesystem::path& config_path) {
952+
Qwen3OmniProcessingConfig Qwen3OmniProcessingConfig::from_json_file(const std::filesystem::path& config_path) {
953953
auto resolved = resolve_config_path(config_path);
954954
if (!std::filesystem::exists(resolved)) {
955955
OPENVINO_THROW("Config file not found: ", resolved.string());

src/cpp/src/modeling/models/qwen3_omni/processing_qwen3_omni.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,11 +131,11 @@ struct Qwen3OmniCode2WavConfig {
131131
};
132132

133133
// ────────────────────────────────────────────────────────────────────────────
134-
// Qwen3OmniConfig (top-level, analogous to Qwen3VLConfig)
134+
// Qwen3OmniProcessingConfig (top-level, analogous to Qwen3VLConfig)
135135
// Mirrors Python Qwen3OmniConfig (configuration_qwen3_omni.py:1009).
136136
// ────────────────────────────────────────────────────────────────────────────
137137

138-
struct Qwen3OmniConfig {
138+
struct Qwen3OmniProcessingConfig {
139139
std::string model_type = "qwen3_omni";
140140
std::vector<std::string> architectures;
141141

@@ -156,8 +156,8 @@ struct Qwen3OmniConfig {
156156
void finalize();
157157
void validate() const;
158158

159-
static Qwen3OmniConfig from_json(const nlohmann::json& data);
160-
static Qwen3OmniConfig from_json_file(const std::filesystem::path& config_path);
159+
static Qwen3OmniProcessingConfig from_json(const nlohmann::json& data);
160+
static Qwen3OmniProcessingConfig from_json_file(const std::filesystem::path& config_path);
161161
};
162162

163163
// ────────────────────────────────────────────────────────────────────────────

0 commit comments

Comments
 (0)