Skip to content

Commit a48b801

Browse files
anzr299anzr299
committed
fix merge
1 parent 41876ae commit a48b801

File tree

5 files changed

+0
-424
lines changed

5 files changed

+0
-424
lines changed

‎src/nncf/quantization/algorithms/weight_compression/algorithm.py‎

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1116,50 +1116,6 @@ def _collect_statistics(
11161116
statistics_aggregator.collect_statistics(model, graph)
11171117
return statistics_aggregator.statistic_points
11181118

1119-
def _get_node_with_weight_from_act_node(
1120-
self, act_node: NNCFNode, output_port_id: int, graph: NNCFGraph
1121-
) -> NNCFNode:
1122-
"""
1123-
Returns the node with weight connected to a given activation node on its output_port_id.
1124-
1125-
:param node_with_weight: Node which is connected to weight.
1126-
:param graph: Model graph.
1127-
:return: List of port ids of all the weights that feed the node with weight.
1128-
"""
1129-
node_with_weight_edge = graph.get_output_edges_by_port_id(act_node, output_port_id)
1130-
for node_order, edge in enumerate(node_with_weight_edge):
1131-
is_node_with_weights = self._backend_entity.is_node_with_weights(edge.to_node, graph)
1132-
if is_node_with_weights:
1133-
node_with_weight = node_with_weight_edge[node_order].to_node
1134-
break
1135-
return node_with_weight
1136-
1137-
def _get_weight_port_ids_from_node_with_weight(self, node_with_weight: NNCFNode, graph: NNCFGraph) -> list[int]:
1138-
"""
1139-
Returns the port ids of weight nodes connected to a given node_with_weight.
1140-
1141-
:param node_with_weight: Node which is connected to weight.
1142-
:param graph: Model graph.
1143-
:return: List of port ids of all the weights that feed the node with weight.
1144-
"""
1145-
return [pid for _, pid in self._backend_entity.get_weight_names_and_port_ids(node_with_weight, graph)]
1146-
1147-
def _get_weight_dims_from_node_with_weight(
1148-
self, node_with_weight: NNCFNode, weight_port_ids: list[int], graph: NNCFGraph
1149-
) -> list[int]:
1150-
"""
1151-
Returns the dimension of weight to be compressed from a given node_with_weight and its weight_port_id.
1152-
1153-
:param node_with_weight: Node which is connected to weight.
1154-
:param weight_port_id: Weight port id which connects to node with weight.
1155-
:param graph: Model graph.
1156-
:return: List of dimensions of all the weights that feed the node with weight.
1157-
"""
1158-
return [
1159-
len(self._backend_entity.get_weight_shape(node_with_weight, weight_port_id, graph))
1160-
for weight_port_id in weight_port_ids
1161-
]
1162-
11631119
def get_statistic_points(
11641120
self,
11651121
model: TModel,

‎tests/onnx/quantization/test_weights_compression.py‎

Lines changed: 0 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -629,101 +629,6 @@ def get_moe_scale_estimation_ref(check_sampling_activation_stats_flow):
629629
),
630630
)[check_sampling_activation_stats_flow]
631631

632-
@staticmethod
633-
def get_moe_scale_estimation_ref():
634-
return np.array(
635-
[
636-
[
637-
[
638-
[
639-
7.573249,
640-
7.4666667,
641-
7.4666667,
642-
7.4666667,
643-
7.4666667,
644-
7.260152,
645-
7.4666667,
646-
7.4666667,
647-
7.4666667,
648-
7.4666667,
649-
7.3082952,
650-
7.846745,
651-
7.223278,
652-
7.271495,
653-
7.420518,
654-
7.4666667,
655-
]
656-
]
657-
],
658-
[
659-
[
660-
[
661-
14.820505,
662-
14.903171,
663-
14.985837,
664-
15.068501,
665-
15.151169,
666-
14.339979,
667-
14.417264,
668-
14.494548,
669-
14.571833,
670-
14.649117,
671-
14.726402,
672-
14.803687,
673-
14.880971,
674-
14.958257,
675-
15.035541,
676-
15.112826,
677-
]
678-
]
679-
],
680-
[
681-
[
682-
[
683-
22.894644,
684-
22.968674,
685-
23.042706,
686-
23.116734,
687-
23.190762,
688-
23.264793,
689-
23.338821,
690-
23.412853,
691-
23.486881,
692-
23.560913,
693-
23.634943,
694-
23.708973,
695-
23.99867,
696-
23.85703,
697-
22.873016,
698-
22.943499,
699-
]
700-
]
701-
],
702-
[
703-
[
704-
[
705-
30.337456,
706-
30.406534,
707-
30.475613,
708-
30.54469,
709-
30.613766,
710-
30.682842,
711-
30.751925,
712-
30.821001,
713-
30.890078,
714-
30.959156,
715-
31.028233,
716-
31.09731,
717-
31.16639,
718-
31.776451,
719-
31.846794,
720-
31.917133,
721-
]
722-
]
723-
],
724-
]
725-
)
726-
727632
@staticmethod
728633
def get_orig_weight(model: onnx.ModelProto) -> Tensor:
729634
return Tensor(get_tensor_value(model, "W_0"))

