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

resolved conflicts

parent 30b92cf5

megatron/model/transformer.py

+0 −1
Original line number Diff line number Diff line
@@ -542,7 +542,6 @@ class ParallelTransformer(MegatronModule): 
        self.input_tensor = None



        # Store activation checkpoiting flag.



        self.activations_checkpoint_method = args.activations_checkpoint_method

        self.activations_checkpoint_num_layers = args.activations_checkpoint_num_layers

        self.distribute_checkpointed_activations = args.distribute_checkpointed_activations