Removing the deprecated hparam_file argument for hyperparameters.build_hparams. Also removing offline BLEU score calculator which is the only code that depended on the hparam_file feature.

PiperOrigin-RevId: 890622975

Author: georgedahl

init2winit/hyperparameters.py

@@ -22,7 +22,6 @@
 from init2winit.init_lib import initializers
 from init2winit.model_lib import models
 from ml_collections.config_dict import config_dict
-from tensorflow.io import gfile
 
 
 def expand_key(hparams, key_pieces, index, value):
@@ -99,7 +98,6 @@ def expand_dot_keys(d):
 def build_hparams(model_name,
                   initializer_name,
                   dataset_name,
-                  hparam_file,
                   hparam_overrides,
                   input_pipeline_hps=None,
                   allowed_unrecognized_hparams=None):
@@ -109,8 +107,6 @@ def build_hparams(model_name,
     model_name: the string model name.
     initializer_name: the string initializer name.
     dataset_name: the string dataset name.
-    hparam_file: the string to the hyperparameter override file (possibly on
-      CNS).
     hparam_overrides: a dict of hyperparameter override names/values, or a JSON
       string encoding of this hyperparameter override dict. Note that this is
       applied after the hyperparameter file overrides.
@@ -163,12 +159,6 @@ def build_hparams(model_name,
   for key in ['opt_hparams', 'lr_hparams']:
     merged[key].unlock()
 
-  if hparam_file:
-    logging.info('Loading hparams from %s', hparam_file)
-    with gfile.GFile(hparam_file, 'r') as f:
-      hparam_dict = json.load(f)
-      merged.update_from_flattened_dict(hparam_dict)
-
   if hparam_overrides:
     if isinstance(hparam_overrides, str):
       hparam_overrides = json.loads(hparam_overrides)

init2winit/main_config_flags.py

@@ -127,7 +127,6 @@ def _run(
     early_stopping_mode,
     early_stopping_min_steps,
     eval_steps,
-    hparam_file,
     allowed_unrecognized_hparams,
     hparam_overrides,
     initializer_name,
@@ -163,7 +162,6 @@ def _run(
       model_name=model_name,
       initializer_name=initializer_name,
       dataset_name=dataset_name,
-      hparam_file=hparam_file,
       hparam_overrides=hparam_overrides,
       input_pipeline_hps=input_pipeline_hps,
       allowed_unrecognized_hparams=allowed_unrecognized_hparams)
@@ -315,7 +313,6 @@ def main(unused_argv):
         early_stopping_mode=config.early_stopping_mode,
         early_stopping_min_steps=config.early_stopping_min_steps,
         eval_steps=eval_steps,
-        hparam_file=None,  # Deprecated. TODO(gdahl): Needs to be removed.
         allowed_unrecognized_hparams=config.allowed_unrecognized_hparams,
         hparam_overrides=config.hparam_overrides,
         initializer_name=config.initializer,

init2winit/mt_eval/main.py

@@ -96,7 +96,6 @@ def test_generic_multi_optimizer_init(self):
         experiment_config.model,
         experiment_config.initializer,
         experiment_config.dataset,
-        hparam_file=None,
         hparam_overrides=experiment_config.hparam_overrides)
 
     model = model_cls(

init2winit/optimizer_lib/test_optimizers.py

@@ -17,7 +17,6 @@
 
 from absl.testing import absltest
 from init2winit import hyperparameters
-import tensorflow.compat.v1 as tf
 
 
 class HyperParameterTest(absltest.TestCase):
@@ -39,7 +38,6 @@ def test_override(self):
         model_name='transformer',
         initializer_name='noop',
         dataset_name='lm1b_v2',
-        hparam_file=None,
         hparam_overrides=hps_overrides,
     )
 
@@ -62,15 +60,13 @@ def test_unrecognized_override(self):
           model_name='transformer',
           initializer_name='noop',
           dataset_name='lm1b_v2',
-          hparam_file=None,
           hparam_overrides=hps_overrides,
           allowed_unrecognized_hparams=[],
       )
     merged_hps = hyperparameters.build_hparams(
         model_name='transformer',
         initializer_name='noop',
         dataset_name='lm1b_v2',
-        hparam_file=None,
         hparam_overrides=hps_overrides,
         allowed_unrecognized_hparams=['lr_hparamsTYPO'],
     )
@@ -85,7 +81,6 @@ def test_dot_override(self):
         model_name='transformer',
         initializer_name='noop',
         dataset_name='lm1b_v2',
-        hparam_file=None,
         hparam_overrides=hps_overrides,
     )
 
@@ -124,7 +119,6 @@ def test_optimizer_override(self):
         model_name='transformer',
         initializer_name='noop',
         dataset_name='lm1b_v2',
-        hparam_file=None,
         hparam_overrides=hps_overrides,
     )
 
@@ -228,5 +222,4 @@ def test_safe_expand_dot_keys(self):
 
 
 if __name__ == '__main__':
-  tf.enable_v2_behavior()
   absltest.main()

init2winit/test_hyperparameters.py

@@ -72,7 +72,6 @@ def main(unused_argv):
         model_name=model_name,
         initializer_name=initializer_name,
         dataset_name=dataset_name,
-        hparam_file=None,
         hparam_overrides=hparam_overrides)
 
     rng = jax.random.PRNGKey(0)

init2winit/tools/inspect_dataset.py

@@ -678,7 +678,6 @@ def test_trainer(self):
         model_name,
         initializer_name,
         dataset_name,
-        hparam_file=None,
         hparam_overrides=hparam_overrides,
         input_pipeline_hps=input_pipeline_hps)
 
@@ -980,7 +979,6 @@ def test_early_stopping(self, min_steps):
         model_name,
         initializer_name,
         dataset_name,
-        hparam_file=None,
         hparam_overrides=hparam_overrides,
         input_pipeline_hps=input_pipeline_hps)