diff --git a/.github/workflows/run-tpch.yaml b/.github/workflows/run-tpch.yaml index 9e47119909..1ce4c6de80 100644 --- a/.github/workflows/run-tpch.yaml +++ b/.github/workflows/run-tpch.yaml @@ -105,10 +105,8 @@ jobs: --no_pymodules fi - - uses: lhotari/action-upterm@v1 + ray rsync-down .github/assets/ray.yaml /tmp/ray ray-logs - - run: | - source .venv/bin/activate ray down .github/assets/ray.yaml -y python .github/scripts/csv_to_md.py output.csv output.md echo "# Results" >> $GITHUB_STEP_SUMMARY @@ -117,3 +115,7 @@ jobs: with: name: output.csv path: output.csv + - uses: actions/upload-artifact@v4 + with: + name: ray-logs + path: ray-logs diff --git a/benchmarking/tpch/__main__.py b/benchmarking/tpch/__main__.py index 29f2bb1e75..125712ef92 100644 --- a/benchmarking/tpch/__main__.py +++ b/benchmarking/tpch/__main__.py @@ -204,10 +204,12 @@ def get_daft_benchmark_runner_name() -> Literal["ray"] | Literal["py"] | Literal def get_ray_runtime_env(requirements: str | None, no_pymodules: bool = False) -> dict: + daft_env_variables = dict(filter(lambda key_value: key_value[0].startswith("DAFT"), os.environ.items())) runtime_env = { "py_modules": None if no_pymodules else [daft], "eager_install": True, "env_vars": { + **daft_env_variables, "DAFT_PROGRESS_BAR": "0", "DAFT_RUNNER": "ray", },