Skip to content

Commit afcd6a7

Browse files
brian-dellabettabrian-dellabetta
authored
Merge branch 'main' into fix/zero-point-decompression
2 parents 3ffb213 + e88e7d4 commit afcd6a7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+2608
-1263
lines changed

‎.github/actions/test/action.yml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ inputs:
99
required: true
1010
code_coverage:
1111
description: whether to collect code coverage metrics during test run
12-
type: boolean
13-
default: false
12+
default: 'false'
1413
outputs:
1514
status:
1615
description: "final status from test"
@@ -51,7 +50,7 @@ runs:
5150
5251
if [[ "${ENABLE_COVERAGE}" == "true" ]]; then
5352
echo "::group::Installing code coverage requirements via pip"
54-
pip install bashlex https://github.com/neuralmagic/pytest-nm-releng/archive/v0.4.0.tar.gz
53+
pip install https://github.com/neuralmagic/pytest-nm-releng/archive/v0.4.0.tar.gz
5554
pip install coverage pytest-cov
5655
5756
# Adding Code coverage to the tests
@@ -76,7 +75,7 @@ runs:
7675
fi
7776
echo "::endgroup::"
7877
fi
79-
78+
8079
deactivate
8180
exit ${SUCCESS}
8281
shell: bash

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

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -55,27 +55,3 @@ jobs:
5555
whl: ${{ needs.BUILD.outputs.whl }}
5656
code_coverage: ${{ matrix.test_config.code_coverage || false }}
5757
secrets: inherit
58-
59-
UPLOAD:
60-
needs: [TEST]
61-
uses: ./.github/workflows/upload.yml
62-
with:
63-
label: gcp-k8s-util
64-
timeout: 40
65-
run_id: ${{ github.run_id }}
66-
push_to_pypi: ${{ inputs.push_to_pypi }}
67-
secrets: inherit
68-
69-
REPORT:
70-
needs: [BUILD, TEST]
71-
if: success() || failure()
72-
uses: ./.github/workflows/report.yml
73-
with:
74-
label: rh-reporter
75-
timeout: 40
76-
run_id: ${{ github.run_id }}
77-
run_name: compressed-tensors
78-
wheel: ${{ needs.BUILD.outputs.whl }}
79-
wf_category: ${{ inputs.wf_category }}
80-
gitref: ${{ inputs.gitref }}
81-
secrets: inherit

‎.github/workflows/build.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,9 @@ jobs:
8686
id: auth
8787
uses: google-github-actions/[email protected]
8888
with:
89-
project_id: ${{ secrets.GCP_PROJECT }}
90-
workload_identity_provider: ${{ secrets.GCP_WORKLOAD_IDENTITY_PROVIDER }}
91-
service_account: ${{ secrets.GCP_GHA_SA }}
89+
project_id: ${{ secrets.GCP_VLLM_PROJECT }}
90+
workload_identity_provider: ${{ secrets.GCP_VLLM_PROJECT_WORKLOAD_IDENTITY_PROVIDER }}
91+
service_account: ${{ secrets.GCP_VLLM_PROJECT_GHA_SA }}
9292

9393
- name: 'Set up Cloud SDK'
9494
uses: 'google-github-actions/setup-gcloud@v2'
@@ -97,8 +97,8 @@ jobs:
9797

9898
- name: copy whl and source distribution
9999
run: |
100-
gcloud storage cp dist/${{ steps.build.outputs.whlname }} ${{ secrets.GCP_BUILD_ML_ASSETS2 }}/${{ github.run_id }}/${{ steps.build.outputs.whlname }}
101-
gcloud storage cp dist/${{ steps.build.outputs.tarname }} ${{ secrets.GCP_BUILD_ML_ASSETS2 }}/${{ github.run_id }}/${{ steps.build.outputs.tarname }}
100+
gcloud storage cp dist/${{ steps.build.outputs.whlname }} ${{ secrets.GCP_VLLM_PROJECT_BUILD_ASSETS }}/${{ github.run_id }}/${{ steps.build.outputs.whlname }}
101+
gcloud storage cp dist/${{ steps.build.outputs.tarname }} ${{ secrets.GCP_VLLM_PROJECT_BUILD_ASSETS }}/${{ github.run_id }}/${{ steps.build.outputs.tarname }}
102102
103103
- name: upload whl
104104
uses: actions/upload-artifact@v4

