Skip to content

Commit 584a432

Browse files
Merge branch 'main' into bdellabe/awq-w4a8
2 parents 3f01afa + 4c9ac83 commit 584a432

File tree

161 files changed

+3633
-1092
lines changed

Some content is hidden

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

161 files changed

+3633
-1092
lines changed

.coveragerc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[run]
2+
patch = subprocess

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 0 additions & 31 deletions
This file was deleted.
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
name: 🐛 Bug report
2+
description: Raise an issue here if you find a bug.
3+
labels: bug
4+
title: "[Bug]: "
5+
6+
body:
7+
- type: markdown
8+
attributes:
9+
value: >
10+
#### Before submitting an issue, please make sure the issue hasn't been already addressed by searching through [the existing and past issues](https://github.com/vllm-project/llm-compressor/issues?q=is%3Aissue+sort%3Acreated-desc+).
11+
12+
#### ⚠️ For any issues related vLLM which are not related to quantization or compressed models, please create an issue in [vllm-project/vllm](https://github.com/vllm-project/vllm/issues).
13+
- type: textarea
14+
attributes:
15+
label: ⚙️ Your current environment
16+
description: |
17+
Please run the following and paste the output below.
18+
```bash
19+
wget https://raw.githubusercontent.com/vllm-project/llm-compressor/main/tools/collect_env.py
20+
# For security purposes, please feel free to check the contents of collect_env.py before running it.
21+
python collect_env.py
22+
```
23+
value: |
24+
<details>
25+
<summary>The output of <code>python collect_env.py</code></summary>
26+
27+
```text
28+
Your output of `python collect_env.py` here
29+
```
30+
31+
</details>
32+
validations:
33+
required: true
34+
- type: textarea
35+
attributes:
36+
label: 🐛 Describe the bug
37+
description: |
38+
Please provide a clear and concise description of what the bug is.
39+
validations:
40+
required: true
41+
- type: textarea
42+
attributes:
43+
label: 🛠️ Steps to reproduce
44+
description: |
45+
If applicable, please describe any steps required to reproduce. If you can share an applicable huggingface model stub, please do so here.
46+
validations:
47+
required: false

.github/workflows/linkcheck.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,9 @@ name: Check Markdown links
22

33
on:
44
push:
5-
branches:
6-
- main
5+
branches: [ main, 'release/*' ]
76
pull_request:
8-
branches:
9-
- main
7+
branches: [ main, 'release/*' ]
108

119
# Allows you to run this workflow manually from the Actions tab
1210
workflow_dispatch:

.github/workflows/quality-check.yaml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
name: Quality Checks
22
on:
33
push:
4-
branches:
5-
- main
6-
- 'release/*'
4+
branches: [ main , 'release/*' ]
75
pull_request:
8-
branches:
9-
- main
10-
- 'release/*'
6+
branches: [ main, 'release/*' ]
117
jobs:
128
quality-check:
139
runs-on: ubuntu-22.04

.github/workflows/set-comment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: PR Reminder Comment Bot
22
on:
33
pull_request_target:
4-
branches: [main]
4+
branches: [ main, 'release/*' ]
55
types: [opened]
66

77
jobs:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
name: Test Checks (Transformers)
22
on:
33
pull_request:
4-
branches: [ main ]
4+
branches: [ main, 'release/*' ]
55
types: [ labeled, synchronize ]
66
push:
7-
branches: [ main ]
7+
branches: [ main, 'release/*' ]
88
workflow_dispatch:
99
inputs:
1010
code_coverage:

.github/workflows/test-check.yaml

Lines changed: 3 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
name: Test Checks (Base/PyTorch)
22
on:
33
pull_request:
4-
branches:
5-
- main
4+
branches: [ main, 'release/*' ]
65
push:
6+
branches: [ main, 'release/*' ]
77
workflow_dispatch:
88
inputs:
99
code_coverage:
@@ -115,59 +115,9 @@ jobs:
115115
run: |
116116
coverage report --data-file="$COVERAGE_FILE" --skip-empty --format="markdown" > "$GITHUB_STEP_SUMMARY"
117117
118-
compat-pytorch-1_9-pytorch-tests:
119-
runs-on: ubuntu-22.04
120-
env:
121-
COVERAGE_FILE: ".coverage.compat-pytorch-1.9"
122-
steps:
123-
- uses: actions/setup-python@v5
124-
with:
125-
python-version: '3.10'
126-
- uses: actions/checkout@v4
127-
with:
128-
fetch-depth: 0
129-
fetch-tags: true
130-
- name: "⚙️ Install dependencies"
131-
run: pip3 install -U pip setuptools && pip3 install .[dev]
132-
- uses: actions/checkout@v4
133-
with:
134-
repository: "neuralmagic/compressed-tensors"
135-
path: "compressed-tensors"
136-
fetch-depth: 0
137-
fetch-tags: true
138-
- name: "⚙️ Install compressed-tensors dependencies"
139-
run: |
140-
pip3 uninstall -y compressed-tensors
141-
export GIT_CEILING_DIRECTORIES="$(pwd)"
142-
cd compressed-tensors
143-
BUILD_TYPE=nightly pip3 install .
144-
- name: "Clean compressed-tensors directory"
145-
run: rm -r compressed-tensors/
146-
- name: "⚙️ Prepare code coverage"
147-
if: inputs.code_coverage
148-
uses: ./.github/actions/prepare-code-coverage
149-
- name: "🔬 Running pytorch tests"
150-
run: |
151-
pytest -v tests/llmcompressor/pytorch
152-
- name: "Upload coverage report"
153-
if: (success() || failure()) && inputs.code_coverage
154-
uses: actions/upload-artifact@v4
155-
with:
156-
name: compat-pytorch-tests-coverage-results
157-
path: |
158-
.coverage*
159-
coverage-html
160-
coverage.json
161-
include-hidden-files: true
162-
retention-days: 5
163-
- name: "Report coverage"
164-
if: (success() || failure()) && inputs.code_coverage
165-
run: |
166-
coverage report --data-file="$COVERAGE_FILE" --skip-empty --format="markdown" > "$GITHUB_STEP_SUMMARY"
167-
168118
combine-coverage:
169119
runs-on: ubuntu-22.04
170-
needs: [base-tests, pytorch-tests, compat-pytorch-1_9-pytorch-tests]
120+
needs: [base-tests, pytorch-tests]
171121
if: (success() || failure()) && inputs.code_coverage
172122
steps:
173123
- name: "Checkout llm-compressor"

.gitignore

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,6 @@ instance/
9393
# Scrapy stuff:
9494
.scrapy
9595

96-
# Sphinx documentation
97-
docs/_build/
98-
9996
# PyBuilder
10097
target/
10198

@@ -129,6 +126,7 @@ venv.bak/
129126

130127
# mkdocs documentation
131128
/site
129+
docs/.cache/
132130

133131
# mypy
134132
.mypy_cache/

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ endif
2525
quality:
2626
@echo "Running python quality checks";
2727
ruff check $(CHECKDIRS);
28+
ruff format --check $(CHECKDIRS);
2829
isort --check-only $(CHECKDIRS);
2930
flake8 $(CHECKDIRS) --max-line-length 88 --extend-ignore E203,W605;
3031

0 commit comments

Comments
 (0)