Skip to content

Commit

Permalink
update docker images
Browse files Browse the repository at this point in the history
  • Loading branch information
epwalsh committed Mar 20, 2023
1 parent 4151179 commit 0dc0013
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ jobs:
timeout-minutes: 15
env:
BEAKER_TOKEN: ${{ secrets.BEAKER_TOKEN }}
BEAKER_IMAGE: dolma-test
BEAKER_IMAGE: dolma-torch2-test
BEAKER_WORKSPACE: ai2/llm-testing
steps:
- name: Determine current commit SHA (pull request)
Expand Down
4 changes: 3 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# If you update this, also update BEAKER_IMAGE in .github/workflows/main.yml
IMAGE_NAME_BASE = dolma
IMAGE_NAME_BASE = dolma-torch2
# If you update this, also update BEAKER_WORKSPACE in .github/workflows/main.yml
BEAKER_WORKSPACE = "ai2/llm-testing"

Expand Down Expand Up @@ -32,13 +32,15 @@ base-image :
gantry-image : base-image
docker build -f docker/Dockerfile.gantry -t $(IMAGE_NAME_BASE)-gantry .
beaker image create $(IMAGE_NAME_BASE)-gantry --name $(IMAGE_NAME_BASE)-gantry-tmp --workspace $(BEAKER_WORKSPACE)
echo "Image uploaded successfully"
beaker image delete $(GANTRY_IMAGE) || true
beaker image rename $(BEAKER_USER)/$(IMAGE_NAME_BASE)-gantry-tmp $(IMAGE_NAME_BASE)-gantry

.PHONY : test-image
test-image : base-image
docker build -f docker/Dockerfile.test -t $(IMAGE_NAME_BASE)-test .
beaker image create $(IMAGE_NAME_BASE)-test --name $(IMAGE_NAME_BASE)-test-tmp --workspace $(BEAKER_WORKSPACE)
echo "Image uploaded successfully"
beaker image delete $(TEST_IMAGE) || true
beaker image rename $(BEAKER_USER)/$(IMAGE_NAME_BASE)-test-tmp $(IMAGE_NAME_BASE)-test

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ gantry run \
--nfs \
--priority preemptible \
--gpus 8 \
--beaker-image dolma-gantry \
--beaker-image dolma-torch2-gantry \
--cluster 'ai2/*-cirrascale' \
--allow-dirty \
-- composer scripts/train.py configs/1.2b-c4.yaml
Expand All @@ -36,7 +36,7 @@ Train the 70B model on c4 with gantry across multiple nodes:
gantry run \
--workspace ai2/llm-testing \
--priority "high" \
--beaker-image dolma-gantry \
--beaker-image dolma-torch2-gantry \
--cluster ai2/general-cirrascale-a100-80g-ib \
--gpus 8 \
--nfs \
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.gantry
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# To build and push the image to Beaker, run 'make gantry-image'.
# To test the image after pushing to Beaker, run 'make gantry-test'.

FROM dolma-base
FROM dolma-torch2-base

WORKDIR /stage

Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.test
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# To build and push the image to Beaker, run 'make test-image'.

FROM dolma-base
FROM dolma-torch2-base

COPY scripts/test_entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
Expand Down

0 comments on commit 0dc0013

Please sign in to comment.