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

hot fix for weights compression #596

Merged
merged 2 commits into from
Mar 11, 2024

Conversation

eaidova
Copy link
Collaborator

@eaidova eaidova commented Mar 11, 2024

What does this PR do?

fix export large models with quantization config and prevent overriding ov_config provided into model class if used export=True (it may have some additional parameters for ov runtime e.g. inference_precision_hint)

Fixes # (issue)

Before submitting

  • This PR fixes a typo or improves the docs (you can dismiss the other checks if that's the case).
  • Did you make sure to update the documentation with your changes?
  • Did you write any new necessary tests?

@HuggingFaceDocBuilderDev

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.

@AlexKoff88
Copy link
Collaborator

@echarlaix, it seems like .from_pretrained() method does not work correctly with quantization options exposed in it. We have multiple concerns about it and should fix ASAP. Please take a look again.

@eaidova eaidova force-pushed the ea/hot_fix_weights_compression branch from e141795 to 978035a Compare March 11, 2024 12:28
@eaidova eaidova requested a review from echarlaix March 11, 2024 12:33
@eaidova eaidova force-pushed the ea/hot_fix_weights_compression branch from 978035a to 122c147 Compare March 11, 2024 12:57
@eaidova eaidova force-pushed the ea/hot_fix_weights_compression branch from 122c147 to 6e23614 Compare March 11, 2024 13:44
Copy link
Collaborator

@echarlaix echarlaix left a comment

Choose a reason for hiding this comment

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

Thanks for the fix @eaidova

@echarlaix echarlaix merged commit 5c683a3 into huggingface:main Mar 11, 2024
9 of 10 checks passed
@eaidova eaidova deleted the ea/hot_fix_weights_compression branch March 11, 2024 15:25
PenghuiCheng pushed a commit to PenghuiCheng/optimum-intel that referenced this pull request Mar 13, 2024
* hot fix for weights compression

* rewrite mcok tests
echarlaix added a commit that referenced this pull request Mar 27, 2024
…tension-for-transformers. (#455)

* Support weight-only quantization with quantized operators in intel-extension-for-transformers

* Update code style

* Update readme for weight-only quantization example

* Update code

* Adapt intel-extension-for-transformers 1.3 API change

Signed-off-by: Cheng, Penghui <[email protected]>

* Support weight-only quantization with quantized operators in intel-extension-for-transformers

* Update code

* rebase code on main branch

Signed-off-by: Cheng, Penghui <[email protected]>

* Update example

Signed-off-by: Cheng, Penghui <[email protected]>

* Update optimum/intel/neural_compressor/quantization.py

Co-authored-by: Ella Charlaix <[email protected]>

* [OV]: Fixed inference after 4 bit weight compression (#569)

* [OV]: Fixed inferece after 4 bit weight compression

* Fixed issue

* Update optimum/intel/openvino/modeling_decoder.py

Co-authored-by: Ella Charlaix <[email protected]>

* Applied comments

* Fixed issue when request is None

---------

Co-authored-by: Ella Charlaix <[email protected]>

* Updated docs with load_in_4bit (#558)

* Updated docs with load_in_4bit

* Update documentation

* Update documentation

* typo

---------

Co-authored-by: Ella Charlaix <[email protected]>

* Update Transformers dependency requirements (#571)

* Fix compatibility for latest transformers release (#570)

* fix compatibility for latest transformers release

* update setup

* update setup

* fix test input size

* fix prepare generation for llama models

* Deprecate compression options (#565)

* deprecate compression options

* style

* fix configuration

* Update CLI argument

* update documentation

* deprecate torch nn modules for ov quantizer

* fix ov config for fp32 models

* fix format

* update documentation

* Add check for configuration

* fix ratio default value for SD models

* add quantization_config argument for OVModel

* remove commented line

* Update docs/source/inference.mdx

Co-authored-by: Alexander Kozlov <[email protected]>

* add default config for causal LM

* fix  warning message

---------

Co-authored-by: Alexander Kozlov <[email protected]>

* Add default quantization int4 config for Mixtral-8x7B (#576)

* Update  stable diffusion example requirements (#579)

* Fix collecting duplicate tensors in quantization calibration dataset (#577)

* Added deepcopying of inputs collected by InferRequestWrapper. Added a test covering the fixed issue.

* Phrasing tweaks

* Add soundfile to test requirements

* Added librosa to test requirements

* Added copying to other data cache appends

* Remove the need for real test data

* Process __call__ call properly

* Addressed suggested changes

* Save an openvino config summarizing all information related to quantization when saving model (#578)

* fix doc

* remove default compression value

* set default compression config when not provided

* save openvino config to include quantization configuration

* fix style

* add test

* update setup

* style

* remove from quantization_config key from ov_config

* add test

* update setup

* modify method name

* Fix warning (#582)

* Fix warning

* fix message warning

* Add reference to the temporary directory for windows fix (#581)

* Fix documentation (#583)

* Fix documentation

* fix

* Add llama test model to cover MQA (#585)

* change llama test model to cover MQA

* keep llama and llama2 in tests

* fix code style

* Include nncf in openvino extra (#586)

* Fix title documentation (#588)

* Update OpenVINO documentation links in README.md (#587)

* Update OpenVINO documentation links in README.md

The links are now aligned with OpenVINO 2024.0 documentation, and include permalinks instead of direct links, when possible.

* Update inference.mdx

* Update index.mdx

* Update installation.mdx

* Update README.md

* Fix default int8 quantization for CLI (#592)

* Change model output parameter to last_hidden_states for IPEXModel (#589)

* change model output parameter to last_hidden_states

* update ipex model testiong

* update testing

* add output name to ipex model

* Add IPEX model patcher (#567)

* llama model patcher

* fix jit model

* fix jit model

* rm autocast in model

* add llama model patcher

* support assisted decoding and add reorder cache function

* add comment for _prepare_past_key_values

* rebase main

* fix model_dtype

* rm useless comments

* fix llama

* add comments for ipex_rope and ipex_scale_dot_product

* fix comments

* add enable_tpp comments

* fix import

* fix review aroun2

* add torch.no_grad to avoid auto_kernel_selection issue

* use torch.no_grad in jit trace

* fix ipex model testing

* add tests for ipex model generation with multi inputs

* fix code style

* remove __get__(self) as _reorder_cache is static method for the class

* fix reorder_cache

* use model_type

* check if reorder_cache is a static method

* fix _reorder_cache

* fix raise import error

* test ipex patching

* fix comments

* update API name and testing

* disable untill ipex version 2.5.0

* update testing name

* Update optimum/intel/ipex/modeling_base.py

Co-authored-by: Ella Charlaix <[email protected]>

* Update tests/ipex/test_modeling.py

Co-authored-by: Ella Charlaix <[email protected]>

* fix tests

---------

Co-authored-by: Ella Charlaix <[email protected]>

* Updates weight quantization section in the docs (#593)

* Remove accelerate and onnxruntime from required dependencies (#590)

* Remove accelerate dependency

* Add accelerate to import backend mapping

* Add eval method to OVModels

* add onnxruntime install for OV test

* fix test expected int8

* Fix OpenVINO image classification examples (#598)

* Fix weights compression for OPenVINO models (#596)

* hot fix for weights compression

* rewrite mcok tests

* Fix default ov config (#600)

* Add warning for transformers>=4.38 and OpenVINO 2024.0 (#599)

* Add warning for transformers>=4.38 and OpenVINO 2024.0

* Use is_openvino_version to compare versions

* Show version warning only for llama and gpt-bigcode

* Fix style, show OpenVINO version

* Include affected model types in warning message

* Add hybrid quantization for StableDiffusion pipelines (#584)

* Add hybrid quantization for StableDiffusion pipelines

* apply black

* fix tests

* fix ruff

* fix lcm bug

* apply review comments

* rework dataset processing

* Add doc

* remove SDXL test

* Apply comments

* reformat

* Show device name in _print_compiled_model_properties (#541)

* Show device name in _print_compiled_model_properties

Enable CACHE_DIR also for devices like "GPU:0"

* Update optimum/intel/openvino/modeling_seq2seq.py

Co-authored-by: Ella Charlaix <[email protected]>

* Change check for gpu device

---------

Co-authored-by: Ella Charlaix <[email protected]>

* Update code with comments

Signed-off-by: Cheng, Penghui <[email protected]>

* Fixed pylint error

Signed-off-by: Cheng, Penghui <[email protected]>

* Update optimum/intel/neural_compressor/configuration.py

Co-authored-by: Ella Charlaix <[email protected]>

* Fixed example and UT for weight-only quantization

Signed-off-by: Cheng, Penghui <[email protected]>

* Fixed pre-ci test error

Signed-off-by: Cheng, Penghui <[email protected]>

* Fixed pre-ci test error

Signed-off-by: Cheng, Penghui <[email protected]>

* Fixed UT and examples error

Signed-off-by: Cheng, Penghui <[email protected]>

* Fixed pre-CI error

Signed-off-by: Cheng, Penghui <[email protected]>

* Fixed UT error

Signed-off-by: Cheng, Penghui <[email protected]>

* Update tests/openvino/test_modeling_basic.py

Co-authored-by: Ella Charlaix <[email protected]>

* Update examples/neural_compressor/language-modeling/README.md

Co-authored-by: Ella Charlaix <[email protected]>

* Update examples/neural_compressor/language-modeling/run_clm.py

Co-authored-by: Ella Charlaix <[email protected]>

* Update examples/neural_compressor/language-modeling/run_clm.py

Co-authored-by: Ella Charlaix <[email protected]>

* Update examples/neural_compressor/language-modeling/run_clm.py

Co-authored-by: Ella Charlaix <[email protected]>

* Update examples/neural_compressor/language-modeling/run_clm.py

Co-authored-by: Ella Charlaix <[email protected]>

* Update examples/neural_compressor/language-modeling/run_clm.py

Co-authored-by: Ella Charlaix <[email protected]>

* Load weight-only quantized model with INCModelForCausalLM

Signed-off-by: Cheng, Penghui <[email protected]>

* Changed parameters name for GPTQ in example

Signed-off-by: Cheng, Penghui <[email protected]>

* Changed parameters order in INCQuantizer.quantize

Signed-off-by: Cheng, Penghui <[email protected]>

* Fixed UT error

Signed-off-by: Cheng, Penghui <[email protected]>

* Update examples/neural_compressor/text-generation/run_generation.py

Co-authored-by: Ella Charlaix <[email protected]>

* Update optimum/intel/neural_compressor/quantization.py

Co-authored-by: Ella Charlaix <[email protected]>

* Update optimum/intel/neural_compressor/quantization.py

Co-authored-by: Ella Charlaix <[email protected]>

* Update import message

Signed-off-by: Cheng, Penghui <[email protected]>

* Limit intel-extension-for-transformers version

Signed-off-by: Cheng, Penghui <[email protected]>

* Limit torch version for weight-only quantization

Signed-off-by: Cheng, Penghui <[email protected]>

* Fixed doc building error

Signed-off-by: Cheng, Penghui <[email protected]>

---------

Signed-off-by: Cheng, Penghui <[email protected]>
Co-authored-by: Ella Charlaix <[email protected]>
Co-authored-by: Alexander Kozlov <[email protected]>
Co-authored-by: Ella Charlaix <[email protected]>
Co-authored-by: Lyalyushkin Nikolay <[email protected]>
Co-authored-by: Helena Kloosterman <[email protected]>
Co-authored-by: Nikita Savelyev <[email protected]>
Co-authored-by: jiqing-feng <[email protected]>
Co-authored-by: Ekaterina Aidova <[email protected]>
Co-authored-by: Karol Blaszczak <[email protected]>
Co-authored-by: Liubov Talamanova <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants