From ae3c179294e095390cebe2f10d843a3e238d5de3 Mon Sep 17 00:00:00 2001 From: Umut Date: Wed, 15 Sep 2021 12:41:20 +0300 Subject: [PATCH] chore: disable attaching tty to docker during benchmarks --- Makefile | 6 ++---- .../benchmark_and_publish_findings_in_docker.sh | 8 ++++++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 62e3704e4..5020e01f1 100644 --- a/Makefile +++ b/Makefile @@ -135,10 +135,8 @@ docker_publish_measurements: docker_build git pull mkdir -p .benchmarks python script/progress_tracker_utils/extract_machine_info.py - docker run --rm -it \ - --volume /"$$(pwd)":/src \ - $(DEV_DOCKER_IMG) \ - /bin/bash -i ./script/progress_tracker_utils/benchmark_and_publish_findings_in_docker.sh + docker run --rm --volume /"$$(pwd)":/src $(DEV_DOCKER_IMG) \ + /bin/bash ./script/progress_tracker_utils/benchmark_and_publish_findings_in_docker.sh .PHONY: docker_publish_measurements docs: clean_docs diff --git a/script/progress_tracker_utils/benchmark_and_publish_findings_in_docker.sh b/script/progress_tracker_utils/benchmark_and_publish_findings_in_docker.sh index a2b287f0f..115d7f858 100755 --- a/script/progress_tracker_utils/benchmark_and_publish_findings_in_docker.sh +++ b/script/progress_tracker_utils/benchmark_and_publish_findings_in_docker.sh @@ -3,6 +3,14 @@ # Run benchmarks while logging the intermediate results # Publish findings in the progress tracker +source /src/.docker_venv/bin/activate +if [[ "$?" != "0" ]]; then + python3 -m venv /src/.docker_venv + source /src/.docker_venv/bin/activate + cd /src/ && make setup_env +fi +export LD_PRELOAD=/compiler/build/lib/Runtime/libZamalangRuntime.so + initial_log=logs/$(date -u --iso-8601=seconds).log mkdir -p logs