‎tests/openvino/native/quantization/test_weights_compression.py‎

Lines changed: 0 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -2271,101 +2271,6 @@ def get_moe_scale_estimation_ref(check_sampling_activation_stats_flow):
22712271
def test_scale_estimation(self, mocker, is_moe, check_sampling_activation_stats_flow):
22722272
super().test_scale_estimation(mocker, is_moe, check_sampling_activation_stats_flow)
22732273

2274-
@staticmethod
2275-
def get_moe_scale_estimation_ref():
2276-
return np.array(
2277-
[
2278-
[
2279-
[
2280-
[
2281-
7.573249,
2282-
7.4666667,
2283-
7.4666667,
2284-
7.4666667,
2285-
7.4666667,
2286-
7.260152,
2287-
7.4666667,
2288-
7.4666667,
2289-
7.4666667,
2290-
7.4666667,
2291-
7.3082952,
2292-
7.846745,
2293-
7.223278,
2294-
7.271495,
2295-
7.420518,
2296-
7.4666667,
2297-
]
2298-
]
2299-
],
2300-
[
2301-
[
2302-
[
2303-
14.820505,
2304-
14.903171,
2305-
14.985837,
2306-
15.068501,
2307-
15.151169,
2308-
14.339979,
2309-
14.417264,
2310-
14.494548,
2311-
14.571833,
2312-
14.649117,
2313-
14.726402,
2314-
14.803687,
2315-
14.880971,
2316-
14.958257,
2317-
15.035541,
2318-
15.112826,
2319-
]
2320-
]
2321-
],
2322-
[
2323-
[
2324-
[
2325-
22.894644,
2326-
22.968674,
2327-
23.042706,
2328-
23.116734,
2329-
23.190762,
2330-
23.264793,
2331-
23.338821,
2332-
23.412853,
2333-
23.486881,
2334-
23.560913,
2335-
23.634943,
2336-
23.708973,
2337-
23.99867,
2338-
23.85703,
2339-
22.873016,
2340-
22.943499,
2341-
]
2342-
]
2343-
],
2344-
[
2345-
[
2346-
[
2347-
30.337456,
2348-
30.406534,
2349-
30.475613,
2350-
30.54469,
2351-
30.613766,
2352-
30.682842,
2353-
30.751925,
2354-
30.821001,
2355-
30.890078,
2356-
30.959156,
2357-
31.028233,
2358-
31.09731,
2359-
31.16639,
2360-
31.776451,
2361-
31.846794,
2362-
31.917133,
2363-
]
2364-
]
2365-
],
2366-
]
2367-
)
2368-
23692274
@staticmethod
23702275
def get_orig_weight(model: ov.Model) -> Tensor:
23712276
for op in model.get_ordered_ops():

‎tests/torch2/function_hook/quantization/test_weights_compression.py‎

Lines changed: 0 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -704,101 +704,6 @@ def get_moe_scale_estimation_ref(check_sampling_activation_stats_flow):
704704
),
705705
)[check_sampling_activation_stats_flow]
706706

707-
@staticmethod
708-
def get_moe_scale_estimation_ref():
709-
return torch.tensor(
710-
[
711-
[
712-
[
713-
[
714-
7.5732,
715-
7.4667,
716-
7.4667,
717-
7.4667,
718-
7.4667,
719-
7.2602,
720-
7.4667,
721-
7.4667,
722-
7.4667,
723-
7.4667,
724-
7.3083,
725-
7.8467,
726-
7.2233,
727-
7.2715,
728-
7.4205,
729-
7.4667,
730-
]
731-
]
732-
],
733-
[
734-
[
735-
[
736-
14.8205,
737-
14.9032,
738-
14.9858,
739-
15.0685,
740-
15.1512,
741-
14.3400,
742-
14.4173,
743-
14.4945,
744-
14.5718,
745-
14.6491,
746-
14.7264,
747-
14.8037,
748-
14.8810,
749-
14.9583,
750-
15.0355,
751-
15.1128,
752-
]
753-
]
754-
],
755-
[
756-
[
757-
[
758-
22.8946,
759-
22.9687,
760-
23.0427,
761-
23.1167,
762-
23.1908,
763-
23.2648,
764-
23.3388,
765-
23.4129,
766-
23.4869,
767-
23.5609,
768-
23.6349,
769-
23.7090,
770-
23.9987,
771-
23.8570,
772-
22.8730,
773-
22.9435,
774-
]
775-
]
776-
],
777-
[
778-
[
779-
[
780-
30.3375,
781-
30.4065,
782-
30.4756,
783-
30.5447,
784-
30.6138,
785-
30.6828,
786-
30.7519,
787-
30.8210,
788-
30.8901,
789-
30.9592,
790-
31.0282,
791-
31.0973,
792-
31.1664,
793-
31.7765,
794-
31.8468,
795-
31.9171,
796-
]
797-
]
798-
],
799-
]
800-
)
801-
802707
@staticmethod
803708
def get_orig_weight(model: torch.nn.Module) -> Tensor:
804709
return Tensor(model.linear.weight.data.detach())

0 commit comments

Comments
 (0)