Browse Source

conflict

tags/v1.0.0alpha
x54-729 3 years ago
parent
commit
cf3877ca31
1 changed files with 0 additions and 3 deletions
  1. +0
    -3
      fastNLP/core/drivers/__init__.py

+ 0
- 3
fastNLP/core/drivers/__init__.py View File

@@ -1,7 +1,6 @@
__all__ = [ __all__ = [
'Driver', 'Driver',
'TorchDriver', 'TorchDriver',
<<<<<<< HEAD
"TorchSingleDriver", "TorchSingleDriver",
"TorchDDPDriver", "TorchDDPDriver",
"DeepSpeedDriver", "DeepSpeedDriver",
@@ -11,7 +10,6 @@ __all__ = [
"JittorDriver", "JittorDriver",
"JittorSingleDriver", "JittorSingleDriver",
"JittorMPIDriver", "JittorMPIDriver",
=======
'TorchSingleDriver', 'TorchSingleDriver',
'TorchDDPDriver', 'TorchDDPDriver',
'PaddleDriver', 'PaddleDriver',
@@ -23,7 +21,6 @@ __all__ = [
'OneflowDriver', 'OneflowDriver',
'OneflowSingleDriver', 'OneflowSingleDriver',
'OneflowDDPDriver', 'OneflowDDPDriver',
>>>>>>> dev0.8.0
'torch_seed_everything', 'torch_seed_everything',
'paddle_seed_everything', 'paddle_seed_everything',
'oneflow_seed_everything', 'oneflow_seed_everything',


Loading…
Cancel
Save