Merge commit 'f0b4c2a90b0e4ce8ab24b1aece93dc2668427817' into chore/bump-mcore-dev-260812

Author: svcnemo-autobot

tests/unit_tests/training/test_gpt_step.py

@@ -760,7 +760,10 @@ def current_apply_expert_bias(_self, routing_map, padding_mask=None):
 
     def test_mcore_schedule_plan_routes_with_chunk_padding_mask(self, monkeypatch):
         """The pinned MCore EP-overlap callable must pass its chunk-local router mask."""
-        from megatron.core.models.common import fine_grained_callables
+        try:
+            from megatron.core.models.common import fine_grained_callables
+        except ImportError:
+            from megatron.core.models.gpt import fine_grained_callables
 
         observed = {}