work

Author: danielvegamyhre

torchao/prototype/moe_training/scaled_grouped_mm.py

@@ -40,11 +40,7 @@ def _scaled_grouped_mm(
         offs (int32 torch.Tensor): The offsets to use to mark the starting index of each group along dim0 of the A tensor.
         out_dtype (Optional[torch.dtype]): The dtype of the output tensor. Currently only torch.bfloat16 is supported.
     """
-<<<<<<< HEAD
     logger.info("Using scaled_grouped_mm")
-=======
-    logger.info("Using differentiable _scaled_grouped_mm")
->>>>>>> eb2dd3e0 (fix dtype bug)
     return _Float8GroupedMM.apply(
         A,
         B_t,

torchao/prototype/moe_training/tensor.py

@@ -19,10 +19,6 @@
 
 logger: logging.Logger = logging.getLogger(__name__)
 
-<<<<<<< HEAD
-=======
-
->>>>>>> eb2dd3e0 (fix dtype bug)
 _ops_to_preserve_subclass = {
     torch.ops.aten.empty_like.default,
     torch.ops.aten.new_zeros.default,