Merge branch 'main' into compressed-lifecycle

neuralmagic · May 7, 2024 · 8dcdde5 · 8dcdde5
2 parents bb36936 + f7e928b
commit 8dcdde5
Show file tree

Hide file tree

Showing 15 changed files with 2 additions and 2 deletions.
diff --git a/setup.py b/setup.py
@@ -32,7 +32,7 @@ def _setup_extras() -> Dict:
 
 setup(
     name="compressed-tensors",
-    version="0.3.2",
+    version="0.3.3",
     author="Neuralmagic, Inc.",
     author_email="[email protected]",
     license="Apache 2.0",

diff --git a/src/compressed_tensors/compressors/sparse_bitmask.py b/src/compressed_tensors/compressors/sparse_bitmask.py
@@ -67,7 +67,7 @@ def compress(self, model_state: Dict[str, Tensor]) -> Dict[str, Tensor]:
                         f"found an existing entry for {key}. The existing entry will "
                         "be replaced."
                     )
-            compressed_dict |= bitmask_dict
+            compressed_dict.update(bitmask_dict)
 
         return compressed_dict
 

diff --git a/...zation/observers/quantization/__init__.py → tests/test_quantization/__init__.py b/...zation/observers/quantization/__init__.py → tests/test_quantization/__init__.py
diff --git a/...ervers/quantization/lifecycle/__init__.py → ...s/test_quantization/lifecycle/__init__.py b/...ervers/quantization/lifecycle/__init__.py → ...s/test_quantization/lifecycle/__init__.py
diff --git a/...ervers/quantization/lifecycle/conftest.py → ...s/test_quantization/lifecycle/conftest.py b/...ervers/quantization/lifecycle/conftest.py → ...s/test_quantization/lifecycle/conftest.py
diff --git a/...vers/quantization/lifecycle/test_apply.py → ...test_quantization/lifecycle/test_apply.py b/...vers/quantization/lifecycle/test_apply.py → ...test_quantization/lifecycle/test_apply.py
diff --git a/...ation/lifecycle/test_dynamic_lifecycle.py → ...ation/lifecycle/test_dynamic_lifecycle.py b/...ation/lifecycle/test_dynamic_lifecycle.py → ...ation/lifecycle/test_dynamic_lifecycle.py
diff --git a/...rs/quantization/lifecycle/test_forward.py → ...st_quantization/lifecycle/test_forward.py b/...rs/quantization/lifecycle/test_forward.py → ...st_quantization/lifecycle/test_forward.py
diff --git a/...ers/quantization/lifecycle/test_frozen.py → ...est_quantization/lifecycle/test_frozen.py b/...ers/quantization/lifecycle/test_frozen.py → ...est_quantization/lifecycle/test_frozen.py
diff --git a/...quantization/lifecycle/test_initialize.py → ...quantization/lifecycle/test_initialize.py b/...quantization/lifecycle/test_initialize.py → ...quantization/lifecycle/test_initialize.py
diff --git a/.../quantization/lifecycle/test_lifecycle.py → ..._quantization/lifecycle/test_lifecycle.py b/.../quantization/lifecycle/test_lifecycle.py → ..._quantization/lifecycle/test_lifecycle.py
diff --git a/...rs/quantization/observers/test_min_max.py → ...antization/test_observers/test_min_max.py b/...rs/quantization/observers/test_min_max.py → ...antization/test_observers/test_min_max.py
diff --git a/...observers/quantization/test_quant_args.py → tests/test_quantization/test_quant_args.py b/...observers/quantization/test_quant_args.py → tests/test_quantization/test_quant_args.py
diff --git a/...servers/quantization/test_quant_config.py → tests/test_quantization/test_quant_config.py b/...servers/quantization/test_quant_config.py → tests/test_quantization/test_quant_config.py
diff --git a/...servers/quantization/test_quant_scheme.py → tests/test_quantization/test_quant_scheme.py b/...servers/quantization/test_quant_scheme.py → tests/test_quantization/test_quant_scheme.py