Skip to content

Commit dd34c84

Browse files
committed
remove useless changes.
Signed-off-by: xipingya <xiping.yan@intel.com>
1 parent 9b3fc10 commit dd34c84

File tree

10 files changed

+11
-47
lines changed

10 files changed

+11
-47
lines changed

.gitignore

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,3 @@ __pycache__
4444

4545
# CodeQL artifacts
4646
_codeql_detected_source_root
47-
install
48-
*.avi
49-
50-
# Module-GenAI generated files
51-
dumped_*.yaml
52-
generated_*.bmp
53-
samples/python/module_genai/*.sh
54-
tests/module_genai/cpp/*.sh
55-
tests/module_genai/cpp/*.yaml
56-
tests/module_genai/cpp/test_data/*.json

.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[submodule "thirdparty/openvino_tokenizers"]
22
path = thirdparty/openvino_tokenizers
3-
url = https://github.com/openvinotoolkit/openvino_tokenizers.git
3+
url = https://github.com/openvinotoolkit/openvino_tokenizers.git

CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,6 @@ if(NOT CMAKE_CROSSCOMPILING)
4848
OUTPUT_VARIABLE OpenVINO_DIR_PY
4949
ERROR_QUIET
5050
)
51-
# Convert backslashes to forward slashes to avoid CMake escape character issues
52-
if(OpenVINO_DIR_PY)
53-
string(REPLACE "\\" "/" OpenVINO_DIR_PY "${OpenVINO_DIR_PY}")
54-
endif()
5551
endif()
5652
endif()
5753

samples/cpp/image_generation/CMakeLists.txt

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,6 @@ FetchContent_Declare(indicators
2222
URL_HASH SHA256=70da7a693ff7a6a283850ab6d62acf628eea17d386488af8918576d0760aef7b)
2323
FetchContent_MakeAvailable(indicators)
2424

25-
# Fix encoding issues with indicators library headers on Windows with non-UTF-8 code pages (e.g., code page 936)
26-
# The indicators library contains Unicode block characters (¨€) that break MSVC compilation without /utf-8
27-
set(IMAGE_GEN_SAMPLES
28-
text2image
29-
text2image_concurrency
30-
lora_text2image
31-
heterogeneous_stable_diffusion
32-
image2image
33-
image2image_concurrency
34-
stable_diffusion_export_import
35-
inpainting
36-
benchmark_image_gen)
37-
3825
# create main sample executable
3926

4027
add_executable(text2image text2image.cpp imwrite.cpp)
@@ -205,12 +192,3 @@ install(TARGETS benchmark_image_gen
205192
RUNTIME DESTINATION samples_bin/
206193
COMPONENT samples_bin
207194
EXCLUDE_FROM_ALL)
208-
209-
# Apply /utf-8 compile option for MSVC to fix encoding issues with indicators library headers
210-
if(MSVC)
211-
foreach(target IN LISTS IMAGE_GEN_SAMPLES)
212-
if(TARGET ${target})
213-
target_compile_options(${target} PRIVATE /utf-8)
214-
endif()
215-
endforeach()
216-
endif()
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
build
22
ut_pipelines
3-
temp_*.yaml
3+
temp_*.yaml
4+
dumped_*.yaml
5+
generated_*.bmp
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
*.png
22
*.yaml
33
*.mp4
4-
*.avi
4+
*.avi
5+
*.sh

src/cpp/src/image_generation/models/autoencoder_kl.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,6 @@ AutoencoderKL::AutoencoderKL(const std::filesystem::path& vae_decoder_path,
147147
m_decoder_model = utils::singleton_core().read_model(vae_decoder_path / "openvino_model.xml");
148148
// apply VaeImageProcessor postprocessing steps by merging them into the VAE decoder model
149149
merge_vae_image_post_processing(enable_postprocess);
150-
151150
compile(device, *extract_adapters_from_properties(properties_without_blob));
152151
}
153152

src/python/CMakeLists.txt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,6 @@ endif()
3535

3636
target_link_libraries(${TARGET_NAME} PRIVATE openvino::genai)
3737
target_include_directories(${TARGET_NAME} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/.." "${OpenVINOGenAI_SOURCE_DIR}/src/cpp/src") # for tokenizer/tokenizers_path.hpp
38-
39-
# Fix encoding issues with pybind11 headers on Windows with non-UTF-8 code pages (e.g., code page 936)
40-
if(MSVC)
41-
target_compile_options(${TARGET_NAME} PRIVATE /utf-8)
42-
endif()
43-
4438
set_target_properties(${TARGET_NAME} PROPERTIES
4539
ARCHIVE_OUTPUT_DIRECTORY "$<1:${CMAKE_BINARY_DIR}/openvino_genai/>"
4640
LIBRARY_OUTPUT_DIRECTORY "$<1:${CMAKE_BINARY_DIR}/openvino_genai/>"

tests/module_genai/cpp/.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
dumped*.yaml
22
profile*.json
3-
unittest_cache_dir_*
3+
unittest_cache_dir_*
4+
*.sh
5+
*.yaml
6+
test_data/*.json

tests/python_tests/test_vlm_pipeline.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1794,6 +1794,7 @@ def test_model_tags_older(
17941794
ov_pipe.generate(get_universal_tag(vision_type, 0), **get_vision_inputs_kwargs([input_tensor], vision_type))
17951795
ov_pipe.finish_chat()
17961796

1797+
17971798
@parametrize_model_with_vision_type()
17981799
def test_model_tags_missing_universal(ov_pipe_model: VlmModelInfo, vision_type: VisionType):
17991800
ov_pipe = ov_pipe_model.pipeline

0 commit comments

Comments
 (0)