Removed RecipeTuple & RecipeContainer class (#1460)

SUMMARY:
Removed RecipeTuple class and downstream dependencies. Updated related
docstrings.


TEST PLAN:
Ran tests from tests/llmcompressor and passed
Fixed test_obcq_owl. It was creating event without initializing a
session, which shouldn't be allowed.

CONCERNS:
I did make one assumption that there will be only one `target_stage`
each time a session gets initialized. Is it true?

---------

Signed-off-by: shanjiaz <[email protected]>

Author: shanjiaz

src/llmcompressor/core/lifecycle.py

@@ -13,12 +13,7 @@
 from llmcompressor.core.events import Event, EventType
 from llmcompressor.core.state import State
 from llmcompressor.modifiers import StageModifiers
-from llmcompressor.recipe import (
-    RecipeArgsInput,
-    RecipeContainer,
-    RecipeInput,
-    RecipeStageInput,
-)
+from llmcompressor.recipe import Recipe, RecipeArgsInput, RecipeInput, RecipeStageInput
 
 __all__ = ["CompressionLifecycle"]
 
@@ -30,14 +25,14 @@ class CompressionLifecycle:
 
     :param state: The current state of the compression process
     :type state: Optional[State]
-    :param recipe_container: The container for the compression recipe
-    :type recipe_container: RecipeContainer
+    :param recipe: The compression recipe
+    :type recipe: Recipe
     :param modifiers: The list of stage modifiers
     :type modifiers: List[StageModifiers]
     """
 
     state: State = field(default_factory=State)
-    recipe_container: RecipeContainer = field(default_factory=RecipeContainer)
+    recipe: Recipe = field(default_factory=Recipe)
     modifiers: List[StageModifiers] = field(default_factory=list)
 
     initialized_: bool = False
@@ -91,13 +86,16 @@ def initialize(
         :return: List of data returned from initialization of modifiers
         :rtype: List[Any]
         """
+
         self.state.update(**kwargs)
         if self.initialized_:  # TODO: do not initialize twice
             return
 
         logger.debug("Initializing compression lifecycle")
-        self.recipe_container.append(recipe, recipe_stage, recipe_args)
-        self.modifiers = self.recipe_container.get_modifiers()
+        self.recipe = Recipe.simplify_recipe(
+            recipe=recipe, target_stage=recipe_stage, override_args=recipe_args
+        )
+        self.modifiers = self.recipe.create_modifier()
 
         mod_data = []
         for mod in self.modifiers:
@@ -139,8 +137,6 @@ def finalize(self, **kwargs) -> List[Any]:
                 mod_data.append(data)
 
         self.finalized = True
-        applied_stage_names = [mod.unique_id for mod in self.modifiers if mod.applied]
-        self.recipe_container.update_applied_stages(applied_stage_names)
 
         logger.info(
             "Compression lifecycle finalized for {} modifiers", len(self.modifiers)

src/llmcompressor/core/session.py

@@ -213,7 +213,7 @@ def get_serialized_recipe(self) -> Optional[str]:
         """
         :return: serialized string of the current compiled recipe
         """
-        recipe = self.lifecycle.recipe_container.compiled_recipe
+        recipe = self.lifecycle.recipe
 
         if recipe is not None and hasattr(recipe, "yaml"):
             return recipe.yaml()

src/llmcompressor/core/session_functions.py

@@ -75,10 +75,6 @@ def event(cls, event_type: EventType, **kwargs) -> ModifiedState:
                 f"Use the corresponding method instead."
             )
 
-        # skip event callbacks if no recipe was provided
-        if not active_session().lifecycle.recipe_container.check_any_recipe_exists():
-            return
-
         return active_session().event(event_type, **kwargs)
 
     @classmethod

src/llmcompressor/recipe/__init__.py

@@ -1,8 +1,7 @@
 from .base import RecipeBase
-from .container import RecipeContainer
 from .metadata import DatasetMetaData, LayerMetaData, ModelMetaData, ParamMetaData
 from .modifier import RecipeModifier
-from .recipe import Recipe, RecipeArgsInput, RecipeInput, RecipeStageInput, RecipeTuple
+from .recipe import Recipe, RecipeArgsInput, RecipeInput, RecipeStageInput
 from .stage import RecipeStage
 
 __all__ = [
@@ -11,11 +10,9 @@
     "LayerMetaData",
     "ModelMetaData",
     "RecipeBase",
-    "RecipeContainer",
     "RecipeModifier",
     "RecipeStage",
     "Recipe",
-    "RecipeTuple",
     "RecipeInput",
     "RecipeStageInput",
     "RecipeArgsInput",