Skip to content
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.

Sign up for GitHub

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

Use older MSVC toolchain version #926

Merged
merged 18 commits into from
Oct 9, 2024
Merged

Use older MSVC toolchain version #926

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
7c06845
Use older MSVC toolchain version
ilya-lavrenov Oct 8, 2024
83d7de3
Use OpenVINO runners
ilya-lavrenov Oct 8, 2024
390df5e
Apply suggestions from code review
ilya-lavrenov Oct 8, 2024
c3763ef
Try to fix Windows
ilya-lavrenov Oct 8, 2024
ce2b419
Merge remote-tracking branch 'upstream/master' into windows-gha-ci
ilya-lavrenov Oct 8, 2024
f49d893
Added &
ilya-lavrenov Oct 8, 2024
88d34ce
Merge remote-tracking branch 'origin/windows-gha-ci' into windows-gha-ci
ilya-lavrenov Oct 8, 2024
b8b1f84
Update stable_diffusion_1_5_cpp.yml
ilya-lavrenov Oct 8, 2024
b30e3a8
Merge branch 'master' into windows-gha-ci
ilya-lavrenov Oct 8, 2024
0b8da1b
Update stable_diffusion_1_5_cpp.yml
ilya-lavrenov Oct 8, 2024
c3e4c26
Apply suggestions from code review
ilya-lavrenov Oct 8, 2024
77b9c0d
Apply suggestions from code review
ilya-lavrenov Oct 8, 2024
5b614fa
Apply suggestions from code review
ilya-lavrenov Oct 8, 2024
b960eac
Apply suggestions from code review
ilya-lavrenov Oct 8, 2024
f67d3f9
Apply suggestions from code review
ilya-lavrenov Oct 8, 2024
d3a81bd
Update .github/workflows/stable_diffusion_1_5_cpp.yml
ilya-lavrenov Oct 8, 2024
2a4f2da
Apply suggestions from code review
ilya-lavrenov Oct 8, 2024
de77629
Merge branch 'master' into windows-gha-ci
Wovchena Oct 9, 2024
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
10 changes: 6 additions & 4 deletions .github/workflows/causal_lm_cpp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,8 +202,7 @@ jobs:
echo "Multi prompt" passed

cpp-greedy_causal_lm-windows:
runs-on: windows-latest
if: ${{ false }} # TODO: fix Windows
runs-on: windows-2019-16-core
env:
PYTHONIOENCODING: "utf8"
defaults:
Expand All @@ -218,6 +217,8 @@ jobs:
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 @@ -756,8 +757,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-latest
if: ${{ false }} # TODO: fix Windows
runs-on: windows-2019-16-core
env:
PYTHONIOENCODING: "utf8"
defaults:
Expand All @@ -772,6 +772,8 @@ jobs:
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
12 changes: 8 additions & 4 deletions .github/workflows/lcm_dreamshaper_cpp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +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-latest
if: ${{ false }} # TODO: fix Windows
runs-on: windows-2019-16-core
defaults:
run:
shell: pwsh
Expand All @@ -89,6 +88,11 @@ 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 Expand Up @@ -116,9 +120,9 @@ jobs:
optimum-cli export openvino --model SimianLuo/LCM_Dreamshaper_v7 --task stable-diffusion --weight-format fp16 models/lcm_dreamshaper_v7/FP16

- name: Run app
run: |
run: >
. "${{ env.OV_INSTALL_DIR }}/setupvars.ps1"
./build/samples/cpp/text2image/Release/lcm_dreamshaper.exe ./models/lcm_dreamshaper_v7/FP16 "cyberpunk cityscape like Tokyo New York with tall buildings at dusk golden hour cinematic lighting"
& "./build/samples/cpp/text2image/Release/stable_diffusion.exe ./models/lcm_dreamshaper_v7/FP16 'cyberpunk cityscape like Tokyo New York with tall buildings at dusk golden hour cinematic lighting'"

Overall_Status:
name: ci/gha_overall_status_lcm
Expand Down
25 changes: 16 additions & 9 deletions .github/workflows/stable_diffusion_1_5_cpp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,24 +63,20 @@ jobs:
run: |
source openvino_sd_cpp/bin/activate
optimum-cli export openvino --model dreamlike-art/dreamlike-anime-1.0 --weight-format fp16 --task stable-diffusion models/dreamlike-art-dreamlike-anime-1.0/FP16
wget -O ./models/soulcard.safetensors https://civitai.com/api/download/models/72591

- name: Run main app
run: |
source ${{ env.OV_INSTALL_DIR }}/setupvars.sh
./build/samples/cpp/text2image/stable_diffusion ./models/dreamlike-art-dreamlike-anime-1.0/FP16 "cyberpunk cityscape like Tokyo New York with tall buildings at dusk golden hour cinematic lighting"

- name: Download LoRA adapter
run: |
wget -O ./models/soulcard.safetensors https://civitai.com/api/download/models/72591

- name: Run LoRA app
run: |
source ${{ env.OV_INSTALL_DIR }}/setupvars.sh
./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-latest
if: ${{ false }} # TODO: fix Windows
runs-on: windows-2019-16-core
defaults:
run:
shell: pwsh
Expand All @@ -98,6 +94,11 @@ 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 All @@ -123,11 +124,17 @@ jobs:
run: |
. "./openvino_sd_cpp/Scripts/Activate.ps1"
optimum-cli export openvino --model dreamlike-art/dreamlike-anime-1.0 --task stable-diffusion --weight-format fp16 models/dreamlike-art-dreamlike-anime-1.0/FP16
Invoke-WebRequest -Uri 'https://civitai.com/api/download/models/72591' -OutFile 'models/soulcard.safetensors'

- name: Run app
run: |
- name: Run main app
run: >
. "${{ env.OV_INSTALL_DIR }}/setupvars.ps1"
& "./build/samples/cpp/text2image/Release/stable_diffusion.exe ./models/dreamlike-art-dreamlike-anime-1.0/FP16 'cyberpunk cityscape like Tokyo New York with tall buildings at dusk golden hour cinematic lighting'"

- name: Run LoRA app
run: >
. "${{ env.OV_INSTALL_DIR }}/setupvars.ps1"
./build/samples/cpp/text2image/Release/stable_diffusion.exe ./models/dreamlike-art-dreamlike-anime-1.0/FP16 "cyberpunk cityscape like Tokyo New York with tall buildings at dusk golden hour cinematic lighting"
& "./build/samples/cpp/text2image/Release/lora_stable_diffusion.exe ./models/dreamlike-art-dreamlike-anime-1.0/FP16 'curly-haired unicorn in the forest, anime, line' ./models/soulcard.safetensors 0.7"

Overall_Status:
name: ci/gha_overall_status_stable_diffusion
Expand Down
Loading