‎.github/workflows/post-release-nightly-build.yml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
name: Post-release nightly build & release
2+
3+
on:
4+
release:
5+
types: [released]
6+
7+
jobs:
8+
BUILD-TEST-NIGHTLY:
9+
name: Post-release nightly build & release
10+
uses: ./.github/workflows/trigger-all.yml
11+
with:
12+
wf_category: NIGHTLY
13+
push_to_pypi: true
14+
gitref: main
15+
secrets: inherit

‎.github/workflows/report.yml‎

Lines changed: 0 additions & 128 deletions
This file was deleted.

‎.github/workflows/test-check.yaml‎

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ on:
1212

1313
jobs:
1414
python-tests:
15-
runs-on: ubuntu-24.04
15+
runs-on: ubuntu-22.04
16+
env:
17+
HF_TOKEN: ${{ secrets.HF_RED_HAT_READ_ONLY }}
1618
steps:
1719
- uses: actions/setup-python@v5
1820
with:
@@ -21,11 +23,28 @@ jobs:
2123
with:
2224
fetch-depth: 0
2325
fetch-tags: true
26+
- name: Install system dependencies
27+
run: |-
28+
sudo apt-get update
29+
sudo apt-get install -y --no-install-recommends g++ gcc make
2430
- name: Set Env
25-
run: |
26-
pip3 install --upgrade pip && pip3 install --upgrade setuptools
31+
run: pip3 install --upgrade pip setuptools
2732
- name: "⚙️ Install dependencies"
2833
run: pip3 install .[dev,accelerate]
34+
- name: clean up
35+
run: |
36+
echo "cleaning up disk space as GHA runner has limited disk size."
37+
python3 -m pip cache purge
38+
sudo rm -rf /usr/local/.ghcup
39+
sudo rm -rf /opt/hostedtoolcache/CodeQL
40+
sudo rm -rf /usr/local/lib/android/sdk/ndk
41+
sudo rm -rf /usr/share/dotnet
42+
sudo rm -rf /opt/ghc
43+
sudo rm -rf /usr/local/share/boost
44+
if [[ "$(cat /etc/issue)" =~ Ubuntu ]]; then
45+
sudo apt-get clean
46+
fi
47+
df -h
48+
shell: bash
2949
- name: "🔬 Running tests"
3050
run: make test
31-

‎.github/workflows/test.yml‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,8 @@ jobs:
7171
contents: 'read'
7272
id-token: 'write'
7373
pages: 'write'
74+
env:
75+
HF_TOKEN: ${{ secrets.HF_RED_HAT_READ_ONLY }}
7476
environment:
7577
name: github-pages
7678
url: ${{ steps.coverage.outputs.page_url }}
@@ -79,7 +81,7 @@ jobs:
7981

8082
- name: set python
8183
id: set_python
82-
uses: actions/setup-python@v5
84+
uses: actions/setup-python@v6
8385
with:
8486
python-version: ${{ inputs.python }}
8587

@@ -90,13 +92,9 @@ jobs:
9092
python-version: ${{ inputs.python }}
9193

9294
- name: install system dependencies
93-
run: |
94-
if command -v g++ >/dev/null 2>&1; then
95-
echo "found g++ compiler"
96-
else
97-
echo "installing g++ etc compilers..."
98-
sudo apt update && sudo apt install -y g++ gcc
99-
fi
95+
run: |-
96+
sudo apt-get update
97+
sudo apt-get install -y --no-install-recommends g++ gcc make
10098
shell: bash
10199

102100
- name: checkout code
@@ -124,9 +122,9 @@ jobs:
124122
id: auth
125123
uses: google-github-actions/[email protected]
126124
with:
127-
project_id: ${{ secrets.GCP_PROJECT }}
128-
workload_identity_provider: ${{ secrets.GCP_WORKLOAD_IDENTITY_PROVIDER }}
129-
service_account: ${{ secrets.GCP_GHA_SA }}
125+
project_id: ${{ secrets.GCP_VLLM_PROJECT }}
126+
workload_identity_provider: ${{ secrets.GCP_VLLM_PROJECT_WORKLOAD_IDENTITY_PROVIDER }}
127+
service_account: ${{ secrets.GCP_VLLM_PROJECT_GHA_SA }}
130128

