Back out "Resolve run_opts before passing it to the workspace (pytorch#755) (pytorch#755)"

Summary:
Original commit changeset: b3e964613444

Original Phabricator Diff: D48395915

Differential Revision: D48430887

fbshipit-source-id: 3fdbe84652f8ad07083b16724eadbc2aa7e828f0

Author: Miquel Jubert Hermoso

Diff for: torchx/runner/api.py

@@ -357,7 +357,7 @@ def dryrun(
         cfg = cfg or dict()
         with log_event("dryrun", scheduler, runcfg=json.dumps(cfg) if cfg else None):
             sched = self._scheduler(scheduler)
-            resolved_cfg = sched.run_opts().resolve(cfg)
+
             if workspace and isinstance(sched, WorkspaceMixin):
                 role = app.roles[0]
                 old_img = role.image
@@ -366,7 +366,7 @@ def dryrun(
                 logger.info(
                     'To disable workspaces pass: --workspace="" from CLI or workspace=None programmatically.'
                 )
-                sched.build_workspace_and_update_role(role, workspace, resolved_cfg)
+                sched.build_workspace_and_update_role(role, workspace, cfg)
 
                 if old_img != role.image:
                     logger.info(
@@ -380,7 +380,7 @@ def dryrun(
                     )
 
             sched._validate(app, scheduler)
-            dryrun_info = sched.submit_dryrun(app, resolved_cfg)
+            dryrun_info = sched.submit_dryrun(app, cfg)
             dryrun_info._scheduler = scheduler
             return dryrun_info
 

Diff for: torchx/runner/test/api_test.py

@@ -114,10 +114,6 @@ def test_run(self, _) -> None:
 
     def test_dryrun(self, _) -> None:
         scheduler_mock = MagicMock()
-        scheduler_mock.run_opts.return_value.resolve.return_value = {
-            **self.cfg,
-            "foo": "bar",
-        }
         with Runner(
             name=SESSION_NAME,
             scheduler_factories={"local_dir": lambda name: scheduler_mock},
@@ -131,9 +127,7 @@ def test_dryrun(self, _) -> None:
             )
             app = AppDef("name", roles=[role])
             runner.dryrun(app, "local_dir", cfg=self.cfg)
-            scheduler_mock.submit_dryrun.assert_called_once_with(
-                app, {**self.cfg, "foo": "bar"}
-            )
+            scheduler_mock.submit_dryrun.assert_called_once_with(app, self.cfg)
             scheduler_mock._validate.assert_called_once()
 
     def test_dryrun_env_variables(self, _) -> None:

Diff for: torchx/schedulers/api.py

@@ -136,15 +136,12 @@ def submit(
         Returns:
             The application id that uniquely identifies the submitted app.
         """
-        # pyre-fixme: Generic cfg type passed to resolve
-        resolved_cfg = self.run_opts().resolve(cfg)
         if workspace:
             sched = self
             assert isinstance(sched, WorkspaceMixin)
             role = app.roles[0]
-            sched.build_workspace_and_update_role(role, workspace, resolved_cfg)
-        # pyre-fixme: submit_dryrun takes Generic type for resolved_cfg
-        dryrun_info = self.submit_dryrun(app, resolved_cfg)
+            sched.build_workspace_and_update_role(role, workspace, cfg)
+        dryrun_info = self.submit_dryrun(app, cfg)
         return self.schedule(dryrun_info)
 
     @abc.abstractmethod

Diff for: torchx/schedulers/test/api_test.py

@@ -108,8 +108,8 @@ def test_submit_workspace(self) -> None:
 
         scheduler_mock = SchedulerTest.MockScheduler("test_session")
 
-        cfg = {"foo": "asdf"}
-        scheduler_mock.submit(app, cfg, workspace="some_workspace")
+        bad_type_cfg = {"foo": "asdf"}
+        scheduler_mock.submit(app, bad_type_cfg, workspace="some_workspace")
         self.assertEqual(app.roles[0].image, "some_workspace")
 
     def test_invalid_dryrun_cfg(self) -> None: