Skip to content

Commit 0d5fa93

Browse files
Trying to fix compilation with MSVC 2022 14.41 toolchain (#942)
See jinja2cpp/Jinja2Cpp#270
1 parent e151391 commit 0d5fa93

File tree

4 files changed

+6
-24
lines changed

4 files changed

+6
-24
lines changed

.github/workflows/causal_lm_cpp.yml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ jobs:
203203
echo "Multi prompt" passed
204204
205205
cpp-greedy_causal_lm-windows:
206-
runs-on: windows-2019-16-core
206+
runs-on: windows-latest
207207
env:
208208
PYTHONIOENCODING: "utf8"
209209
defaults:
@@ -216,10 +216,6 @@ jobs:
216216
- uses: actions/setup-python@v4
217217
with:
218218
python-version: 3.9
219-
- name: Configure Developer Command Prompt for Microsoft Visual C++
220-
uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0
221-
with:
222-
toolset: 14.29
223219
- run: curl --output ov.zip ${{ env.w_ov_link }}
224220
- run: unzip -d ov ov.zip
225221
- run: dirs=(ov/*) && mv ov/*/* ov && rmdir "${dirs[@]}"
@@ -767,7 +763,7 @@ jobs:
767763
timeout 200s ./build/samples/cpp/continuous_batching_benchmark/continuous_batching_benchmark -n 10 --dynamic_split_fuse --max_batch_size 256 --max_input_len 256 -m ./TinyLlama-1.1B-Chat-v1.0/ --dataset ./ShareGPT_V3_unfiltered_cleaned_split.json --cache_size 1
768764
769765
cpp-continuous-batching-windows:
770-
runs-on: windows-2019-16-core
766+
runs-on: windows-latest
771767
env:
772768
PYTHONIOENCODING: "utf8"
773769
defaults:
@@ -780,10 +776,6 @@ jobs:
780776
- uses: actions/setup-python@v4
781777
with:
782778
python-version: 3.9
783-
- name: Configure Developer Command Prompt for Microsoft Visual C++
784-
uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0
785-
with:
786-
toolset: 14.29
787779
- name: Install OpenVINO
788780
run: |
789781
curl --output ov.zip ${{ env.w_ov_link }}

.github/workflows/lcm_dreamshaper_cpp.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
./build/samples/cpp/text2image/stable_diffusion ./models/lcm_dreamshaper_v7/FP16 "cyberpunk cityscape like Tokyo New York with tall buildings at dusk golden hour cinematic lighting"
7171
7272
lcm_dreamshaper_v7_cpp-windows:
73-
runs-on: windows-2019-16-core
73+
runs-on: windows-latest
7474
defaults:
7575
run:
7676
shell: pwsh
@@ -88,11 +88,6 @@ jobs:
8888
mv ./tmp/*/* .
8989
popd
9090
91-
- name: Configure Developer Command Prompt for Microsoft Visual C++
92-
uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0
93-
with:
94-
toolset: 14.29
95-
9691
- name: Build app
9792
run: |
9893
. "${{ env.OV_INSTALL_DIR }}/setupvars.ps1"

.github/workflows/stable_diffusion_1_5_cpp.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ jobs:
7676
./build/samples/cpp/text2image/lora_stable_diffusion ./models/dreamlike-art-dreamlike-anime-1.0/FP16 "curly-haired unicorn in the forest, anime, line" ./models/soulcard.safetensors 0.7
7777
7878
stable_diffusion_1_5_cpp-windows:
79-
runs-on: windows-2019-16-core
79+
runs-on: windows-latest
8080
defaults:
8181
run:
8282
shell: pwsh
@@ -94,11 +94,6 @@ jobs:
9494
mv ./tmp/*/* .
9595
popd
9696
97-
- name: Configure Developer Command Prompt for Microsoft Visual C++
98-
uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0
99-
with:
100-
toolset: 14.29
101-
10297
- name: Build app
10398
run: |
10499
. "${{ env.OV_INSTALL_DIR }}/setupvars.ps1"

src/cpp/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ endif()
1515

1616
function(ov_genai_build_jinja2cpp)
1717
FetchContent_Declare(jinja2cpp
18-
URL https://github.com/jinja2cpp/Jinja2Cpp/archive/b32fbde7d98d13c34784c332c4a24a6f92c76e38.tar.gz
19-
URL_HASH SHA256=7cc25ddbc438a5c874d404e100b4eccd8a331c195417f5487c48aebcf4b9e7fb)
18+
URL https://github.com/ilya-lavrenov/Jinja2Cpp/archive/04073b62ec950eab6cdcb2c563c1c9bb7698f1ea.tar.gz
19+
URL_HASH SHA256=9f2a346eec91a6a381fe8fd631e9c952fe7087882bbca7f0e4e42e75e680fc1b)
2020

2121
FetchContent_GetProperties(jinja2cpp)
2222
if(NOT jinja2cpp_POPULATED)

0 commit comments

Comments
 (0)