-
Notifications
You must be signed in to change notification settings - Fork 1.7k
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
Refactor: PEFT method registration function #2282
Refactor: PEFT method registration function #2282
Conversation
Breaks tests
tests still broken
The docs for this PR live here. All of your documentation changes will be reflected on that endpoint. The docs are available until 30 days after the last update. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As for the name of func.py
: Maybe mapping_func.py
is a more appropriate name?
Good idea, I renamed the module. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In general I do like static mapping more than dynamic, makes the code more readable without interpreting too much. However, in this case I can see that it is easy to forget certain mappings and keeping them at one place is not always easy. It also makes for a good public interface.
If you could add the doc string for register_peft_method
we can merge this, I think.
I agree. The change is not pure upside, but overall I think it is cleaner than it was before. Another possible advantage: If we ever require something more to happen when a new PEFT method is added, we could possibly change it in a single place instead of having to touch each method individually.
Thanks for catching this, I added the docstring. |
The PEFT_TYPE_TO_MODEL_MAPPING variable was removed in PEFT PR huggingface/peft#2282. This leads to an error when using AutoGPTQ with PEFT installed from main (and later starting with PEFT v0.15.0). This PR fixes this issue by using the PEFT_TYPE_TO_TUNER_MAPPING variable instead. The fix is implemented in a way that the code should continue to work with older PEFT versions while being compatible with the new PR.
This is for backwards compatibility: In huggingface#2282, PEFT_TYPE_TO_MODEL_MAPPING was removed as it was redundant with PEFT_TYPE_TO_TUNER_MAPPING. However, third party code could still use this mapping, e.g.: https://github.com/AutoGPTQ/AutoGPTQ/blob/6689349625de973b9ee3016c28c11f32acf7f02c/auto_gptq/utils/peft_utils.py#L8 Therefore, it is reinstated here, but a DeprecationWarning will be given if it's used.
…2328) This is for backwards compatibility: In #2282, PEFT_TYPE_TO_MODEL_MAPPING was removed as it was redundant with PEFT_TYPE_TO_TUNER_MAPPING. However, third party code could still use this mapping, e.g.: https://github.com/AutoGPTQ/AutoGPTQ/blob/6689349625de973b9ee3016c28c11f32acf7f02c/auto_gptq/utils/peft_utils.py#L8 Therefore, it is reinstated here, but a DeprecationWarning will be given if it's used.
The PEFT_TYPE_TO_MODEL_MAPPING variable was removed in PEFT PR huggingface/peft#2282. This leads to an error when using AutoGPTQ with PEFT installed from main (and later starting with PEFT v0.15.0). This PR fixes this issue by using the PEFT_TYPE_TO_TUNER_MAPPING variable instead. The fix is implemented in a way that the code should continue to work with older PEFT versions while being compatible with the new PR.
This is a refactor of how new PEFT methods are registered. It got bigger than I initially expected.
Goal
The goal of this refactor is the following: Right now, when a new PEFT method is added, a new directory is created in
src/peft/tuners/<name>
with a config, model, etc. This is fine and self-contained.However, in addition to that, a couple of other places in the PEFT code base need to be touched for this new PEFT method to become usable.
As an example, take the recently added Bone method (#2172). Ignoring tests, docs, and examples, we have the additions to
src/peft/tuners/bone
, but also need to:PEFT_TYPE_TO_CONFIG_MAPPING
inmapping.py
.PEFT_TYPE_TO_TUNER_MAPPING
inmapping.py
.PEFT_TYPE_TO_MODEL_MAPPING
inpeft_model.py
PEFT_TYPE_TO_PREFIX_MAPPING
inutils/constants.py
get_peft_model_state_dict
inutils.save_and_load.py
With the changes in this PR, all these steps can be omitted.
On top of that, we also have the re-imports to
peft/__init__.py
andpeft/tuners/__init__.py
but those are still required (I'm hesitant to mess with the import system). Furthermore, it's still required to add an entry toPeftType
inutils.peft_types.py
. Since this is anenum
, it can't be easily generated automatically. Therefore, adding a new PEFT method is still not 100% self-contained.Changes in this PR
With this PR, less book-keeping is required. Instead of the 5 steps described above, contributors now only need to call
in the
__init__.py
of their PEFT method. In addition to registering the method, this also performs a couple of sanity checks (e.g. no duplicate names, method name and method prefix being identical).Moreover, since so much book keeping is removed, this PR reduces the number of lines of code overall (at the moment +317, - 343).
Implementation
The real difficulty of this task is that the module structure in PEFT is really messy, easily resulting in circular imports. This has been an issue in the past but has been especially painful here. For this reason, some stuff had to be moved around:
MODEL_TYPE_TO_PEFT_MODEL_MAPPING
is now inauto.py
instead ofmapping.py
PEFT_TYPE_TO_PREFIX_MAPPING
has been moved tomapping.py
fromconstants.py
get_peft_model
had to be moved out ofmapping.py
and is now in its own module,func.py
(better name suggestions welcome). This should be safe, as the function is re-imported to the main PEFT namespace, which all examples use.The
PEFT_TYPE_TO_MODEL_MAPPING
dict could be completely removed, as it was basically redundant withPEFT_TYPE_TO_TUNER_MAPPING
. Theget_peft_model_state_dict
could be simplified, as a lot of code was almost duplicated.There were a few instances in
peft_model.py
like:Now, instead of hard-coding the model, I just do
model_cls = PEFT_TYPE_TO_TUNER_MAPPING[config.peft_type]
.Overall, I think this is a cleaner module structure, but still not very clean overall.
Open questions
I'm not 100% sure if this should be merged. AFAICT it should be a safe refactor that does not affect user code. There could be other packages out there that use some PEFT internals that could break with this refactor. If we decide to merge this, we should consider alerting potentially affected packages to test it.
I'm also open to the argument that the benefits are not outweighing the cost of the refactor.