Skip to content

Commit

Permalink
[benchmark] Make benchmarks run in Google Artifact Repository
Browse files Browse the repository at this point in the history
Related: hail-is#12963
  • Loading branch information
ehigham committed May 11, 2023
1 parent 3b04c08 commit 3f07cb8
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 8 deletions.
4 changes: 1 addition & 3 deletions benchmark/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,7 @@ RUN wget -O - https://packages.adoptium.net/artifactory/api/gpg/key/public | apt
apt update && \
apt -y install temurin-11-jdk

COPY requirements.txt .
RUN mkdir hailtop
COPY hailtop_requirements.txt hailtop/requirements.txt
COPY requirements.txt requirements.txt
RUN python3 -m pip install --upgrade --no-cache-dir --upgrade pip && \
python3 -m pip install --upgrade --no-cache-dir setuptools && \
python3 -m pip install --upgrade --no-cache-dir -r requirements.txt && \
Expand Down
9 changes: 4 additions & 5 deletions benchmark/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ cleanup_image:
rm -f image_sha
rm -f pushed_image

BENCHMARK_PROJECT ?= hail-vdc
BENCHMARK_DOCKER_TAG ?= benchmark_$(shell whoami)
BENCHMARK_REPO_BASE = us-docker.pkg.dev/$(BENCHMARK_PROJECT)/$(BENCHMARK_DOCKER_TAG)
BENCHMARK_DOCKER_TAG ?= $(shell whoami)
BECNHMARK_IMAGE_REPOSITOY ?= us-docker.pkg.dev/broad-ctsa/hail-benchmarks
BENCHMARK_REPO_BASE = $(BECNHMARK_IMAGE_REPOSITOY)/$(BENCHMARK_DOCKER_TAG)
DOCKER_ROOT_IMAGE := ubuntu:20.04

ifndef HAIL_WHEEL
Expand All @@ -42,8 +42,7 @@ image_sha: wheel cleanup_image
cp $(HAIL_WHEEL) .
cp $(BENCHMARK_WHEEL) .
# it's possible that the HAIL_WHEEL installs different dependencies, but this generally creates less work for docker
cp ../hail/python/requirements.txt .
cp ../hail/python/hailtop/requirements.txt hailtop_requirements.txt
cp ../hail/python/dev/pinned-requirements.txt requirements.txt
python3 ../ci/jinja2_render.py '{"global":{"docker_root_image":"$(DOCKER_ROOT_IMAGE)"}}' Dockerfile Dockerfile.out
docker build --platform linux/amd64 -f Dockerfile.out -t $(BENCHMARK_DOCKER_TAG) . --build-arg HAIL_WHEEL=$(notdir $(HAIL_WHEEL)) --build-arg BENCHMARK_WHEEL=$(notdir $(BENCHMARK_WHEEL))
@printf $$(docker images -q --no-trunc $(BENCHMARK_DOCKER_TAG) | sed -e 's,[^:]*:,,') > image_sha
Expand Down

0 comments on commit 3f07cb8

Please sign in to comment.