Migrate MaxText/train.py to maxtext/trainers/pre_train/train.py

bvandermoon · ajkv-google · commit 45f0291efe03 · 2026-02-20T22:14:15.000Z
diff --git a/src/maxtext/trainers/pre_train/train.py b/src/maxtext/trainers/pre_train/train.py
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 # Copyright 2023–2025 Google LLC
+=======
+# Copyright 2023–2026 Google LLC
+>>>>>>> 9194ee09f (Migrate MaxText/train.py to maxtext/trainers/pre_train/train.py)
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/tools/gcs_benchmarks/standalone_checkpointer.py b/tools/gcs_benchmarks/standalone_checkpointer.py
@@ -38,7 +38,6 @@
 
 Transformer = models.transformer_as_linen
 
-
 def checkpoint_loop(config, state=None):
   """Main Checkpointing loop.
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,8 @@`
	`1`	`+<<<<<<< HEAD`
`1`	`2`	`# Copyright 2023–2025 Google LLC`
	`3`	`+=======`
	`4`	`+# Copyright 2023–2026 Google LLC`
	`5`	`+>>>>>>> 9194ee09f (Migrate MaxText/train.py to maxtext/trainers/pre_train/train.py)`
`2`	`6`	`#`
`3`	`7`	`# Licensed under the Apache License, Version 2.0 (the "License");`
`4`	`8`	`# you may not use this file except in compliance with the License.`