Final SLURM fixes (meta-pytorch#398)

Author: allenwang28

src/forge/controller/provisioner.py

@@ -289,16 +289,10 @@ def bootstrap(env: dict[str, str]):
                 for env_var in all_env_vars():
                     env_vars[env_var.name] = str(env_var.get_value())
 
-            if MONARCH_HOSTMESH_V1.get_value():
-                procs = host_mesh.spawn_procs(
-                    per_host={"procs": num_procs},
-                    setup=functools.partial(bootstrap, env=env_vars),
-                )
-            else:
-                procs = host_mesh.spawn_procs(
-                    per_host={"procs": num_procs},
-                    bootstrap=functools.partial(bootstrap, env=env_vars),
-                )
+            procs = host_mesh.spawn_procs(
+                per_host={"procs": num_procs},
+                bootstrap=functools.partial(bootstrap, env=env_vars),
+            )
 
             if is_remote:
                 await self.launcher.remote_setup(procs)

src/forge/env.py

@@ -100,7 +100,7 @@ def get_value(self) -> Any:
 )
 
 MONARCH_HOSTMESH_V1 = EnvVar(
-    name="MONARCH_HOSTMESH_V1",
+    name="MONARCH_HOST_MESH_V1_REMOVE_ME_BEFORE_RELEASE",
     default=False,
     description="Whether or not to use Monarch's experimental hostmesh v1 APIs",
 )