Skip to content

Commit 2e57ca2

Browse files
committed
qwen3.5 vision encode skipped. beacase required new-arch ov.
Signed-off-by: xipingya <xiping.yan@intel.com>
1 parent a3c3b78 commit 2e57ca2

2 files changed

Lines changed: 10 additions & 7 deletions

File tree

src/cpp/src/module_genai/modules/md_vision_encoder.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -352,8 +352,8 @@ void VisionEncoderModule::run() {
352352
}
353353
ov::Tensor attention_mask = get_input("attention_mask").as<ov::Tensor>();
354354

355-
if (model_type == VLMModelType::QWEN3_5) {
356355
#ifdef ENABLE_OPENVINO_NEW_ARCH
356+
if (model_type == VLMModelType::QWEN3_5) {
357357
Qwen3_5VisionEmbeddingResult result = embed(
358358
preprocessed_image, image_grid_thw, image_pos_embeds, image_rotary_cos, image_rotary_sin, input_ids, attention_mask);
359359

@@ -414,10 +414,8 @@ void VisionEncoderModule::run() {
414414
this->outputs["deepstack_embeds"].data = result.deepstack_embeds.value();
415415
}
416416
}
417-
return;
418417
#else
419-
}
420-
OPENVINO_THROW("Qwen 3.5 and Qwen 3 Omni vision encoder requires ENABLE_OPENVINO_NEW_ARCH to be enabled");
418+
OPENVINO_THROW("Qwen 3.5 encoder requires ENABLE_OPENVINO_NEW_ARCH to be enabled");
421419
#endif
422420
} else {
423421
OPENVINO_THROW("Unsupported model: " + module_desc->model_type);

tests/module_genai/cpp/modules/VisionEncoderModule.cpp

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
using namespace ov::genai::module;
1010

11+
namespace VisionEncoderTestData {
1112
struct VisionEncoderTestData {
1213
ov::Tensor preprocessed_image;
1314
std::vector<int> source_size;
@@ -229,6 +230,9 @@ class Qwen3_5VisionEncoderModuleTest
229230
void SetUp() override {
230231
REGISTER_TEST_NAME();
231232
std::tie(m_test_data, m_device) = GetParam();
233+
#ifndef ENABLE_OPENVINO_NEW_ARCH
234+
GTEST_SKIP() << "ENABLE_OPENVINO_NEW_ARCH must be enabled to run Qwen 3.5 vision encoder test.";
235+
#endif // ENABLE_OPENVINO_NEW_ARCH
232236
}
233237

234238
void TearDown() override {}
@@ -357,7 +361,8 @@ namespace qwen3_5_vision_encoder_test {
357361

358362
INSTANTIATE_TEST_SUITE_P(ModuleTestSuite,
359363
Qwen3_5VisionEncoderModuleTest,
360-
::testing::Combine(
361-
::testing::ValuesIn(qwen3_5_vision_encoder_test::test_data),
362-
::testing::ValuesIn(qwen3_5_vision_encoder_test::test_devices)),
364+
::testing::Combine(::testing::ValuesIn(qwen3_5_vision_encoder_test::test_data),
365+
::testing::ValuesIn(qwen3_5_vision_encoder_test::test_devices)),
363366
Qwen3_5VisionEncoderModuleTest::get_test_case_name);
367+
368+
} // namespace VisionEncoderTestData

0 commit comments

Comments
 (0)