Skip to content

Commit fea4e96

Browse files
ajindal1guschmueChangming Sunanujjsayanshaw24
authored
Cherry Pick round 1 for 0.8.2 (#1528)
Co-authored-by: Guenther Schmuelling <guschmue@microsoft.com> Co-authored-by: Changming Sun <chasun@microsoft.com> Co-authored-by: anujj <ajalota@nvidia.com> Co-authored-by: Sayan Shaw <52221015+sayanshaw24@users.noreply.github.com> Co-authored-by: Sayan Shaw <sayanshaw@microsoft.com>
1 parent caba648 commit fea4e96

21 files changed

+510
-474
lines changed

‎.github/workflows/android-build.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ on:
33
workflow_dispatch:
44
push:
55
branches:
6-
- main
7-
- rel-*
6+
- main
7+
- rel-*
88
pull_request:
99
concurrency:
10-
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
10+
group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.ref || github.sha }}
1111
cancel-in-progress: true
1212
env:
1313
ORT_NIGHTLY_REST_API: "https://feeds.dev.azure.com/aiinfra/PublicPackages/_apis/packaging/Feeds/ORT-Nightly/packages?packageNameQuery=Microsoft.ML.OnnxRuntime&api-version=6.0-preview.1"
@@ -22,7 +22,7 @@ jobs:
2222
# it doesn't work on macos-14.
2323
# HVF error: HV_UNSUPPORTED
2424
# it works on macos-13 but with macos-15 being released soon that isn't a long term solution.
25-
runs-on: [ "self-hosted", "1ES.Pool=onnxruntime-genai-Ubuntu2204-AMD-CPU" ]
25+
runs-on: ["self-hosted", "1ES.Pool=onnxruntime-genai-Ubuntu2204-AMD-CPU"]
2626
steps:
2727
- name: Checkout OnnxRuntime GenAI repo
2828
uses: actions/checkout@v4

‎.github/workflows/codeql.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
#
77
name: "CodeQL"
88
concurrency:
9-
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
9+
group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.ref || github.sha }}
1010
cancel-in-progress: true
1111
on:
1212
push:
13-
branches: [ "main" ]
13+
branches: ["main"]
1414
pull_request:
1515
# The branches below must be a subset of the branches above
16-
branches: [ "main" ]
16+
branches: ["main"]
1717
schedule:
1818
- cron: '41 13 * * 0'
1919

@@ -29,7 +29,7 @@ jobs:
2929
strategy:
3030
fail-fast: false
3131
matrix:
32-
language: [ 'python' ]
32+
language: ['python']
3333
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
3434
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
3535

‎.github/workflows/ios-build.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ on:
33
workflow_dispatch:
44
push:
55
branches:
6-
- main
7-
- rel-*
6+
- main
7+
- rel-*
88
pull_request:
99
concurrency:
10-
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
10+
group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.ref || github.sha }}
1111
cancel-in-progress: true
1212
jobs:
1313
iphonesimulator-arm64-build:
@@ -29,7 +29,7 @@ jobs:
2929
python3 -m pip install requests
3030
3131
- name: Run iOS Build
32-
run: |
32+
run: |-
3333
set -e -x
3434
source genai-macos-venv/bin/activate
3535
python3 build.py --ios \
@@ -38,4 +38,4 @@ jobs:
3838
--osx_arch arm64 \
3939
--apple_deploy_target 15.4 \
4040
--cmake_generator 'Xcode' \
41-
--build_dir build_iphonesimulator
41+
--build_dir build_iphonesimulator

‎.github/workflows/linux-cpu-arm64-build.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ on:
33
workflow_dispatch:
44
push:
55
branches:
6-
- main
7-
- rel-*
6+
- main
7+
- rel-*
88
pull_request:
99

1010
concurrency:
11-
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
11+
group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.ref || github.sha }}
1212
cancel-in-progress: true
1313
env:
1414
ORT_NIGHTLY_REST_API: "https://feeds.dev.azure.com/aiinfra/PublicPackages/_apis/packaging/Feeds/ORT-Nightly/packages?packageNameQuery=Microsoft.ML.OnnxRuntime&api-version=6.0-preview.1"
@@ -18,7 +18,7 @@ env:
1818

1919
jobs:
2020
linux-cpu-arm64-build:
21-
runs-on: [ "self-hosted", "1ES.Pool=onnxruntime-genai-Ubuntu2004-ARM-CPU" ]
21+
runs-on: ["self-hosted", "1ES.Pool=onnxruntime-genai-Ubuntu2004-ARM-CPU"]
2222
steps:
2323
- name: Checkout OnnxRuntime GenAI repo
2424
uses: actions/checkout@v4

