Merge branch 'main' into fix_size_calcuation

Sara Adkins · Sara Adkins · commit 3c045966ca66 · 2024-02-22T14:23:36.000Z
diff --git a/src/sparsezoo/analyze_v1/__init__.py b/src/sparsezoo/analyze_v1/__init__.py
diff --git a/src/sparsezoo/analyze_v1/analysis.py b/src/sparsezoo/analyze_v1/analysis.py
@@ -30,8 +30,8 @@
 from pydantic import BaseModel, Field, PositiveFloat, PositiveInt
 
 from sparsezoo import Model
-from sparsezoo.analyze.utils.helpers import numpy_array_representer
-from sparsezoo.analyze.utils.models import (
+from sparsezoo.analyze_v1.utils.helpers import numpy_array_representer
+from sparsezoo.analyze_v1.utils.models import (
     DenseSparseOps,
     Entry,
     ModelEntry,
diff --git a/src/sparsezoo/analyze_v1/cli.py b/src/sparsezoo/analyze_v1/cli.py
diff --git a/src/sparsezoo/analyze_v1/utils/__init__.py b/src/sparsezoo/analyze_v1/utils/__init__.py
diff --git a/src/sparsezoo/analyze_v1/utils/chart.py b/src/sparsezoo/analyze_v1/utils/chart.py
@@ -25,7 +25,7 @@
     plt = None
     matplotlib_available = False
 
-from sparsezoo.analyze.analysis import ModelAnalysis, NodeAnalysis
+from sparsezoo.analyze_v1.analysis import ModelAnalysis, NodeAnalysis
 
 
 __all__ = [
diff --git a/src/sparsezoo/analyze_v1/utils/helpers.py b/src/sparsezoo/analyze_v1/utils/helpers.py
diff --git a/src/sparsezoo/analyze_v1/utils/models.py b/src/sparsezoo/analyze_v1/utils/models.py
diff --git a/src/sparsezoo/analyze_v2/memory_access_analysis.py b/src/sparsezoo/analyze_v2/memory_access_analysis.py
@@ -165,8 +165,7 @@ def get_memory_access_bits(
         node_weight = get_node_weight(model_graph, node)
         precision = get_numpy_quantization_level(node_weight)
         counts = memory_access_counts["single"]["counts"]
-        counts_sparse = memory_access_counts["single"]["counts_sparse"]
-        bits = (counts - counts_sparse) * precision
+        bits = counts * precision
         is_quantized = is_quantized_layer(model_graph, node)
 
         return {
diff --git a/src/sparsezoo/analyze_v2/operation_analysis.py b/src/sparsezoo/analyze_v2/operation_analysis.py
@@ -167,11 +167,17 @@ def get_operation_bits(
             is_quantized_op = "32" not in str(precision)
 
             single_counts = ops["single"]["counts"]
+<<<<<<< HEAD
             single_counts_sparse = ops["single"]["counts_sparse"]
             single_bits = (single_counts - single_counts_sparse) * precision
             block4_counts = ops["block4"]["counts"]
             block4_counts_sparse = ops["block4"]["counts_sparse"]
             block4_bits = (block4_counts - block4_counts_sparse) * precision
+=======
+            single_bits = single_counts * precision
+            block4_counts = ops["block4"]["counts"]
+            block4_bits = block4_counts * precision
+>>>>>>> main
             return {
                 "tensor": {
                     "counts": single_counts,
diff --git a/tests/sparsezoo/analyze/helpers.py b/tests/sparsezoo/analyze/helpers.py
@@ -22,7 +22,7 @@
 import pytest
 
 from sparsezoo import Model
-from sparsezoo.analyze import ModelAnalysis
+from sparsezoo.analyze_v1 import ModelAnalysis
 from sparsezoo.utils.graph_editor import ONNXGraph
 
 
diff --git a/tests/sparsezoo/analyze/test_analysis.py b/tests/sparsezoo/analyze/test_analysis.py
@@ -16,7 +16,7 @@
 
 import pytest
 
-from sparsezoo.analyze import ModelAnalysis
+from sparsezoo.analyze_v1 import ModelAnalysis
 from tests.sparsezoo.analyze.helpers import (
     get_expected_analysis,
     get_generated_analysis,
diff --git a/tests/sparsezoo/analyze/test_analysis/test_analysis_schemas.py b/tests/sparsezoo/analyze/test_analysis/test_analysis_schemas.py
@@ -15,7 +15,7 @@
 import pytest
 import yaml
 
-from sparsezoo.analyze import (
+from sparsezoo.analyze_v1 import (
     BenchmarkResult,
     BenchmarkScenario,
     ImposedSparsificationInfo,
diff --git a/tests/sparsezoo/analyze/test_analysis/test_analysis_summary.py b/tests/sparsezoo/analyze/test_analysis/test_analysis_summary.py
@@ -15,9 +15,9 @@
 
 import pytest
 
-from sparsezoo.analyze import ModelAnalysis
-from sparsezoo.analyze.analysis import ModelAnalysisSummary
-from sparsezoo.analyze.utils.models import ModelEntry, Section, SizedModelEntry
+from sparsezoo.analyze_v1 import ModelAnalysis
+from sparsezoo.analyze_v1.analysis import ModelAnalysisSummary
+from sparsezoo.analyze_v1.utils.models import ModelEntry, Section, SizedModelEntry
 
 
 @pytest.fixture
diff --git a/tests/sparsezoo/analyze/test_model_analysis_creation.py b/tests/sparsezoo/analyze/test_model_analysis_creation.py
@@ -18,7 +18,7 @@
 import pytest
 
 from sparsezoo import Model
-from sparsezoo.analyze import ModelAnalysis
+from sparsezoo.analyze_v1 import ModelAnalysis
 
 
 def onnx_stub():
diff --git a/tests/sparsezoo/analyze/utils/test_chart.py b/tests/sparsezoo/analyze/utils/test_chart.py
@@ -16,7 +16,7 @@
 
 import pytest
 
-from sparsezoo.analyze import (
+from sparsezoo.analyze_v1 import (
     ModelAnalysis,
     draw_operation_chart,
     draw_parameter_chart,
