Merge pull request #1712 from vijayphoenix:version

PiperOrigin-RevId: 303147970

Author: copybara-github

tensorflow_datasets/scripts/download_and_prepare.py

@@ -176,12 +176,19 @@ def main(_):
   datasets_to_build = set(FLAGS.datasets and FLAGS.datasets.split(",")
                           or tfds.list_builders())
   datasets_to_build -= set(FLAGS.exclude_datasets.split(","))
-  version = "experimental_latest" if FLAGS.experimental_latest_version else None
-  logging.info("Running download_and_prepare for datasets:\n%s",
+
+  # Only pass the version kwargs when required. Otherwise, `version=None`
+  # overwrite the version parsed from the name.
+  # `tfds.builder('my_dataset:1.2.0', version=None)`
+  if FLAGS.experimental_latest_version:
+    version_kwarg = {"version": "experimental_latest"}
+  else:
+    version_kwarg = {}
+
+  logging.info("Running download_and_prepare for dataset(s):\n%s",
                "\n".join(datasets_to_build))
-  logging.info('Version: "%s"', version)
   builders = {
-      name: tfds.builder(name, data_dir=FLAGS.data_dir, version=version)
+      name: tfds.builder(name, data_dir=FLAGS.data_dir, **version_kwarg)
       for name in datasets_to_build
   }
 
@@ -197,7 +204,7 @@ def main(_):
     config = builder.BUILDER_CONFIGS[FLAGS.builder_config_id]
     logging.info("Running download_and_prepare for config: %s", config.name)
     builder_for_config = tfds.builder(
-        builder.name, data_dir=FLAGS.data_dir, config=config, version=version)
+        builder.name, data_dir=FLAGS.data_dir, config=config, **version_kwarg)
     download_and_prepare(builder_for_config)
   else:
     for name, builder in builders.items():
@@ -206,8 +213,10 @@ def main(_):
         # requested, then compute all.
         for config in builder.BUILDER_CONFIGS:
           builder_for_config = tfds.builder(
-              builder.name, data_dir=FLAGS.data_dir, config=config,
-              version=version)
+              builder.name,
+              data_dir=FLAGS.data_dir,
+              config=config,
+              **version_kwarg)
           download_and_prepare(builder_for_config)
       else:
         # If there is a slash in the name, then user requested a specific