fix merge conflicts?

lm_eval/api/task.py

@@ -22,7 +22,6 @@ from typing import (
 
 import datasets
 import numpy as np
-import shortuuid
 from tqdm import tqdm
 
 from lm_eval import utils
@@ -137,9 +136,8 @@ class ConfigurableGroup(abc.ABC):
         self,
         config: Optional[dict] = None,
     ) -> None:
-        # Create a unique identifier ID
         self._config = GroupConfig(**config)
-        self._task_id = self._config.group
+        # self._task_id = self._config.group
 
     @property
     def group(self):
@@ -157,13 +155,13 @@ class ConfigurableGroup(abc.ABC):
     def config(self):
         return self._config.to_dict()
 
-    @property
-    def task_id(self) -> Any:
-        return self._task_id
+    # @property
+    # def task_id(self) -> Any:
+    #     return self._task_id
 
-    @task_id.setter
-    def task_id(self, value):
-        self._task_id = value
+    # @task_id.setter
+    # def task_id(self, value):
+    #     self._task_id = value
 
     @property
     def group_name(self) -> Any:
@@ -363,7 +361,7 @@ class Task(abc.ABC):
         self._instances: Optional[List[Instance]] = None
 
         # Create a unique identifier ID
-        self._task_id = shortuuid.uuid()[:8]
+        # self._task_id = shortuuid.uuid()[:8]
         self._config: TaskConfig = TaskConfig({**config}) if config else TaskConfig()
 
         self._filters = [build_filter_ensemble("none", [["take_first", None]])]
@@ -820,13 +818,13 @@ class Task(abc.ABC):
         )
         return doc_iterator
 
-    @property
-    def task_id(self) -> Any:
-        return self._task_id
+    # @property
+    # def task_id(self) -> Any:
+    #     return self._task_id
 
-    @task_id.setter
-    def task_id(self, value):
-        self._task_id = value
+    # @task_id.setter
+    # def task_id(self, value):
+    #     self._task_id = value
 
 
 class ConfigurableTask(Task):
@@ -842,7 +840,7 @@ class ConfigurableTask(Task):
         config: Optional[dict] = None,
     ) -> None:  # TODO no super() call here
         # Create a unique identifier ID
-        self._task_id = shortuuid.uuid()[:8]
+        # self._task_id = shortuuid.uuid()[:8]
 
         # Get pre-configured attributes
         self._config = self.CONFIG

lm_eval/evaluator_utils.py

@@ -40,7 +40,7 @@ class TaskOutput:
         self,
         task=None,
         task_name=None,
-        task_id=None,
+        # task_id=None,
         task_config=None,
         version=None,
         group_name=None,
@@ -52,7 +52,7 @@ class TaskOutput:
         self.task = task
         self.task_config = task_config
         self.task_name = task_name
-        self.task_id = task_id
+        # self.task_id = task_id
         self.group_name = group_name
         self.version = version
         self.n_shot = n_shot
@@ -78,7 +78,7 @@ class TaskOutput:
                 task=task, task_name=task_name, is_group=is_group, group_name=group_name
             )
         version = task.VERSION
-        task_id = task.task_id
+        # task_id = task.task_id
         task_config = dict(task.dump_config())
         if (n_shot := task_config.get("num_fewshot")) == 0:
             n_shot = task_config.get("metadata", {}).get("num_fewshot", 0)
@@ -87,7 +87,7 @@ class TaskOutput:
         return cls(
             task=task,
             task_name=task_name,
-            task_id=task_id,
+            # task_id=task_id,
             task_config=task_config,
             group_name=group_name,
             version=version,