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.

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

Integrate Marlin Kernels for Int4 GPTQ inference #2497

Merged
merged 52 commits into from
Mar 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
f30ed49
marlin
robertgshaw2-neuralmagic Jan 17, 2024
afd6547
Merge branch 'marlin' of github.com:neuralmagic/vllm into marlin
robertgshaw2-neuralmagic Jan 17, 2024
837d344
added marlin
robertgshaw2-neuralmagic Jan 17, 2024
7a43b29
trying to load packed weights turning out to be tricky
robertgshaw2-neuralmagic Jan 18, 2024
e034640
trying to load packed weights turning out to be tricky due to qkv
robertgshaw2-neuralmagic Jan 18, 2024
15e8f9c
integrated marlin for single gpu
robertgshaw2-neuralmagic Jan 18, 2024
d8286fb
Update llama.py
robertgshaw2-neuralmagic Jan 19, 2024
8bc625f
Fixes to Marlin quantization to allow execution via CUDA graphs captu…
alexm-neuralmagic Jan 19, 2024
2691e89
Integrate @efrantar's changes for CUDA graphs
alexm-neuralmagic Jan 19, 2024
92f7290
review comments based on zhyncs
alexm-neuralmagic Jan 19, 2024
bc10e4b
(1) Integrate the latest changes from Elias that improve large batch …
alexm-neuralmagic Jan 30, 2024
47987da
add bug fix
alexm-neuralmagic Jan 30, 2024
43aa818
refactored some of alex's work to be consistent with the gptq config
robertgshaw2-neuralmagic Feb 1, 2024
5906a60
updated to load model based on hf_config from AutoGPTQ
robertgshaw2-neuralmagic Feb 1, 2024
8dfeaa2
Reduce Marlin's kernel limitation of thread_n from 256 to 64 (to avoi…
alexm-neuralmagic Feb 2, 2024
c7fb928
Update checks related to MarlinConfig
alexm-neuralmagic Feb 2, 2024
1ea85f3
formatting
alexm-neuralmagic Feb 2, 2024
c876b79
Merge branch 'main' into marlin
robertgshaw2-neuralmagic Feb 7, 2024
a435c97
Update pybind.cpp
robertgshaw2-neuralmagic Feb 7, 2024
90e8b8f
Update ops.h
robertgshaw2-neuralmagic Feb 7, 2024
b03af7d
Update ops.h
robertgshaw2-neuralmagic Feb 7, 2024
9192287
readded marlin
robertgshaw2-neuralmagic Feb 7, 2024
ce50dd4
Bug fix for determination of the scales size in marlin layer
alexm-neuralmagic Feb 8, 2024
5a305d3
Ensure marlin only compiles for GPU compute capability >= 8.0
alexm-neuralmagic Feb 8, 2024
b1773aa
fix marlin compilation again
alexm-neuralmagic Feb 8, 2024
036e0ca
Merge branch 'vllm-project:main' into marlin
robertgshaw2-neuralmagic Feb 9, 2024
d63627e
added marlin test
robertgshaw2-neuralmagic Feb 18, 2024
18981b1
added marlin test
robertgshaw2-neuralmagic Feb 18, 2024
828c621
updated skipping logic
robertgshaw2-neuralmagic Feb 18, 2024
4f1759b
updated skipping logic
robertgshaw2-neuralmagic Feb 18, 2024
f1714e9
added memory profiling
robertgshaw2-neuralmagic Feb 18, 2024
e3a4706
added memory profiling
robertgshaw2-neuralmagic Feb 18, 2024
efd886c
test wout memory utilization
robertgshaw2-neuralmagic Feb 18, 2024
70f5850
updating memory profiling
robertgshaw2-neuralmagic Feb 18, 2024
567fe38
adding more profiling
robertgshaw2-neuralmagic Feb 18, 2024
01f5e40
updating memory profiling
robertgshaw2-neuralmagic Feb 18, 2024
fc5310c
removed memory profiling
robertgshaw2-neuralmagic Feb 18, 2024
99ab19d
cleaned up
robertgshaw2-neuralmagic Feb 18, 2024
eabeea6
added newline
robertgshaw2-neuralmagic Feb 18, 2024
d064595
ran ./format.sh
robertgshaw2-neuralmagic Feb 18, 2024
721351e
Merge branch 'upstream-main' into marlin
robertgshaw2-neuralmagic Feb 18, 2024
9b1bc5f
merged into upstream main
robertgshaw2-neuralmagic Feb 18, 2024
013f10f
Update test_marlin.py
robertgshaw2-neuralmagic Feb 18, 2024
7f2165e
Update test_marlin.py
robertgshaw2-neuralmagic Feb 18, 2024
79081ff
Merge branch 'main' into marlin
robertgshaw2-neuralmagic Feb 19, 2024
7a9b828
updated retry testing to use pytest-flaky rather than implementing th…
robertgshaw2-neuralmagic Feb 19, 2024
c23902f
missed newline
robertgshaw2-neuralmagic Feb 19, 2024
e7aba66
formatting
robertgshaw2-neuralmagic Feb 19, 2024
2403f7d
removed silly print
robertgshaw2-neuralmagic Feb 19, 2024
aabaed2
added license
robertgshaw2-neuralmagic Feb 29, 2024
a67dc8d
format
robertgshaw2-neuralmagic Feb 29, 2024
8ff42c0
minor change for ruff
robertgshaw2-neuralmagic Feb 29, 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
9 changes: 9 additions & 0 deletions csrc/ops.h
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,15 @@ torch::Tensor awq_dequantize(
int split_k_iters,
int thx,
int thy);

torch::Tensor marlin_gemm(
torch::Tensor& a,
torch::Tensor& b_q_weight,
torch::Tensor& b_scales,
torch::Tensor& workspace,
int64_t size_m,
int64_t size_n,
int64_t size_k);
#endif

void squeezellm_gemm(
Expand Down
4 changes: 3 additions & 1 deletion csrc/pybind.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,13 @@ PYBIND11_MODULE(TORCH_EXTENSION_NAME, m) {
&rotary_embedding,
"Apply GPT-NeoX or GPT-J style rotary embedding to query and key");

// Quantization ops
// Quantization ops
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit:

Suggested change
// Quantization ops
// Quantization ops

#ifndef USE_ROCM
ops.def("awq_gemm", &awq_gemm, "Quantized GEMM for AWQ");
ops.def("marlin_gemm", &marlin_gemm, "Marlin Optimized Quantized GEMM for GPTQ");
ops.def("awq_dequantize", &awq_dequantize, "Dequantization for AWQ");
#endif

ops.def("gptq_gemm", &gptq_gemm, "Quantized GEMM for GPTQ");
ops.def("gptq_shuffle", &gptq_shuffle, "Post processing for GPTQ");
ops.def("squeezellm_gemm", &squeezellm_gemm, "Quantized GEMM for SqueezeLLM");
Expand Down
209 changes: 209 additions & 0 deletions csrc/quantization/marlin/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,209 @@
Contains code from https://github.com/IST-DASLab/marlin

Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.

"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.

"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.

2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.

3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.

4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:

(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and

(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and

(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and

(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.

You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.

5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.

6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.

8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "{}"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright {yyyy} {name of copyright owner}

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

------------------------------------------------------------------------------------

This product bundles various third-party components under other open source licenses.
This section summarizes those components and their licenses. See licenses/
for text of these licenses.
Loading
Loading