fix merge conflicts

Lightning-Universe · May 28, 2020 · 198a01d · 198a01d
1 parent 1748ce4
commit 198a01d
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 7 deletions.
diff --git a/pl_bolts/models/self_supervised/cpc/cpc_module.py b/pl_bolts/models/self_supervised/cpc/cpc_module.py
@@ -285,11 +285,7 @@ def add_model_specific_args(parent_parser):
             'dataset': 'imagenet128',
             'depth': 10,
             'patch_size': 32,
-<<<<<<< HEAD
             'batch_size': 48,
-=======
-            'batch_size': 52,
->>>>>>> cee9bdd88cdbec912af7c419925b5d8c0fa47f58
             'nb_classes': 1000,
             'patch_overlap': 32 // 2,
             'lr_options': [

diff --git a/pl_bolts/models/self_supervised/simclr/simclr_module.py b/pl_bolts/models/self_supervised/simclr/simclr_module.py
@@ -9,11 +9,8 @@
 from pl_bolts.datamodules.ssl_imagenet_dataloaders import SSLImagenetDataLoaders
 from pl_bolts.losses.self_supervised_learning import nt_xent_loss
 from pl_bolts.models.self_supervised.simclr.simclr_transforms import SimCLRDataTransform
-<<<<<<< HEAD
 from pl_bolts.metrics import mean
-=======
 from pl_bolts.optimizers.layer_adaptive_scaling import LARS
->>>>>>> cee9bdd88cdbec912af7c419925b5d8c0fa47f58
 
 
 class EncoderModel(nn.Module):