merge dregs

Author: kylesayrs

src/compressed_tensors/transform/factory/base.py

@@ -145,14 +145,9 @@ def input_hook(_, args):
                     raise ValueError("Offloaded training is not supported")
                 P.register_parametrization(module, "weight", transform)
 
-<<<<<<< HEAD
             else:
                 # transform is no longer needed (unfusing is not supported)
                 delete_offload_module(module, transform_name)
-=======
-            # transform is no longer needed (unfusing is not supported)
-            delete_offload_module(module, transform_name)
->>>>>>> origin
 
         # register output transformation hook
         elif args.location == TransformLocation.OUTPUT:
@@ -166,7 +161,6 @@ def output_hook(_, _input, output):
         else:
             raise NotImplementedError()
 
-<<<<<<< HEAD
     def _update_tied_weights(self):
         """
         Populate the `_dynamic_tied_weights_keys` attribute of transforms,
@@ -195,8 +189,6 @@ def _update_tied_weights(self):
                 for transform, name in shared_keys:
                     transform._dynamic_tied_weights_keys.append(name)
                     setattr(transform, name, tensor)
-=======
->>>>>>> origin
 
 class TransformBase(InternalModule, ABC):
     """

tests/test_transform/factory/test_correctness.py

@@ -22,7 +22,6 @@
     apply_transform_config,
 )
 from compressed_tensors.utils import offloaded_dispatch
-from tests.test_transform.conftest import scheme_kwargs
 from tests.testing_utils import requires_accelerate, requires_gpu