merge dreggs

Signed-off-by: Kyle Sayers <[email protected]>

Author: kylesayrs

src/compressed_tensors/transform/factory/base.py

@@ -14,11 +14,10 @@
 
 from abc import ABC, abstractmethod
 from collections import defaultdict
-from typing import List, Optional, Tuple, Set
+from typing import List, Optional, Set, Tuple
 
 import torch
 import torch.nn.utils.parametrize as P
-from compressed_tensors.utils.internal import InternalModule
 from compressed_tensors.registry.registry import RegistryMixin, T
 from compressed_tensors.transform import (
     TransformArgs,
@@ -34,6 +33,7 @@
     register_offload_module,
     update_offload_parameter,
 )
+from compressed_tensors.utils.internal import InternalModule
 from torch import Tensor
 from torch.nn import Module, Parameter
 

src/compressed_tensors/transform/factory/hadamard.py

@@ -13,11 +13,7 @@
 # limitations under the License.
 
 import math
-<<<<<<< HEAD
 from typing import Optional
-=======
-from typing import Optional, Union
->>>>>>> kylesayrs/serialize-tconfig
 
 import torch
 from compressed_tensors.transform import TransformArgs, TransformScheme