131129
- name: 'Set up Cloud SDK'
132130
uses: 'google-github-actions/setup-gcloud@v2'
@@ -137,7 +135,7 @@ jobs:
137135
if: ${{ inputs.run_id != '' }}
138136
uses: neuralmagic/nm-actions/actions/[email protected]
139137
with:
140-
bucket_source: ${{ secrets.GCP_BUILD_ML_ASSETS2 }}
138+
bucket_source: ${{ secrets.GCP_VLLM_PROJECT_BUILD_ASSETS }}
141139
run_id: ${{ inputs.run_id }}
142140

143141
- name: run tests
@@ -166,13 +164,13 @@ jobs:
166164

167165
- name: copy results to GCP
168166
run: |
169-
gcloud storage cp test-results/report.xml ${{ secrets.GCP_BUILD_ML_ASSETS2 }}/${{ github.run_id }}/test-results/report-${{ inputs.test_label }}.xml
167+
gcloud storage cp test-results/report.xml ${{ secrets.GCP_VLLM_PROJECT_BUILD_ASSETS }}/${{ github.run_id }}/test-results/report-${{ inputs.test_label }}.xml
170168
171169
- name: upload results
172170
uses: actions/upload-artifact@v4
173171
if: success() || failure()
174172
with:
175-
name: report-${{ inputs.test_label }}.xml
173+
name: report-${{ inputs.python }}-${{ inputs.test_label }}.xml
176174
path: test-results/report.xml
177175
retention-days: 5
178176

‎.github/workflows/trigger-all.yml‎

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,17 @@ on:
55
# * is a special character in YAML so you have to quote this string
66
- cron: '30 0 * * *' # nightly run
77

8+
workflow_call:
9+
inputs:
10+
wf_category:
11+
description: "workflow category, must be 'NIGHTLY' or 'RELEASE' (default: NIGHTLY)"
12+
type: string
13+
default: NIGHTLY
14+
gitref:
15+
description: "git commit hash or tag name"
16+
type: string
17+
default: 'main'
18+
819
workflow_dispatch:
920
inputs:
1021
wf_category:
@@ -14,12 +25,8 @@ on:
1425
- NIGHTLY
1526
- RELEASE
1627
default: NIGHTLY
17-
push_to_pypi:
18-
description: "when set and tests pass, then '.whl' & '.tar.gz' will be pushed to public pypi"
19-
type: boolean
20-
default: false
2128
gitref:
22-
description: "git commit hash or tag name"
29+
description: "git commit hash or tag name"
2330
type: string
2431
default: 'main'
2532

@@ -31,10 +38,8 @@ jobs:
3138
with:
3239
wf_category: ${{ inputs.wf_category || 'NIGHTLY' }}
3340
gitref: ${{ inputs.gitref || 'main' }}
34-
push_to_pypi: ${{ (github.event.schedule == '30 0 * * *') || inputs.push_to_pypi || false }}
35-
test_configs: '[{"python":"3.11.4","label":"ubuntu-24.04","timeout":"40","code_coverage":true},
36-
{"python":"3.10.12","label":"ubuntu-22.04","timeout":"40"},
37-
{"python":"3.9.17","label":"k8s-h100-solo","timeout":"40"},
38-
{"python":"3.12.6","label":"k8s-a100-duo","timeout":"40"}]'
39-
41+
test_configs: '[{"python":"3.11.4","label":"ubuntu-latest","timeout":"40","code_coverage":true},
42+
{"python":"3.10.12","label":"ubuntu-latest","timeout":"40"},
43+
{"python":"3.13","label":"ubuntu-24.04","timeout":"40"},
44+
{"python":"3.12.6","label":"ubuntu-22.04","timeout":"40"}]'
4045
secrets: inherit

0 commit comments

Comments
 (0)