diff --git a/.ci/magma-rocm/Makefile b/.ci/magma-rocm/Makefile index 5f63da87bc4d..da231b20ffa4 100644 --- a/.ci/magma-rocm/Makefile +++ b/.ci/magma-rocm/Makefile @@ -1,11 +1,11 @@ SHELL=/usr/bin/env bash DOCKER_CMD ?= docker -DESIRED_ROCM ?= 6.4 +DESIRED_ROCM ?= 7.0 DESIRED_ROCM_SHORT = $(subst .,,$(DESIRED_ROCM)) PACKAGE_NAME = magma-rocm # inherit this from underlying docker image, do not pass this env var to docker -#PYTORCH_ROCM_ARCH ?= gfx900;gfx906;gfx908;gfx90a;gfx942;gfx1030;gfx1100;gfx1101;gfx1102;gfx1200;gfx1201 +#PYTORCH_ROCM_ARCH ?= gfx900;gfx906;gfx908;gfx90a;gfx942;gfx950;gfx1030;gfx1100;gfx1101;gfx1102;gfx1200;gfx1201 DOCKER_RUN = set -eou pipefail; ${DOCKER_CMD} run --rm -i \ -v $(shell git rev-parse --show-toplevel)/.ci:/builder \ @@ -16,6 +16,7 @@ DOCKER_RUN = set -eou pipefail; ${DOCKER_CMD} run --rm -i \ magma-rocm/build_magma.sh .PHONY: all +all: magma-rocm70 all: magma-rocm64 all: magma-rocm63 @@ -24,6 +25,11 @@ clean: $(RM) -r magma-* $(RM) -r output +.PHONY: magma-rocm70 +magma-rocm70: DESIRED_ROCM := 7.0 +magma-rocm70: + $(DOCKER_RUN) + .PHONY: magma-rocm64 magma-rocm64: DESIRED_ROCM := 6.4 magma-rocm64: diff --git a/.ci/magma-rocm/build_magma.sh b/.ci/magma-rocm/build_magma.sh index 4acb3fb0dc3b..c7c7780227ea 100755 --- a/.ci/magma-rocm/build_magma.sh +++ b/.ci/magma-rocm/build_magma.sh @@ -6,8 +6,8 @@ set -eou pipefail # The script expects DESIRED_CUDA and PACKAGE_NAME to be set ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)" -# Version 2.7.2 + ROCm related updates -MAGMA_VERSION=a1625ff4d9bc362906bd01f805dbbe12612953f6 +# https://github.com/icl-utk-edu/magma/pull/65 +MAGMA_VERSION=d6e4117bc88e73f06d26c6c2e14f064e8fc3d1ec # Folders for the build PACKAGE_FILES=${ROOT_DIR}/magma-rocm/package_files # metadata @@ -20,7 +20,7 @@ mkdir -p ${PACKAGE_DIR} ${PACKAGE_OUTPUT}/linux-64 ${PACKAGE_BUILD} ${PACKAGE_RE # Fetch magma sources and verify checksum pushd ${PACKAGE_DIR} -git clone https://bitbucket.org/icl/magma.git +git clone https://github.com/jeffdaily/magma pushd magma git checkout ${MAGMA_VERSION} popd diff --git a/.github/workflows/build-magma-rocm-linux.yml b/.github/workflows/build-magma-rocm-linux.yml index b6eb09188fd4..3022a9387a6d 100644 --- a/.github/workflows/build-magma-rocm-linux.yml +++ b/.github/workflows/build-magma-rocm-linux.yml @@ -34,7 +34,7 @@ jobs: id-token: write strategy: matrix: - rocm_version: ["64", "63"] + rocm_version: ["70", "64", "63"] steps: - name: Checkout PyTorch uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2