‎.github/workflows/linux-cpu-x64-build.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ on:
33
workflow_dispatch:
44
push:
55
branches:
6-
- main
7-
- rel-*
6+
- main
7+
- rel-*
88
pull_request:
99
concurrency:
10-
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
10+
group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.ref || github.sha }}
1111
cancel-in-progress: true
1212
env:
1313
ORT_NIGHTLY_REST_API: "https://feeds.dev.azure.com/aiinfra/PublicPackages/_apis/packaging/Feeds/ORT-Nightly/packages?packageNameQuery=Microsoft.ML.OnnxRuntime&api-version=6.0-preview.1"
@@ -16,7 +16,7 @@ env:
1616
DOTNET_INSTALL_DIR: "${{ github.workspace }}/dotnet"
1717
jobs:
1818
linux_cpu_x64:
19-
runs-on: [ "self-hosted", "1ES.Pool=onnxruntime-genai-Ubuntu2204-AMD-CPU" ]
19+
runs-on: ["self-hosted", "1ES.Pool=onnxruntime-genai-Ubuntu2204-AMD-CPU"]
2020
steps:
2121
- name: Checkout OnnxRuntime GenAI repo
2222
uses: actions/checkout@v4
@@ -57,7 +57,7 @@ jobs:
5757
rustup override set 1.86.0
5858
rustup component add rust-src
5959
rustup show active-toolchain
60-
60+
6161
- name: Get the Latest OnnxRuntime Nightly Version
6262
shell: pwsh
6363
run: |
@@ -93,8 +93,8 @@ jobs:
9393
run: |
9494
set -e -x
9595
rm -rf build
96-
cmake --preset linux_gcc_cpu_release -DUSE_GUIDANCE=ON
97-
cmake --build --preset linux_gcc_cpu_release -DUSE_GUIDANCE=ON
96+
cmake --preset linux_gcc_cpu_release
97+
cmake --build --preset linux_gcc_cpu_release
9898
9999
- name: Install the python wheel and test dependencies
100100
run: |

‎.github/workflows/linux-cpu-x64-nightly-build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ jobs:
4949
run: |
5050
set -e -x
5151
rm -rf build
52-
cmake --preset linux_gcc_cpu_release -DUSE_GUIDANCE=ON
53-
cmake --build --preset linux_gcc_cpu_release -DUSE_GUIDANCE=ON
52+
cmake --preset linux_gcc_cpu_release
53+
cmake --build --preset linux_gcc_cpu_release
5454
5555
- name: Install the python wheel and test dependencies
5656
run: |

‎.github/workflows/linux-gpu-x64-build.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ on:
33
workflow_dispatch:
44
push:
55
branches:
6-
- main
7-
- rel-*
6+
- main
7+
- rel-*
88
pull_request:
99

1010
concurrency:
11-
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
11+
group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.ref || github.sha }}
1212
cancel-in-progress: true
1313

1414
env:
@@ -19,9 +19,9 @@ env:
1919

2020
jobs:
2121
linux-cuda-x64-build:
22-
env :
22+
env:
2323
PYTHON_EXECUTABLE: "/opt/python/cp310-cp310/bin/python3.10"
24-
runs-on: [ "self-hosted", "1ES.Pool=onnxruntime-genai-Ubuntu2204-A10" ]
24+
runs-on: ["self-hosted", "1ES.Pool=onnxruntime-genai-Ubuntu2204-A10"]
2525
steps:
2626
- name: Checkout OnnxRuntime GenAI repo
2727
uses: actions/checkout@v4
@@ -68,7 +68,7 @@ jobs:
6868
rustup override set 1.86.0
6969
rustup component add rust-src
7070
rustup show active-toolchain
71-
71+
7272
- name: Get the Latest OnnxRuntime Nightly Version
7373
shell: pwsh
7474
run: |

‎.github/workflows/mac-cpu-arm64-build.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ on:
33
workflow_dispatch:
44
push:
55
branches:
6-
- main
7-
- rel-*
6+
- main
7+
- rel-*
88
pull_request:
99
concurrency:
10-
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
10+
group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.ref || github.sha }}
1111
cancel-in-progress: true
1212
env:
1313
ORT_NIGHTLY_REST_API: "https://feeds.dev.azure.com/aiinfra/PublicPackages/_apis/packaging/Feeds/ORT-Nightly/packages?packageNameQuery=Microsoft.ML.OnnxRuntime&api-version=6.0-preview.1"
@@ -66,13 +66,13 @@ jobs:
6666
run: |
6767
export MACOSX_DEPLOYMENT_TARGET=$(sw_vers -productVersion | cut -d. -f1,2)
6868
export RUSTFLAGS='-C link-arg=-Wl,-undefined,dynamic_lookup -C link-arg=-Wl,-no_dead_strip_inits_and_terms'
69-
cmake --preset macos_arm64_cpu_release -DUSE_GUIDANCE=ON
69+
cmake --preset macos_arm64_cpu_release
7070
7171
- name: Build with CMake
7272
run: |
7373
export MACOSX_DEPLOYMENT_TARGET=$(sw_vers -productVersion | cut -d. -f1,2)
7474
export RUSTFLAGS='-C link-arg=-Wl,-undefined,dynamic_lookup -C link-arg=-Wl,-no_dead_strip_inits_and_terms'
75-
cmake --build --preset macos_arm64_cpu_release --parallel -DUSE_GUIDANCE=ON
75+
cmake --build --preset macos_arm64_cpu_release --parallel
7676
continue-on-error: false
7777

7878
- name: Install the python wheel and test dependencies

0 commit comments

Comments
 (0)