Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dockerfile - Add rocm6.0 dockerfile #602

Merged
merged 16 commits into from
Dec 27, 2023
Merged

Dockerfile - Add rocm6.0 dockerfile #602

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
407b12e
add rocm6.0 dockerfile
yukirora Dec 21, 2023
3d00250
add pipeline for rocm6.0
yukirora Dec 21, 2023
55ea25c
bug fix
yukirora Dec 21, 2023
2858d84
update lib version and bugfix
yukirora Dec 22, 2023
dc7a64e
Merge branch 'release/0.10' into yutji/rocm-6.0-dockerfile
yukirora Dec 23, 2023
fabaccb
bugfix
yukirora Dec 25, 2023
f34c441
reivse hipblaslt build
yukirora Dec 25, 2023
b19e774
bugfix
yukirora Dec 25, 2023
28eee19
update
yukirora Dec 25, 2023
0ff39d3
update perftest version
Andyli1007 Dec 25, 2023
692020e
bugfix
yukirora Dec 25, 2023
d5cf4e0
update
yukirora Dec 25, 2023
fd87f1a
update mpi build to replace the original static mpi build in base image
yukirora Dec 25, 2023
6148591
bugfix
Andyli1007 Dec 26, 2023
e6052da
resotre hipblaslt
Dec 27, 2023
1699be0
Merge branch 'release/0.10' into yutji/rocm-6.0-dockerfile
yukirora Dec 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
resotre hipblaslt
  • Loading branch information
yukirora committed Dec 27, 2023
commit e6052dab2b515ee8a7db8c27e6b2eb04e3d870f4
6 changes: 3 additions & 3 deletions dockerfile/rocm5.7.x.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,8 @@ RUN cd /opt/ && \
mkdir build && \
cd build && \
CXX=/opt/rocm/bin/hipcc cmake -DHIP_COMPILER=clang -DCMAKE_BUILD_TYPE=Release -DCMAKE_VERBOSE_MAKEFILE=1 \
-DCMAKE_PREFIX_PATH="${ROCM_PATH}/hsa;${ROCM_PATH}/hip;${ROCM_PATH}/share/rocm/cmake/;${ROCM_PATH}" \
.. && \
-DCMAKE_PREFIX_PATH="${ROCM_PATH}/hsa;${ROCM_PATH}/hip;${ROCM_PATH}/share/rocm/cmake/;${ROCM_PATH}" \
.. && \
make -j${NUM_MAKE_JOBS}

# Install AMD SMI Python Library
Expand Down Expand Up @@ -166,7 +166,7 @@ ADD third_party third_party
# Apply patch
RUN cd third_party/perftest && \
git apply ../perftest_rocm6.patch
RUN make ROCM_PATH=/opt/rocm-5.7.0 RCCL_HOME=/opt/rccl/build/ ROCBLAS_BRANCH=release/rocm-rel-5.7.1.1 HIPBLASLT_BRANCH=release/rocm-rel-5.7 ROCM_VER=rocm-5.5.0 -C third_party rocm -o cpu_hpl -o cpu_stream -o megatron_lm
RUN make RCCL_HOME=/opt/rccl/build/ ROCBLAS_BRANCH=release/rocm-rel-5.7.1.1 HIPBLASLT_BRANCH=release/rocm-rel-5.7 ROCM_VER=rocm-5.5.0 -C third_party rocm -o cpu_hpl -o cpu_stream -o megatron_lm

ADD . .
#ENV USE_HIPBLASLT_DATATYPE=1
Expand Down
10 changes: 5 additions & 5 deletions dockerfile/rocm6.0.x.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,8 @@ RUN cd /opt/ && \
mkdir build && \
cd build && \
CXX=/opt/rocm/bin/hipcc cmake -DHIP_COMPILER=clang -DCMAKE_BUILD_TYPE=Release -DCMAKE_VERBOSE_MAKEFILE=1 \
-DCMAKE_PREFIX_PATH="${ROCM_PATH}/hsa;${ROCM_PATH}/hip;${ROCM_PATH}/share/rocm/cmake/;${ROCM_PATH}" \
.. && \
-DCMAKE_PREFIX_PATH="${ROCM_PATH}/hsa;${ROCM_PATH}/hip;${ROCM_PATH}/share/rocm/cmake/;${ROCM_PATH}" \
.. && \
make -j${NUM_MAKE_JOBS}

ENV PATH="/opt/superbench/bin:/usr/local/bin/:/opt/rocm/hip/bin/:/opt/rocm/bin/:${PATH}" \
Expand All @@ -168,13 +168,13 @@ ADD third_party third_party
# Apply patch
RUN cd third_party/perftest && \
git apply ../perftest_rocm6.patch
RUN make ROCM_PATH=/opt/rocm-6.0.0 RCCL_HOME=/opt/rccl/build/ ROCBLAS_BRANCH=release/rocm-rel-6.0 HIPBLASLT_BRANCH=develop ROCM_VER=rocm-5.5.0 -C third_party rocm -o cpu_hpl -o cpu_stream -o megatron_lm -o megatron_deepspeed
RUN make RCCL_HOME=/opt/rccl/build/ ROCBLAS_BRANCH=release/rocm-rel-6.0 HIPBLASLT_BRANCH=release/rocm-rel-6.0 ROCM_VER=rocm-5.5.0 -C third_party rocm -o cpu_hpl -o cpu_stream -o megatron_lm
RUN cd third_party/Megatron/Megatron-DeepSpeed && \
git apply ../megatron_deepspeed_rocm6.patch
RUN make -C third_party megatron_deepspeed

ADD . .
ENV USE_HIPBLASLT_DATATYPE=1
ENV USE_HIP_DATATYPE=1
ENV USE_HIPBLAS_COMPUTETYPE=1
RUN python3 -m pip install .[amdworker] && \
CXX=/opt/rocm/bin/hipcc make cppbuild && \
make postinstall
6 changes: 0 additions & 6 deletions third_party/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,12 +115,6 @@ rocm_rocblas: sb_micro_path
rocm_hipblaslt: sb_micro_path
@if [ ! -e $(SB_MICRO_PATH)/bin/hipblaslt-bench ] && [ -z `which hipblaslt-bench` ]; then \
if [ -d hipBLASLt ]; then rm -rf hipBLASLt; fi; \
if [ "$$(expr $(ROCM_VER) \>= 6.0)" -eq 1 ]; then \
rm -rf ${ROCM_PATH}/lib/hipblaslt; \
rm -rf ${ROCM_PATH}/lib/cmake/hipblaslt; \
rm -rf ${ROCM_PATH}/include/hipblaslt; \
rm -rf ${ROCM_PATH}/share/doc/hipblaslt; \
fi; \
git clone -b ${HIPBLASLT_BRANCH} https://github.com/ROCmSoftwarePlatform/hipBLASLt.git ./hipBLASLt; \
cd ./hipBLASLt && ./install.sh -dc; \
cp -v $(SB_MICRO_PATH)/third_party/hipBLASLt/build/release/clients/staging/hipblaslt-bench $(SB_MICRO_PATH)/bin/; \
Expand Down
Loading