Merge branch 'main_megatron_cntrl' into 'main'

Text generation fixes

See merge request ADLR/megatron-lm!137

megatron/text_generation_utils.py

@@ -97,6 +97,8 @@ def generate_samples_input_from_file(model):
             sample_output_file = args.sample_input_file + ".out"
             print('could not find `sample-output-file`, setting '
                   'it to {}'.format(sample_output_file))
+        else:
+            sample_output_file = args.sample_output_file
         fname_out = open(sample_output_file, "w+")
 
     context_count = 0

tools/generate_samples_gpt2.py

@@ -87,7 +87,7 @@ def main():
     # Generate samples.
     if args.num_samples == 0:
         args.batch_size = 1
-        if args.sample_input_file != "":
+        if args.sample_input_file != None:
             generate_samples_input_from_file(model)
         else:
             generate_samples_interactive(model)