bug fix

MarcusLoppe · Jun 17, 2024 · b7a3611 · b7a3611
1 parent 8e15172
commit b7a3611
Showing 1 changed file with 3 additions and 10 deletions.
diff --git a/meshgpt_pytorch/trainer.py b/meshgpt_pytorch/trainer.py
@@ -143,16 +143,13 @@ def __init__(
                 drop_last = True,
                 collate_fn = partial(custom_collate, pad_id = model.pad_id)
             )
-
-<<<<<<< HEAD
-        self.data_kwargs = data_kwargs
-=======
+
         if hasattr(dataset, 'data_kwargs') and exists(dataset.data_kwargs):
             assert beartype_isinstance(dataset.data_kwargs, List[str])
             self.data_kwargs = dataset.data_kwargs
         else:
             self.data_kwargs = data_kwargs
->>>>>>> upstream/main
+ 
 
         (
             self.model,
@@ -506,16 +503,12 @@ def __init__(
                 drop_last = True,
                 collate_fn = partial(custom_collate, pad_id = model.pad_id)
             )
-
-<<<<<<< HEAD
-        self.data_kwargs = data_kwargs
-=======
+
         if hasattr(dataset, 'data_kwargs') and exists(dataset.data_kwargs):
             assert beartype_isinstance(dataset.data_kwargs, List[str])
             self.data_kwargs = dataset.data_kwargs
         else:
             self.data_kwargs = data_kwargs
->>>>>>> upstream/main
 
         (
             self.model,