Commit 7f2cc3a4 authored by mshoeybi's avatar mshoeybi
Browse files

resolved conflicts

parent 30b92cf5
...@@ -542,7 +542,6 @@ class ParallelTransformer(MegatronModule): ...@@ -542,7 +542,6 @@ class ParallelTransformer(MegatronModule):
self.input_tensor = None self.input_tensor = None
# Store activation checkpoiting flag. # Store activation checkpoiting flag.
self.activations_checkpoint_method = args.activations_checkpoint_method self.activations_checkpoint_method = args.activations_checkpoint_method
self.activations_checkpoint_num_layers = args.activations_checkpoint_num_layers self.activations_checkpoint_num_layers = args.activations_checkpoint_num_layers
self.distribute_checkpointed_activations = args.distribute_checkpointed_activations self.distribute_checkpointed_activations = args.distribute_checkpointed_activations
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment