Update args

Update args.
microsoft · Jun 15, 2022 · 99b40b6 · 99b40b6
1 parent 39f5898
commit 99b40b6
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 7 deletions.
diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml
@@ -42,13 +42,11 @@ jobs:
           tags: superbench/main:rocm5.0.1-pytorch1.9.0
           extra_args: >-
             BASE_IMAGE=rocm/pytorch:rocm5.0.1_ubuntu18.04_py3.7_pytorch_1.9.0
-            ROCM_VERSION=5.0.1
         - name: rocm5.0
           dockerfile: rocm5.0.x
           tags: superbench/main:rocm5.0-pytorch1.9.0
           extra_args: >-
             BASE_IMAGE=rocm/pytorch:rocm5.0_ubuntu18.04_py3.7_pytorch_1.9.0
-            ROCM_VERSION=5.0.0
     steps:
       - name: Checkout
         uses: actions/checkout@v2

diff --git a/dockerfile/rocm5.0.x.dockerfile b/dockerfile/rocm5.0.x.dockerfile
@@ -1,5 +1,4 @@
 ARG BASE_IMAGE=rocm/pytorch:rocm5.0.1_ubuntu18.04_py3.7_pytorch_1.9.0
-ARG ROCM_VERSION=5.0.1
 FROM ${BASE_IMAGE}
 
 # 5.1.x base images:
@@ -117,7 +116,7 @@ ENV PATH="${PATH}:/opt/rocm/hip/bin/" \
 WORKDIR ${SB_HOME}
 
 ADD third_party third_party
-RUN ROCM_VERSION=rocm-${ROCM_VERSION} make -C third_party rocm
+RUN make -C third_party rocm
 
 ADD . .
 RUN python3 -m pip install .[torch,ort]  && \

diff --git a/dockerfile/rocm5.1.x.dockerfile b/dockerfile/rocm5.1.x.dockerfile
@@ -132,7 +132,7 @@ ENV PATH="${PATH}:/opt/rocm/hip/bin/" \
 WORKDIR ${SB_HOME}
 
 ADD third_party third_party
-RUN ROCM_VERSION=release/rocm-rel-5.1 make -C third_party rocm
+RUN make ROCBLAS_BRANCH=release/rocm-rel-5.1 -C third_party rocm
 
 ADD . .
 RUN python3 -m pip install .[torch,ort]  && \

diff --git a/third_party/Makefile b/third_party/Makefile
@@ -6,7 +6,7 @@ SB_MICRO_PATH ?= /usr/local
 MPI_HOME ?= /usr/local/mpi
 HIP_HOME ?= /opt/rocm/hip
 RCCL_HOME ?= /opt/rocm/rccl
-ROCM_VERSION ?= rocm-$(shell dpkg -l | grep 'rocm-dev ' | awk '{print $$3}' | cut -d '.' -f1-3)
+ROCBLAS_BRANCH ?= rocm-$(shell dpkg -l | grep 'rocm-dev ' | awk '{print $$3}' | cut -d '.' -f1-3)
 HPCX_HOME ?= /opt/hpcx
 
 .PHONY: all cuda rocm common cuda_cutlass cuda_bandwidthTest cuda_nccl_tests cuda_perftest rocm_perftest fio rocm_rccl_tests rocm_rocblas rocm_bandwidthTest gpcnet cuda_gpuburn
@@ -79,7 +79,7 @@ endif
 rocm_rocblas: sb_micro_path
 ifeq (, $(wildcard $(SB_MICRO_PATH)/bin/rocblas-bench))
 	if [ -d rocBLAS ]; then rm -rf rocBLAS; fi
-	git clone -b ${ROCM_VERSION} https://github.com/ROCmSoftwarePlatform/rocBLAS.git ./rocBLAS
+	git clone -b ${ROCBLAS_BRANCH} https://github.com/ROCmSoftwarePlatform/rocBLAS.git ./rocBLAS
 	cd ./rocBLAS && ./install.sh --dependencies --clients-only
 	cp -v ./rocBLAS/build/release/clients/staging/rocblas-bench $(SB_MICRO_PATH)/bin/
 endif