[NNCF] (#3249) Remove backend-specific methods from common layer attributes #3287

shumaari · 2025-02-17T15:57:11Z

Changes

Moved and renamed backend-specific class methods from common layer
attributes in nncf/common/graph/layer_attributes.py to self-contained
functions in nncf/common/graph/utils.py

layer_attributes.get_bias_shape ->
get_bias_shape_legacy(layer_attributes: WeightedLayerAttributes)
layer_attributes.get_num_filters ->
get_num_filters_legacy(layer_attributes: WeightedLayerAttributes)
layer_attributes.get_target_dim_for_compression ->
get_target_dim_for_compression_legacy(layer_attributes: WeightedLayerAttributes)
layer_attributes.get_weight_shape ->
get_weight_shape_legacy(layer_attributes: WeightedLayerAttributes)

Calls to above class methods were replaced with calls to their
corresponding legacy functions in the following locations

/nncf/experimental/common/ folder
- pruning/nodes_grouping.py
/nncf/experimental/tensorflow/ folder
- quantization/algorithm.py
/nncf/experimental/torch/ folder
- nas/bootstrapNAS/elasticity/elastic_width.py
- sparsity/movement/layers.py
- sparsity/movement/structured_mask_handler.py
/nncf/torch/ folder
- quantization/algo.py
- quantization/init_range.py
- sparsity/const/algo.py
- sparsity/magnitude/algo.py
- sparsity/rb/algo.py

Reason for changes

Torch and Tensorflow backend-specific methods need to be removed
from common layer attributes and all related calls need to be replaced
by their corresponding legacy function calls (resolves #3249)

Changes: Moved and renamed backend-specific class method from common layer attributes in nncf/common/graph/layer_attributes.py to self-contained function in nncf/common/graph/utils.py - layer_attributes.get_weight_shape -> get_weight_shape_legacy(layer_attributes: WeightedLayerAttributes) Reason for changes: (openvinotoolkit#3249) Torch and Tensorflow backend-specific methods need to be removed from common layer attributes and all related calls need to be replaced by their corresponding legacy function calls

…olkit#3249) Changes: Moved and renamed backend-specific class method from common layer attributes in nncf/common/graph/layer_attributes.py to self-contained function in nncf/common/graph/utils.py - layer_attributes.get_target_dim_for_compression -> get_target_dim_for_compression_legacy(layer_attributes: WeightedLayerAttributes) Reason for changes: (openvinotoolkit#3249) Torch and Tensorflow backend-specific methods need to be removed from common layer attributes and all related calls need to be replaced by their corresponding legacy function calls

Changes: Moved and renamed backend-specific class method from common layer attributes in nncf/common/graph/layer_attributes.py to self-contained function in nncf/common/graph/utils.py - layer_attributes.get_bias_shape -> get_bias_shape_legacy(layer_attributes: WeightedLayerAttributes) Reason for changes: (openvinotoolkit#3249) Torch and Tensorflow backend-specific methods need to be removed from common layer attributes and all related calls need to be replaced by their corresponding legacy function calls

Changes: Calls to following class methods in nncf/common/graph/layer_attributes.py were replaced with calls to their corresponding self-contained legacy functions in nncf/common/graph/utils.py: - layer_attributes.get_weight_shape -> get_weight_shape_legacy(layer_attributes: WeightedLayerAttributes) - layer_attributes.get_bias_shape -> get_bias_shape_legacy(layer_attributes: WeightedLayerAttributes) Locations in /nncf/experimental/torch/sparsity/movement/ folder - layers.py - structured_mask_handler.py Reason for changes: (openvinotoolkit#3249) Torch and Tensorflow backend-specific methods need to be removed from common layer attributes and all related calls need to be replaced by their corresponding legacy function calls

Changes: Call to following class method in nncf/common/graph/layer_attributes.py was replaced with call to its corresponding self-contained legacy function in nncf/common/graph/utils.py: - layer_attributes.get_weight_shape -> get_weight_shape_legacy(layer_attributes: WeightedLayerAttributes) Location in /nncf/experimental/tensorflow/quantization/ folder - algorithm.py Reason for changes: (openvinotoolkit#3249) Torch and Tensorflow backend-specific methods need to be removed from common layer attributes and all related calls need to be replaced by their corresponding legacy function calls

Changes: Call to following class method in nncf/common/graph/layer_attributes.py was replaced with call to its corresponding self-contained legacy function in nncf/common/graph/utils.py: - layer_attributes.get_target_dim_for_compression -> get_target_dim_for_compression_legacy( layer_attributes: WeightedLayerAttributes) Locations in /nncf/experimental/common/pruning/ - nodes_grouping.py Reason for changes: (openvinotoolkit#3249) Torch and Tensorflow backend-specific methods need to be removed from common layer attributes and all related calls need to be replaced by their corresponding legacy function calls

Changes: Calls to following class methods in nncf/common/graph/layer_attributes.py were replaced with calls to their corresponding self-contained legacy functions in nncf/common/graph/utils.py: - layer_attributes.get_weight_shape -> get_weight_shape_legacy(layer_attributes: WeightedLayerAttributes) - layer_attributes.get_target_dim_for_compression -> get_target_dim_for_compression_legacy( layer_attributes: WeightedLayerAttributes) Locations in /nncf/torch/quantization folder - algo.py - init_range.py Reason for changes: (openvinotoolkit#3249) Torch and Tensorflow backend-specific methods need to be removed from common layer attributes and all related calls need to be replaced by their corresponding legacy function calls

daniil-lyakhov

@shumaari, thank you for the contribution! Please remove the redundant get_weights_shape, get_target_dim_for_compression and get_bias_shape methods from the Layer attributes

Changes: Removed backend-specific class methods from common layer attributes in nncf/common/graph/layer_attributes.py - get_weight_shape - get_target_dim_for_compression - get_bias_shape Reason for changes: (openvinotoolkit#3249) Torch and Tensorflow backend-specific methods need to be removed from common layer attributes and all related calls need to be replaced by their corresponding legacy function calls

shumaari · 2025-02-17T17:23:12Z

@daniil-lyakhov done!

Changes: 1. Added missing import statements in nncf/common/graph/utils.py Reason for changes: (openvinotoolkit#3249) Torch and Tensorflow backend-specific methods need to be removed from common layer attributes and all related calls need to be replaced by their corresponding legacy function calls

shumaari · 2025-02-18T05:55:01Z

@daniil-lyakhov I have added the missing import statements which might fix the error in linter and pytest. Could you please rerun the checks? thank you!

daniil-lyakhov · 2025-02-18T10:26:36Z

@shumaari, please address the errors in the precommit tests https://github.com/openvinotoolkit/nncf/actions/runs/13384141663/job/37378434635?pr=3287
https://github.com/openvinotoolkit/nncf/actions/runs/13384141653/job/37378434304?pr=3287

Details: https://github.com/openvinotoolkit/nncf/blob/develop/CONTRIBUTING.md

Removed abstract class methods from common layer attributes in nncf/common/graph/layer_attributes.py - get_weight_shape - get_target_dim_for_compression Reason for changes: Torch and Tensorflow backend-specific methods need to be removed from common layer attributes and all related calls need to be replaced by their corresponding legacy function calls

Changes: Moved and renamed backend-specific class method from common layer attributes in nncf/common/graph/layer_attributes.py to self-contained function in nncf/common/graph/utils.py - layer_attributes.get_num_filters -> get_num_filters_legacy(layer_attributes: WeightedLayerAttributes) Reason for changes: Torch and Tensorflow backend-specific methods need to be removed from common layer attributes and all related calls need to be replaced by their corresponding legacy function calls

Calls to following class methods in nncf/common/graph/layer_attributes.py were replaced with calls to their corresponding self-contained legacy functions in nncf/common/graph/utils.py: - layer_attributes.get_num_filters -> get_num_filters_legacy(layer_attributes: WeightedLayerAttributes) Locations in /nncf/experimental/torch/nas/bootstrapNAS/elasticity/ folder - elastic_width.py Reason for changes: Torch and Tensorflow backend-specific methods need to be removed from common layer attributes and all related calls need to be replaced by their corresponding legacy function calls

Removed backend-specific class method from common layer attributes in nncf/common/graph/layer_attributes.py - get_num_filters Reason for changes: Torch and Tensorflow backend-specific methods need to be removed from common layer attributes and all related calls need to be replaced by their corresponding legacy function calls

Refactoring and formatting changes Reason for changes: Torch and Tensorflow backend-specific methods need to be removed from common layer attributes and all related calls need to be replaced by their corresponding legacy function calls

shumaari · 2025-02-21T15:07:14Z

@daniil-lyakhov I have made some changes, could you please check again?

Thank you so much for the hand-holding! :)

shumaari · 2025-02-21T16:47:31Z

@daniil-lyakhov could you please clarify which option is correct:

Removing back-end specific methods means that layer_attributes file should not contain any class methods (as it is after my commits), which implies wherever these methods are being called (directly or indirectly) need to be replaced by legacy calls.
Some class methods have been incorrectly removed and need to be restored.

Thank you

…ific_methods

Changes: Calls to following class methods in nncf/common/graph/layer_attributes.py were replaced with calls to their corresponding self-contained legacy functions in nncf/common/graph/utils.py: - layer_attributes.get_weight_shape -> get_weight_shape_legacy(layer_attributes: WeightedLayerAttributes) - layer_attributes.get_target_dim_for_compression -> get_target_dim_for_compression_legacy( layer_attributes: WeightedLayerAttributes) Locations in /nncf/torch/ folder - quantization/algo.py - sparsity/const/algo.py - sparsity/magnitude/algo.py - sparsity/rb/algo.py Reason for changes: Torch and Tensorflow backend-specific methods need to be removed from common layer attributes and all related calls need to be replaced by their corresponding legacy function calls

shumaari · 2025-02-23T16:20:31Z

@daniil-lyakhov I have made some changes, could you please check once more? Thank you!

nncf/common/graph/utils.py

Changes: done.

shumaari · 2025-02-24T14:45:15Z

@daniil-lyakhov Thanks for the feedback, changes are done.

Is there anything else required before merging?

nncf/common/graph/utils.py

daniil-lyakhov

@shumaari, thank you for your updates! Please address my last minor comments and convert PR to a non draft one. I'll start review process with the NNCF team

nncf/common/graph/utils.py

Changes: done.

shumaari · 2025-02-24T15:56:39Z

@daniil-lyakhov Thank you for all your help!

I would like to work on another issue, please let me know which one. 👍

daniil-lyakhov · 2025-02-24T15:58:51Z

@ljaljushkin, @AlexanderDokuchaev, please share your opinion on this PR

ljaljushkin

LGTM

…mmon layer attributes (openvinotoolkit#3287) ### Changes 1. Moved and renamed backend-specific class methods from common layer attributes in nncf/common/graph/layer_attributes.py to self-contained functions in nncf/common/graph/utils.py - layer_attributes.get_bias_shape -> get_bias_shape_legacy(layer_attributes: WeightedLayerAttributes) - layer_attributes.get_num_filters -> get_num_filters_legacy(layer_attributes: WeightedLayerAttributes) - layer_attributes.get_target_dim_for_compression -> get_target_dim_for_compression_legacy(layer_attributes: WeightedLayerAttributes) - layer_attributes.get_weight_shape -> get_weight_shape_legacy(layer_attributes: WeightedLayerAttributes) 2. Calls to above class methods were replaced with calls to their corresponding legacy functions in the following locations - /nncf/experimental/common/ folder - pruning/nodes_grouping.py - /nncf/experimental/tensorflow/ folder - quantization/algorithm.py - /nncf/experimental/torch/ folder - nas/bootstrapNAS/elasticity/elastic_width.py - sparsity/movement/layers.py - sparsity/movement/structured_mask_handler.py - /nncf/torch/ folder - quantization/algo.py - quantization/init_range.py - sparsity/const/algo.py - sparsity/magnitude/algo.py - sparsity/rb/algo.py ### Reason for changes Torch and Tensorflow backend-specific methods need to be removed from common layer attributes and all related calls need to be replaced by their corresponding legacy function calls (resolves openvinotoolkit#3249)

shumaari added 7 commits February 17, 2025 20:58

github-actions bot added NNCF PT Pull requests that updates NNCF PyTorch NNCF Common Pull request that updates NNCF Common experimental labels Feb 17, 2025

shumaari mentioned this pull request Feb 17, 2025

[Good First Issue][NNCF]: Remove backend-specific methods from the common layer attributes #3249

Closed

daniil-lyakhov reviewed Feb 17, 2025

View reviewed changes

shumaari marked this pull request as ready for review February 17, 2025 17:23

shumaari requested a review from a team as a code owner February 17, 2025 17:23

MaximProshin assigned daniil-lyakhov Feb 18, 2025

alexsu52 requested a review from daniil-lyakhov February 18, 2025 06:29

shumaari marked this pull request as draft February 18, 2025 06:33

shumaari added 8 commits February 21, 2025 18:18

[NNCF] Update get_weight_shape_legacy function

0425fbb

Refactoring and formatting changes Reason for changes: Torch and Tensorflow backend-specific methods need to be removed from common layer attributes and all related calls need to be replaced by their corresponding legacy function calls

[NNCF] Update get_bias_shape_legacy function

02ecd45

Refactoring and formatting changes Reason for changes: Torch and Tensorflow backend-specific methods need to be removed from common layer attributes and all related calls need to be replaced by their corresponding legacy function calls

Formatting changes due black and isort

907f35f

shumaari added 2 commits February 22, 2025 20:46

Merge branch 'openvinotoolkit:develop' into 3249__remove_backend_spec…

b70c03a

…ific_methods

daniil-lyakhov requested changes Feb 24, 2025

View reviewed changes

shumaari added 2 commits February 24, 2025 19:30

Implement suggested changes in doc strings

c24ac61

Changes: done.

Implement suggested refactoring of code

7de7e8b

Changes: done.

shumaari marked this pull request as ready for review February 24, 2025 14:45

daniil-lyakhov reviewed Feb 24, 2025

View reviewed changes

nncf/common/graph/utils.py Outdated Show resolved Hide resolved

daniil-lyakhov requested changes Feb 24, 2025

View reviewed changes

nncf/common/graph/utils.py Outdated Show resolved Hide resolved

daniil-lyakhov self-requested a review February 24, 2025 15:34

Implement suggested changes

0377d87

Changes: done.

daniil-lyakhov requested review from ljaljushkin and AlexanderDokuchaev February 24, 2025 15:58

daniil-lyakhov approved these changes Feb 24, 2025

View reviewed changes

ljaljushkin approved these changes Feb 25, 2025

View reviewed changes

AlexanderDokuchaev approved these changes Feb 25, 2025

View reviewed changes

AlexanderDokuchaev merged commit 7996e73 into openvinotoolkit:develop Feb 25, 2025
17 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[NNCF] (#3249) Remove backend-specific methods from common layer attributes #3287

[NNCF] (#3249) Remove backend-specific methods from common layer attributes #3287

shumaari commented Feb 17, 2025 •

edited

Loading

daniil-lyakhov left a comment

shumaari commented Feb 17, 2025

shumaari commented Feb 18, 2025 •

edited

Loading

daniil-lyakhov commented Feb 18, 2025 •

edited

Loading

shumaari commented Feb 21, 2025

shumaari commented Feb 21, 2025 •

edited

Loading

shumaari commented Feb 23, 2025

shumaari commented Feb 24, 2025

daniil-lyakhov left a comment

shumaari commented Feb 24, 2025

daniil-lyakhov commented Feb 24, 2025

ljaljushkin left a comment

[NNCF] (#3249) Remove backend-specific methods from common layer attributes #3287

[NNCF] (#3249) Remove backend-specific methods from common layer attributes #3287

Conversation

shumaari commented Feb 17, 2025 • edited Loading

Changes

Reason for changes

daniil-lyakhov left a comment

Choose a reason for hiding this comment

shumaari commented Feb 17, 2025

shumaari commented Feb 18, 2025 • edited Loading

daniil-lyakhov commented Feb 18, 2025 • edited Loading

shumaari commented Feb 21, 2025

shumaari commented Feb 21, 2025 • edited Loading

shumaari commented Feb 23, 2025

shumaari commented Feb 24, 2025

daniil-lyakhov left a comment

Choose a reason for hiding this comment

shumaari commented Feb 24, 2025

daniil-lyakhov commented Feb 24, 2025

ljaljushkin left a comment

Choose a reason for hiding this comment

shumaari commented Feb 17, 2025 •

edited

Loading

shumaari commented Feb 18, 2025 •

edited

Loading

daniil-lyakhov commented Feb 18, 2025 •

edited

Loading

shumaari commented Feb 21, 2025 •

edited

Loading