cleanup

lm_eval/__main__.py

-from lm_eval._cli import Eval
+from lm_eval._cli.eval import Eval
 
 
 def cli_evaluate() -> None:

lm_eval/_cli/__init__.py

 """
 CLI subcommands to run from terminal.
 """
-
-from lm_eval._cli.base import SubCommand
-from lm_eval._cli.eval import Eval
-from lm_eval._cli.list import List
-from lm_eval._cli.run import Run
-from lm_eval._cli.validate import Validate
-
-
-__all__ = [
-    "SubCommand",
-    "Run",
-    "List",
-    "Validate",
-    "Eval",
-]

lm_eval/_cli/eval.py

@@ -2,7 +2,7 @@ import argparse
 import sys
 import textwrap
 
-from lm_eval._cli.list import List
+from lm_eval._cli.listall import ListAll
 from lm_eval._cli.run import Run
 from lm_eval._cli.validate import Validate
 
@@ -40,35 +40,20 @@ class Eval:
             dest="command", help="Available commands", metavar="COMMAND"
         )
         Run.create(self._subparsers)
-        List.create(self._subparsers)
+        ListAll.create(self._subparsers)
         Validate.create(self._subparsers)
 
     def parse_args(self) -> argparse.Namespace:
         """Parse arguments using the main parser."""
         if len(sys.argv) > 2 and sys.argv[1] not in self._subparsers.choices:
-            # Arguments provided but no valid subcommand - insert 'run'
+            # Backward compatibility: arguments provided but no valid subcommand - insert 'run'
             sys.argv.insert(1, "run")
+        elif len(sys.argv) == 2 and "run" in sys.argv:
+            # if only 'run' is specified, ensure it is treated as a subcommand
+            self._subparsers.choices["run"].print_help()
+            sys.exit(0)
         return self._parser.parse_args()
 
     def execute(self, args: argparse.Namespace) -> None:
         """Main execution method that handles subcommands and legacy support."""
-
-        # Handle legacy task listing
-        if hasattr(args, "tasks") and args.tasks in [
-            "list",
-            "list_groups",
-            "list_subtasks",
-            "list_tags",
-        ]:
-            print(
-                f"'--tasks {args.tasks}' is no longer supported.\n"
-                f"Use the 'list' command instead:\n",
-                file=sys.stderr,
-            )
-
-            # Show list command help
-            list_parser = self._subparsers.choices["list"]
-            list_parser.print_help()
-            sys.exit(1)
-
         args.func(args)

lm_eval/_cli/list.py → lm_eval/_cli/listall.py

 import argparse
 import textwrap
 
-from lm_eval._cli.base import SubCommand
+from lm_eval._cli.subcommand import SubCommand
 
 
-class List(SubCommand):
+class ListAll(SubCommand):
     """Command for listing available tasks."""
 
     def __init__(self, subparsers: argparse._SubParsersAction, *args, **kwargs):

lm_eval/_cli/run.py

@@ -5,7 +5,7 @@ import os
 import textwrap
 from functools import partial
 
-from lm_eval._cli import SubCommand
+from lm_eval._cli.subcommand import SubCommand
 from lm_eval._cli.utils import (
     _int_or_none_list_arg_type,
     request_caching_arg_to_dict,
@@ -42,7 +42,7 @@ class Run(SubCommand):
             formatter_class=argparse.RawDescriptionHelpFormatter,
         )
         self._add_args()
-        self._parser.set_defaults(func=lambda arg: self._parser.print_help())
+        self._parser.set_defaults(func=self.execute)
 
     def _add_args(self) -> None:
         self._parser = self._parser

lm_eval/_cli/validate.py

@@ -2,7 +2,7 @@ import argparse
 import sys
 import textwrap
 
-from lm_eval._cli.base import SubCommand
+from lm_eval._cli.subcommand import SubCommand
 
 
 class Validate(SubCommand):
@@ -81,7 +81,7 @@ class Validate(SubCommand):
             "-t",
             required=True,
             type=str,
-            metavar="task1,task2",
+            metavar="TASK1,TASK2",
             help="Comma-separated list of task names to validate",
         )
         self._parser.add_argument(