updating docker orchestrator with working code

Author: atharvas

docker/Dockerfile

@@ -1,20 +1,17 @@
-# 1) Start from Ubuntu 22.04 with full build tools
 FROM buildpack-deps:jammy
 
-# 2) Install micromamba (standalone binary)
+ARG REPO_URL
+
 RUN curl -Ls "https://micromamba.snakepit.net/api/micromamba/linux-64/latest" \
       | tar -xvj -C /usr/local/bin --strip-components=1 bin/micromamba
 
-# 3) Configure micromamba
 ENV MAMBA_ROOT_PREFIX=/opt/conda \
     PATH=/opt/conda/bin:$PATH \
     MAMBA_DOCKERFILE_ACTIVATE=1 \
-    # Force single‑threaded math inside every container
     OPENBLAS_NUM_THREADS=1 \
     MKL_NUM_THREADS=1 \
     OMP_NUM_THREADS=1
 
-# 4) Bootstrap Python/ASV/pyperf stack
 RUN micromamba install -y -p $MAMBA_ROOT_PREFIX -c conda-forge \
        python=3.10 \
        git \
@@ -25,14 +22,13 @@ RUN micromamba install -y -p $MAMBA_ROOT_PREFIX -c conda-forge \
        conda \
     && micromamba clean --all --yes
 
-# 5) Create workspace/output
 RUN mkdir /workspace /output
-
 WORKDIR /workspace
 
-# 6) Copy and make executable the entrypoint
 COPY entrypoint.sh /entrypoint.sh
 COPY run_asv.py    /run_asv.py
 RUN chmod +x /entrypoint.sh
 
+RUN git clone ${REPO_URL} /workspace/repo
+WORKDIR /workspace/repo
 ENTRYPOINT ["/entrypoint.sh"]

docker/entrypoint.sh

@@ -1,13 +1,9 @@
 #!/usr/bin/env bash
-set -euo pipefail
+# set -euo pipefail
 
-: "${REPO_URL:?Need to set REPO_URL}"
 : "${COMMIT_SHA:?Need to set COMMIT_SHA}"
+: "${ASV_ARGS:?Need to set ASV_ARGS}"
 : "${ASV_CONF_PATH:?Need to set ASV_CONF_PATH}"
-: "${BENCH:-}"
-
-# Optional: which physical core was this container pinned to?
-: "${CPU_CORE:-}"
 
 # 0) Hook in micromamba and activate `base`
 eval "$(micromamba shell hook --shell=bash)"
@@ -16,15 +12,35 @@ micromamba activate base
 # 0.5) Tune the container so all CPUs stay at fixed frequency.
 # This requires root; Docker runs as root by default.
 # python -m pyperf system tune || true
-
-# 1) Clone & checkout the desired commit
-git clone "$REPO_URL" repo
-cd repo
-# git checkout "$COMMIT_SHA"  # Uncomment if detached commits are required
+git checkout --quiet "${COMMIT_SHA}"
 
 # 2) cd into the folder containing the asv.conf.json
 cd "$(dirname "$ASV_CONF_PATH")"
 
+# asv run "$COMMIT_SHA^!" \
+#   --show-stderr \
+#   ${BENCH_REGEX:+--bench "$BENCH_REGEX"} \
+#   ${INTERLEAVE_ROUNDS:+--interleave-rounds} \
+#   ${APPEND_SAMPLES:+--append-samples --record-samples} \
+#   -a rounds=$ROUNDS \
+#   -a number=$NUMBER \
+#   -a repeat=$REPEAT \
+#   ${CPU_CORE:+-a cpu_affinity=[$CPU_CORE]} \
+#   | tee "$OUTPUT_DIR/benchmark_${COMMIT_SHA}.log"
+
+# change the "results_dir" in asv.conf.json to "/output/{COMMIT_SHA}/"
+# using python
+python -c "import asv, os, pathlib
+path = pathlib.Path('/output/'\"$COMMIT_SHA\"'/')
+path.mkdir(parents=True, exist_ok=True)
+
+config = asv.config.Config.load('asv.conf.json')
+config.results_dir = str(path / 'results')
+config.html_dir = str(path / 'html')
+
+asv.util.write_json('asv.conf.json', config.__dict__, api_version=1)
+"
+
 # Read the python versions from the asv.conf.json (without jq)
 python_versions=$(python -c "import asv; pythons = asv.config.Config.load('asv.conf.json').pythons; print(' '.join(pythons))")
 for version in $python_versions; do
@@ -36,15 +52,8 @@ for version in $python_versions; do
        mamba \
        conda
     micromamba run -n "asv_${version}" pip install asv
-
-    # Build common flag list
-    mkdir -p "/output/${COMMIT_SHA}/${version}"
-    extra=( --commit-sha "$COMMIT_SHA" --output-dir "/output/${COMMIT_SHA}/${version}" )
-    [[ -n "${BENCH:-}" ]] && extra+=( --bench "$BENCH" )
-    [[ -n "${CPU_CORE:-}" ]] && extra+=( --cpu-affinity "$CPU_CORE" )
-
-    # Always request interleaved rounds & sample appending (tuning done in script)
-    micromamba run -n "asv_${version}" python /run_asv.py "${extra[@]}"
+    micromamba run asv machine --yes
+    micromamba run asv run --show-stderr "$COMMIT_SHA^!" ${ASV_ARGS}
 done
 
-echo "Benchmarks complete. Logs → /output/benchmark_${COMMIT_SHA}.log"
+echo "Benchmarks complete."