perf(marlin): cache scale permutation tensors and use index_select - #2988
Merged
Conversation
marlin_permute_scales and marlin_permute_bias repeatedly convert constant Python permutation lists into tensors. Cache the index tensors per device and use torch.index_select for a ~3x micro-benchmark speedup on Laguna MoE shapes. Add CPU-safe permutation correctness tests covering attention/MLP/MoE shapes.
🤖 Devin AI EngineerI'll be helping with this pull request! Here's what you should know: ✅ I will automatically:
Note: I can only respond to comments from users who have write access to this repository. ⚙️ Control Options:
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
marlin_permute_scalesandmarlin_permute_biasre-created the Marlin scale/bias permutation index tensors from Python lists on every call. For MoE models with tens of thousands of experts (e.g. Laguna-S-2.1-GPTQ-FIXED, 36,432 quant modules) this added ~4.4s duringGPTQModel.load.What Changed
gptqmodel/utils/marlin.py_SCALE_PERM_TENSOR_CACHEprotected by athreading.Lockand helper_get_scale_perm_tensors().marlin_permute_scalesandmarlin_permute_biasnow use pre-materializedtorch.longindex tensors andtorch.index_selectinstead of Python-list advanced indexing.tests/test_marlin_permute.pymarlin_permute_scalesandmarlin_permute_biascovering Laguna attention/MLP/MoE shapes.cuda:0when available and fall back tocpu, and usefloat32to avoid crashing on CPU-only hosts.Tests
cd /root/repos/GPTQModel /root/vm314t/bin/python -m ruff check gptqmodel/utils/marlin.py tests/test_marlin_permute.py /root/vm314t/bin/python -m pytest tests/test_marlin_permute.py -qResult:
6 passed, 16 warnings in 6.73sandruffclean.Notes
Benchmarked on Laguna-S-2.1-GPTQ-FIXED with
BACKEND.GPTQ_MARLINon GPU 7:gptq_marlin_repackremained ~1.9s (already fast CUDA kernel).marlin_permute_scalesdropped from ~4.4s to ~2.4s for all 36,432 modules.