Skip to content

Trying to fix compilation with MSVC 2022 14.41 toolchain #942

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.

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

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 2 additions & 10 deletions .github/workflows/causal_lm_cpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ jobs:
echo "Multi prompt" passed

cpp-greedy_causal_lm-windows:
runs-on: windows-2019-16-core
runs-on: windows-latest
env:
PYTHONIOENCODING: "utf8"
defaults:
Expand All @@ -216,10 +216,6 @@ jobs:
- uses: actions/setup-python@v4
with:
python-version: 3.9
- name: Configure Developer Command Prompt for Microsoft Visual C++
uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0
with:
toolset: 14.29
- run: curl --output ov.zip ${{ env.w_ov_link }}
- run: unzip -d ov ov.zip
- run: dirs=(ov/*) && mv ov/*/* ov && rmdir "${dirs[@]}"
Expand Down Expand Up @@ -760,7 +756,7 @@ jobs:
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

cpp-continuous-batching-windows:
runs-on: windows-2019-16-core
runs-on: windows-latest
env:
PYTHONIOENCODING: "utf8"
defaults:
Expand All @@ -773,10 +769,6 @@ jobs:
- uses: actions/setup-python@v4
with:
python-version: 3.9
- name: Configure Developer Command Prompt for Microsoft Visual C++
uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0
with:
toolset: 14.29
- name: Install OpenVINO
run: |
curl --output ov.zip ${{ env.w_ov_link }}
Expand Down
7 changes: 1 addition & 6 deletions .github/workflows/lcm_dreamshaper_cpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ jobs:
./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"

lcm_dreamshaper_v7_cpp-windows:
runs-on: windows-2019-16-core
runs-on: windows-latest
defaults:
run:
shell: pwsh
Expand All @@ -88,11 +88,6 @@ jobs:
mv ./tmp/*/* .
popd

- name: Configure Developer Command Prompt for Microsoft Visual C++
uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0
with:
toolset: 14.29

- name: Build app
run: |
. "${{ env.OV_INSTALL_DIR }}/setupvars.ps1"
Expand Down
7 changes: 1 addition & 6 deletions .github/workflows/stable_diffusion_1_5_cpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ jobs:
./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

stable_diffusion_1_5_cpp-windows:
runs-on: windows-2019-16-core
runs-on: windows-latest
defaults:
run:
shell: pwsh
Expand All @@ -94,11 +94,6 @@ jobs:
mv ./tmp/*/* .
popd

- name: Configure Developer Command Prompt for Microsoft Visual C++
uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0
with:
toolset: 14.29

- name: Build app
run: |
. "${{ env.OV_INSTALL_DIR }}/setupvars.ps1"
Expand Down
4 changes: 2 additions & 2 deletions src/cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ endif()

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

FetchContent_GetProperties(jinja2cpp)
if(NOT jinja2cpp_POPULATED)
Expand Down
Loading