Skip to content

Commit d30e4bb

Browse files
committed
deleted additional colocated files
1 parent 25c2354 commit d30e4bb

File tree

4 files changed

+8
-107
lines changed

4 files changed

+8
-107
lines changed

Dockerfile.colocated

Lines changed: 0 additions & 60 deletions
This file was deleted.

axlearn/cloud/gcp/bundler.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ class Config(DockerBundler.Config):
110110
# Build image asynchronously.
111111
colocated_image_required: bool = False
112112
colocated_image_name: str = None
113-
colocated_dockerfile: str = None
113+
#colocated_dockerfile: str = None
114114

115115

116116
@classmethod
@@ -120,7 +120,7 @@ def from_spec(cls, spec: list[str], *, fv: Optional[flags.FlagValues]) -> Docker
120120
cfg.dockerfile = cfg.dockerfile or gcp_settings("default_dockerfile", required=False, fv=fv)
121121
cfg.colocated_image_required = cfg.colocated_image_required or gcp_settings("colocated_image_required", required=False, fv=fv)
122122
cfg.colocated_image_name = cfg.colocated_image_name or gcp_settings("colocated_image_name", required=False, fv=fv)
123-
cfg.colocated_dockerfile = cfg.colocated_dockerfile or gcp_settings("colocated_dockerfile", required=False, fv=fv)
123+
#cfg.colocated_dockerfile = cfg.colocated_dockerfile or gcp_settings("colocated_dockerfile", required=False, fv=fv)
124124
return cfg
125125

126126
def _build_and_push(self, *args, **kwargs):
@@ -131,18 +131,18 @@ def _build_and_push(self, *args, **kwargs):
131131
)
132132

133133
actual_name = cfg.image
134-
actual_dockerfile=cfg.dockerfile
134+
#actual_dockerfile=cfg.dockerfile
135135
actual_target=cfg.target
136136
if bool(cfg.colocated_image_required):
137137

138-
cfg.dockerfile=cfg.colocated_dockerfile
138+
#cfg.dockerfile=cfg.colocated_dockerfile
139139
cfg.image=cfg.colocated_image_name
140-
cfg.target=None
140+
cfg.target="colocated-python"
141141

142142
colocated_bundler_class = ColocatedArtifactRegistryBundler(cfg=cfg)
143143
colocated_image_name = colocated_bundler_class.bundle(tag=cfg.image)
144144

145-
cfg.dockerfile=actual_dockerfile
145+
#cfg.dockerfile=actual_dockerfile
146146
cfg.image=actual_name
147147
cfg.target=actual_target
148148

@@ -156,7 +156,7 @@ class ColocatedArtifactRegistryBundler(DockerBundler):
156156
def from_spec(cls, spec: list[str], *, fv: Optional[flags.FlagValues]) -> DockerBundler.Config:
157157
cfg: ColocatedArtifactRegistryBundler.Config = super().from_spec(spec, fv=fv)
158158
cfg.repo = cfg.repo or gcp_settings("docker_repo", required=False, fv=fv)
159-
cfg.dockerfile = cfg.colocated_dockerfile or gcp_settings("colocated_dockerfile", required=False, fv=fv)
159+
cfg.dockerfile = cfg.colocated_dockerfile or gcp_settings("default_dockerfile", required=False, fv=fv)
160160
return cfg
161161

162162
def _build_and_push(self, *args, **kwargs):

colocated/extract_deps.py

Lines changed: 0 additions & 38 deletions
This file was deleted.

colocated_commands.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ axlearn gcp bundle --name=$NAME \
1313
--bundler_spec=image=tpu \
1414
--bundler_spec=target=tpu \
1515
--bundler_spec=colocated_image_required=True \
16-
--bundler_spec=colocated_image_name=$COLOCATED_NAME \
17-
--bundler_spec=colocated_dockerfile=Dockerfile.colocated
16+
--bundler_spec=colocated_image_name=$COLOCATED_NAME
1817

1918

2019

0 commit comments

Comments
 (0)