merge filter into sampler

Author: DNXie

src/forge/observability/__init__.py

@@ -28,7 +28,6 @@
     SampleAccumulator,
     StdAccumulator,
     SumAccumulator,
-    TopBottomKFilter,
     WandbBackend,
 )
 from .perf_tracker import trace, Tracer

src/forge/observability/metric_actors.py

@@ -9,14 +9,6 @@
 import uuid
 from typing import Any, Union
 
-from monarch.actor import (
-    context,
-    endpoint,
-    get_or_spawn_controller,
-    ProcMesh,
-    this_proc,
-)
-
 from forge.controller.actor import ForgeActor
 
 from forge.env import FORGE_DISABLE_METRICS
@@ -30,6 +22,14 @@
     reduce_metrics_states,
 )
 
+from monarch.actor import (
+    context,
+    endpoint,
+    get_or_spawn_controller,
+    ProcMesh,
+    this_proc,
+)
+
 
 logger = logging.getLogger(__name__)
 
@@ -437,15 +437,9 @@ def extract_values_from_valuemesh(results) -> list[dict[str, Any]]:
             scalar_metrics = [
                 m for m in reduced_metrics if m.reduction != Reduce.SAMPLE
             ]
-<<<<<<< HEAD
             sample_metrics = [
                 m for m in reduced_metrics if m.reduction == Reduce.SAMPLE
             ]
-=======
-            sample_metrics = {
-                m.key: m.value for m in reduced_metrics if m.reduction == Reduce.SAMPLE
-            }
->>>>>>> a8be76e (functions, tests)
 
             # Log to global backends
             for backend_name, backend in self.global_logger_backends.items():