Skip to content

Commit e6ddf6f

Browse files
authored
Ci/change image to speedup ci (#1076)
1 parent fdf0451 commit e6ddf6f

3 files changed

Lines changed: 21 additions & 12 deletions

File tree

.github/dashboard/ingest/parse_bench.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,11 @@
3838
DEFAULT_REGRESSION_PCT = -3.0
3939

4040
# Stable runner -> GPU arch map (the only durable identity of each CI box).
41-
# The MI35x validation runners are intentionally omitted from dashboard ingestion.
4241
RUNNER_ARCH = {
4342
"linux-flydsl-mi355-1": "gfx950", # MI355 / MI350X
4443
"linux-flydsl-mi355-8": "gfx950",
44+
"linux-flydsl-mi35x-1": "gfx950", # MI350
45+
"linux-flydsl-mi35x-8": "gfx950",
4546
"linux-flydsl-mi325-1": "gfx942", # MI325
4647
"linux-flydsl-mi325-8": "gfx942",
4748
"linux-flydsl-navi-2": "gfx1201", # Navi4x (RDNA)

.github/dashboard/ingest/test_ingest.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,8 @@ def test_merge_history_sorted_by_ts_then_runner_op_shape():
189189
# --------------------------------------------------------------------------- #
190190
def test_runner_of_matches_known_box_and_rejects_unknown():
191191
assert ingest.runner_of("test (linux-flydsl-mi355-1)") == "linux-flydsl-mi355-1"
192-
assert ingest.runner_of("test (linux-flydsl-mi35x-1)") is None # MI35x test results stay out of the dashboard
192+
assert ingest.runner_of("test (linux-flydsl-mi35x-1)") == "linux-flydsl-mi35x-1"
193+
assert ingest.runner_of("test (linux-flydsl-mi35x-8)") == "linux-flydsl-mi35x-8"
193194
assert ingest.runner_of("test (linux-flydsl-unknown-9)") is None # not in RUNNER_ARCH
194195
assert ingest.runner_of("build") is None
195196
assert ingest.runner_of("") is None

.github/workflows/flydsl.yaml

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ concurrency:
2020
cancel-in-progress: true
2121

2222
env:
23-
DOCKER_IMAGE: "rocm/pytorch:rocm7.14_ubuntu24.04_py3.12_pytorch_release_2.12.0@sha256:c38eeda81d85f00fbe35d3d50ce42ce59c524e87d810624f4eb5c52fddb3b9ad"
23+
DOCKER_IMAGE: "rocm/pytorch:rocm7.2.4_ubuntu24.04_py3.12_pytorch_release_2.10.0"
2424
LLVM_BUILD_PROFILE: "amd-minimal"
2525
# Bump when the container or LLVM build environment changes incompatibly.
26-
MLIR_CACHE_VERSION: "rocm7.14-ubuntu24.04-py3.12-v1"
26+
MLIR_CACHE_VERSION: "rocm7.2.4-ubuntu24.04-py3.12-v1"
2727
GITHUB_REPO_NAME: ${{ github.event.pull_request.head.repo.full_name || github.repository }}
2828
GITHUB_COMMIT_SHA: ${{ github.event.pull_request.head.sha || github.event.head_commit.id || github.sha }}
2929
# PRs compare against their exact base; main pushes compare against the previous commit.
@@ -295,9 +295,9 @@ jobs:
295295
docker exec flydsl_mlir_cache bash -c "apt-get update && apt-get install -y cmake build-essential patchelf"
296296
docker exec flydsl_mlir_cache bash -c "python3 -m pip install -U pip setuptools wheel"
297297
docker exec flydsl_mlir_cache bash -c "python3 -m pip install ninja>=1.11.1"
298-
docker exec flydsl_mlir_cache bash -c "python3 -m pip install --index-url https://repo.amd.com/rocm/whl-multi-arch/ 'rocm[devel]==7.14.0' && rocm-sdk init"
298+
docker exec flydsl_mlir_cache bash -c "if command -v rocm-sdk >/dev/null 2>&1; then rocm-sdk init; fi"
299299
docker exec flydsl_mlir_cache bash -c "git config --global --add safe.directory /flydsl-test"
300-
sdk_root="$(docker exec flydsl_mlir_cache rocm-sdk path --root)"
300+
sdk_root="$(docker exec flydsl_mlir_cache bash -c 'if command -v rocm-sdk >/dev/null 2>&1; then rocm-sdk path --root; elif [ -d /opt/rocm ]; then printf "/opt/rocm\n"; fi')"
301301
test -n "${sdk_root}"
302302
docker exec flydsl_mlir_cache test -d "${sdk_root}"
303303
printf 'ROCM_PATH=%s\n' "${sdk_root}" >>"${GITHUB_ENV}"
@@ -378,8 +378,15 @@ jobs:
378378
-e BASE_MLIR_PATH \
379379
flydsl_mlir_cache bash -c '
380380
export MLIR_PATH=/llvm-project/mlir_install
381-
export PATH="$(rocm-sdk path --bin):$PATH"
382-
export CMAKE_PREFIX_PATH="$(rocm-sdk path --cmake)${CMAKE_PREFIX_PATH:+:$CMAKE_PREFIX_PATH}"
381+
if command -v rocm-sdk >/dev/null 2>&1; then
382+
rocm_bin="$(rocm-sdk path --bin)"
383+
rocm_cmake="$(rocm-sdk path --cmake)"
384+
else
385+
rocm_bin="${ROCM_PATH}/bin"
386+
rocm_cmake="${ROCM_PATH}/lib/cmake"
387+
fi
388+
export PATH="${rocm_bin}:$PATH"
389+
export CMAKE_PREFIX_PATH="${rocm_cmake}${CMAKE_PREFIX_PATH:+:$CMAKE_PREFIX_PATH}"
383390
cd /flydsl-test
384391
bash scripts/build_ci_wheels.sh
385392
'
@@ -547,10 +554,10 @@ jobs:
547554
docker exec flydsl_test bash -c "apt-get update && apt-get install -y cmake build-essential patchelf"
548555
docker exec flydsl_test bash -c "python3 -m pip install -U pip setuptools wheel"
549556
docker exec flydsl_test bash -c "python3 -m pip install ninja>=1.11.1"
550-
docker exec flydsl_test bash -c "python3 -m pip install --index-url https://repo.amd.com/rocm/whl-multi-arch/ 'rocm[devel]==7.14.0' && rocm-sdk init"
557+
docker exec flydsl_test bash -c "if command -v rocm-sdk >/dev/null 2>&1; then rocm-sdk init; fi"
551558
docker exec flydsl_test bash -c "python3 -m pip install -U 'hypothesis>=6.82.0'"
552559
docker exec flydsl_test bash -c "git config --global --add safe.directory /flydsl-test && cd /flydsl-test && git log"
553-
sdk_root="$(docker exec flydsl_test rocm-sdk path --root)"
560+
sdk_root="$(docker exec flydsl_test bash -c 'if command -v rocm-sdk >/dev/null 2>&1; then rocm-sdk path --root; elif [ -d /opt/rocm ]; then printf "/opt/rocm\n"; fi')"
554561
test -n "${sdk_root}"
555562
docker exec flydsl_test test -d "${sdk_root}"
556563
printf 'ROCM_PATH=%s\n' "${sdk_root}" >>"${GITHUB_ENV}"
@@ -864,10 +871,10 @@ jobs:
864871
docker exec flydsl_test bash -c "apt-get update && apt-get install -y cmake build-essential patchelf"
865872
docker exec flydsl_test bash -c "python3 -m pip install -U pip setuptools wheel"
866873
docker exec flydsl_test bash -c "python3 -m pip install ninja>=1.11.1"
867-
docker exec flydsl_test bash -c "python3 -m pip install --index-url https://repo.amd.com/rocm/whl-multi-arch/ 'rocm[devel]==7.14.0' && rocm-sdk init"
874+
docker exec flydsl_test bash -c "if command -v rocm-sdk >/dev/null 2>&1; then rocm-sdk init; fi"
868875
docker exec flydsl_test bash -c "python3 -m pip install -U 'hypothesis>=6.82.0'"
869876
docker exec flydsl_test bash -c "git config --global --add safe.directory /flydsl-test && cd /flydsl-test && git log"
870-
sdk_root="$(docker exec flydsl_test rocm-sdk path --root)"
877+
sdk_root="$(docker exec flydsl_test bash -c 'if command -v rocm-sdk >/dev/null 2>&1; then rocm-sdk path --root; elif [ -d /opt/rocm ]; then printf "/opt/rocm\n"; fi')"
871878
test -n "${sdk_root}"
872879
docker exec flydsl_test test -d "${sdk_root}"
873880
printf 'ROCM_PATH=%s\n' "${sdk_root}" >>"${GITHUB_ENV}"

0 commit comments

Comments
 (0)