Unverified Commit 60a3c743 authored by Yifan Xiong's avatar Yifan Xiong Committed by GitHub
Browse files

Fix cmake and build issues (#360)

**Description**

Fix cmake and build issues.

**Major Revision**

* Remove unnecessary boost build
* Remove user-agent for mlc
* Remove -j for third party to build each project in sequence
* Fix ansible collections installation path
parent a4937e95
...@@ -103,23 +103,22 @@ RUN cd /tmp && \ ...@@ -103,23 +103,22 @@ RUN cd /tmp && \
# Install Intel MLC # Install Intel MLC
RUN cd /tmp && \ RUN cd /tmp && \
mkdir -p mlc && \ curl https://www.intel.com/content/dam/develop/external/us/en/documents/mlc_v3.9a.tgz -o mlc.tgz && \
cd mlc && \ tar xzvf mlc.tgz Linux/mlc && \
wget --user-agent="Mozilla/5.0 (X11; Fedora; Linux x86_64; rv:52.0) Gecko/20100101 Firefox/52.0" https://www.intel.com/content/dam/develop/external/us/en/documents/mlc_v3.9a.tgz && \
tar xvf mlc_v3.9a.tgz && \
cp ./Linux/mlc /usr/local/bin/ && \ cp ./Linux/mlc /usr/local/bin/ && \
cd /tmp && \ rm -rf ./Linux mlc.tgz
rm -rf mlc
ENV PATH="${PATH}" \ ENV PATH="${PATH}" \
LD_LIBRARY_PATH="/usr/local/lib:${LD_LIBRARY_PATH}" \ LD_LIBRARY_PATH="/usr/local/lib:${LD_LIBRARY_PATH}" \
SB_HOME="/opt/superbench" \ SB_HOME=/opt/superbench \
SB_MICRO_PATH="/opt/superbench" SB_MICRO_PATH=/opt/superbench \
ANSIBLE_DEPRECATION_WARNINGS=FALSE \
ANSIBLE_COLLECTIONS_PATH=/usr/share/ansible/collections
WORKDIR ${SB_HOME} WORKDIR ${SB_HOME}
ADD third_party third_party ADD third_party third_party
RUN make -j ${NUM_MAKE_JOBS} -C third_party cuda RUN make -C third_party cuda
ADD . . ADD . .
RUN python3 -m pip install .[nvidia,torch,ort] && \ RUN python3 -m pip install .[nvidia,torch,ort] && \
......
...@@ -28,6 +28,7 @@ RUN wget -qO - http://repo.radeon.com/rocm/rocm.gpg.key | APT_KEY_DONT_WARN_ON_D ...@@ -28,6 +28,7 @@ RUN wget -qO - http://repo.radeon.com/rocm/rocm.gpg.key | APT_KEY_DONT_WARN_ON_D
git \ git \
jq \ jq \
libaio-dev \ libaio-dev \
libboost-program-options-dev \
libcap2 \ libcap2 \
libnuma-dev \ libnuma-dev \
libpci-dev \ libpci-dev \
...@@ -92,23 +93,22 @@ RUN cd /opt && \ ...@@ -92,23 +93,22 @@ RUN cd /opt && \
# Install Intel MLC # Install Intel MLC
RUN cd /tmp && \ RUN cd /tmp && \
mkdir -p mlc && \ curl https://www.intel.com/content/dam/develop/external/us/en/documents/mlc_v3.9a.tgz -o mlc.tgz && \
cd mlc && \ tar xzvf mlc.tgz Linux/mlc && \
wget --user-agent="Mozilla/5.0 (X11; Fedora; Linux x86_64; rv:52.0) Gecko/20100101 Firefox/52.0" https://www.intel.com/content/dam/develop/external/us/en/documents/mlc_v3.9a.tgz && \
tar xvf mlc_v3.9a.tgz && \
cp ./Linux/mlc /usr/local/bin/ && \ cp ./Linux/mlc /usr/local/bin/ && \
cd /tmp && \ rm -rf ./Linux mlc.tgz
rm -rf mlc
ENV PATH="${PATH}" \ ENV PATH="${PATH}" \
LD_LIBRARY_PATH="/usr/local/lib:${LD_LIBRARY_PATH}" \ LD_LIBRARY_PATH="/usr/local/lib:${LD_LIBRARY_PATH}" \
SB_HOME="/opt/superbench" \ SB_HOME=/opt/superbench \
SB_MICRO_PATH="/opt/superbench" SB_MICRO_PATH=/opt/superbench \
ANSIBLE_DEPRECATION_WARNINGS=FALSE \
ANSIBLE_COLLECTIONS_PATH=/usr/share/ansible/collections
WORKDIR ${SB_HOME} WORKDIR ${SB_HOME}
ADD third_party third_party ADD third_party third_party
RUN ROCM_VERSION=rocm-4.0.0 make -j -C third_party -o rocm_rocblas rocm RUN ROCM_VERSION=rocm-4.0.0 make -C third_party -o rocm_rocblas rocm
# Workaround for image having package installed in user path # Workaround for image having package installed in user path
RUN mv /root/.local/bin/* /opt/conda/bin/ && \ RUN mv /root/.local/bin/* /opt/conda/bin/ && \
......
...@@ -28,6 +28,7 @@ RUN wget -qO - http://repo.radeon.com/rocm/rocm.gpg.key | APT_KEY_DONT_WARN_ON_D ...@@ -28,6 +28,7 @@ RUN wget -qO - http://repo.radeon.com/rocm/rocm.gpg.key | APT_KEY_DONT_WARN_ON_D
git \ git \
jq \ jq \
libaio-dev \ libaio-dev \
libboost-program-options-dev \
libcap2 \ libcap2 \
libnuma-dev \ libnuma-dev \
libpci-dev \ libpci-dev \
...@@ -92,23 +93,22 @@ RUN cd /opt && \ ...@@ -92,23 +93,22 @@ RUN cd /opt && \
# Install Intel MLC # Install Intel MLC
RUN cd /tmp && \ RUN cd /tmp && \
mkdir -p mlc && \ curl https://www.intel.com/content/dam/develop/external/us/en/documents/mlc_v3.9a.tgz -o mlc.tgz && \
cd mlc && \ tar xzvf mlc.tgz Linux/mlc && \
wget --user-agent="Mozilla/5.0 (X11; Fedora; Linux x86_64; rv:52.0) Gecko/20100101 Firefox/52.0" https://www.intel.com/content/dam/develop/external/us/en/documents/mlc_v3.9a.tgz && \
tar xvf mlc_v3.9a.tgz && \
cp ./Linux/mlc /usr/local/bin/ && \ cp ./Linux/mlc /usr/local/bin/ && \
cd /tmp && \ rm -rf ./Linux mlc.tgz
rm -rf mlc
ENV PATH="${PATH}" \ ENV PATH="${PATH}" \
LD_LIBRARY_PATH="/usr/local/lib:${LD_LIBRARY_PATH}" \ LD_LIBRARY_PATH="/usr/local/lib:${LD_LIBRARY_PATH}" \
SB_HOME="/opt/superbench" \ SB_HOME=/opt/superbench \
SB_MICRO_PATH="/opt/superbench" SB_MICRO_PATH=/opt/superbench \
ANSIBLE_DEPRECATION_WARNINGS=FALSE \
ANSIBLE_COLLECTIONS_PATH=/usr/share/ansible/collections
WORKDIR ${SB_HOME} WORKDIR ${SB_HOME}
ADD third_party third_party ADD third_party third_party
RUN ROCM_VERSION=rocm-4.2.0 make -j -C third_party rocm RUN ROCM_VERSION=rocm-4.2.0 make -C third_party rocm
ADD . . ADD . .
RUN python3 -m pip install .[torch,ort] && \ RUN python3 -m pip install .[torch,ort] && \
......
...@@ -28,6 +28,7 @@ RUN apt-get update && \ ...@@ -28,6 +28,7 @@ RUN apt-get update && \
hipify-clang \ hipify-clang \
jq \ jq \
libaio-dev \ libaio-dev \
libboost-program-options-dev \
libcap2 \ libcap2 \
libpci-dev \ libpci-dev \
libtinfo5 \ libtinfo5 \
...@@ -88,13 +89,10 @@ RUN cd /tmp && \ ...@@ -88,13 +89,10 @@ RUN cd /tmp && \
# Install Intel MLC # Install Intel MLC
RUN cd /tmp && \ RUN cd /tmp && \
mkdir -p mlc && \ curl https://www.intel.com/content/dam/develop/external/us/en/documents/mlc_v3.9a.tgz -o mlc.tgz && \
cd mlc && \ tar xzvf mlc.tgz Linux/mlc && \
curl https://www.intel.com/content/dam/develop/external/us/en/documents/mlc_v3.9a.tgz -o mlc_v3.9a.tgz && \
tar xvf mlc_v3.9a.tgz && \
cp ./Linux/mlc /usr/local/bin/ && \ cp ./Linux/mlc /usr/local/bin/ && \
cd /tmp && \ rm -rf ./Linux mlc.tgz
rm -rf mlc
# Install rccl-rdma-sharp-plugins # Install rccl-rdma-sharp-plugins
ENV SHARP_VERSION=5.0 ENV SHARP_VERSION=5.0
...@@ -105,13 +103,15 @@ RUN cd /opt/rocm && \ ...@@ -105,13 +103,15 @@ RUN cd /opt/rocm && \
ENV PATH="${PATH}:/opt/rocm/hip/bin/" \ ENV PATH="${PATH}:/opt/rocm/hip/bin/" \
LD_LIBRARY_PATH="/usr/local/lib/:${LD_LIBRARY_PATH}" \ LD_LIBRARY_PATH="/usr/local/lib/:${LD_LIBRARY_PATH}" \
SB_HOME="/opt/superbench" \ SB_HOME=/opt/superbench \
SB_MICRO_PATH="/opt/superbench" SB_MICRO_PATH=/opt/superbench \
ANSIBLE_DEPRECATION_WARNINGS=FALSE \
ANSIBLE_COLLECTIONS_PATH=/usr/share/ansible/collections
WORKDIR ${SB_HOME} WORKDIR ${SB_HOME}
ADD third_party third_party ADD third_party third_party
RUN ROCM_VERSION=rocm-5.0.0 make -j ${NUM_MAKE_JOBS} -C third_party rocm RUN ROCM_VERSION=rocm-5.0.0 make -C third_party rocm
ADD . . ADD . .
RUN python3 -m pip install .[torch,ort] && \ RUN python3 -m pip install .[torch,ort] && \
......
...@@ -28,6 +28,7 @@ RUN apt-get update && \ ...@@ -28,6 +28,7 @@ RUN apt-get update && \
hipify-clang \ hipify-clang \
jq \ jq \
libaio-dev \ libaio-dev \
libboost-program-options-dev \
libcap2 \ libcap2 \
libpci-dev \ libpci-dev \
libtinfo5 \ libtinfo5 \
...@@ -88,13 +89,10 @@ RUN cd /tmp && \ ...@@ -88,13 +89,10 @@ RUN cd /tmp && \
# Install Intel MLC # Install Intel MLC
RUN cd /tmp && \ RUN cd /tmp && \
mkdir -p mlc && \ curl https://www.intel.com/content/dam/develop/external/us/en/documents/mlc_v3.9a.tgz -o mlc.tgz && \
cd mlc && \ tar xzvf mlc.tgz Linux/mlc && \
curl https://www.intel.com/content/dam/develop/external/us/en/documents/mlc_v3.9a.tgz -o mlc_v3.9a.tgz && \
tar xvf mlc_v3.9a.tgz && \
cp ./Linux/mlc /usr/local/bin/ && \ cp ./Linux/mlc /usr/local/bin/ && \
cd /tmp && \ rm -rf ./Linux mlc.tgz
rm -rf mlc
# Install rccl-rdma-sharp-plugins # Install rccl-rdma-sharp-plugins
ENV SHARP_VERSION=5.0 ENV SHARP_VERSION=5.0
...@@ -105,13 +103,15 @@ RUN cd /opt/rocm && \ ...@@ -105,13 +103,15 @@ RUN cd /opt/rocm && \
ENV PATH="${PATH}:/opt/rocm/hip/bin/" \ ENV PATH="${PATH}:/opt/rocm/hip/bin/" \
LD_LIBRARY_PATH="/usr/local/lib/:${LD_LIBRARY_PATH}" \ LD_LIBRARY_PATH="/usr/local/lib/:${LD_LIBRARY_PATH}" \
SB_HOME="/opt/superbench" \ SB_HOME=/opt/superbench \
SB_MICRO_PATH="/opt/superbench" SB_MICRO_PATH=/opt/superbench \
ANSIBLE_DEPRECATION_WARNINGS=FALSE \
ANSIBLE_COLLECTIONS_PATH=/usr/share/ansible/collections
WORKDIR ${SB_HOME} WORKDIR ${SB_HOME}
ADD third_party third_party ADD third_party third_party
RUN ROCM_VERSION=rocm-5.0.1 make -j ${NUM_MAKE_JOBS} -C third_party rocm RUN ROCM_VERSION=rocm-5.0.1 make -C third_party rocm
ADD . . ADD . .
RUN python3 -m pip install .[torch,ort] && \ RUN python3 -m pip install .[torch,ort] && \
......
...@@ -28,6 +28,7 @@ RUN apt-get update && \ ...@@ -28,6 +28,7 @@ RUN apt-get update && \
hipify-clang \ hipify-clang \
jq \ jq \
libaio-dev \ libaio-dev \
libboost-program-options-dev \
libcap2 \ libcap2 \
libpci-dev \ libpci-dev \
libtinfo5 \ libtinfo5 \
...@@ -102,13 +103,10 @@ RUN cd /tmp && \ ...@@ -102,13 +103,10 @@ RUN cd /tmp && \
# Install Intel MLC # Install Intel MLC
RUN cd /tmp && \ RUN cd /tmp && \
mkdir -p mlc && \ curl https://www.intel.com/content/dam/develop/external/us/en/documents/mlc_v3.9a.tgz -o mlc.tgz && \
cd mlc && \ tar xzvf mlc.tgz Linux/mlc && \
curl https://www.intel.com/content/dam/develop/external/us/en/documents/mlc_v3.9a.tgz -o mlc_v3.9a.tgz && \
tar xvf mlc_v3.9a.tgz && \
cp ./Linux/mlc /usr/local/bin/ && \ cp ./Linux/mlc /usr/local/bin/ && \
cd /tmp && \ rm -rf ./Linux mlc.tgz
rm -rf mlc
# Install rccl with commitid 6707a27 # Install rccl with commitid 6707a27
RUN cd /tmp && \ RUN cd /tmp && \
...@@ -128,13 +126,15 @@ RUN cd /opt/rocm && \ ...@@ -128,13 +126,15 @@ RUN cd /opt/rocm && \
ENV PATH="${PATH}:/opt/rocm/hip/bin/" \ ENV PATH="${PATH}:/opt/rocm/hip/bin/" \
LD_LIBRARY_PATH="/usr/local/lib/:${LD_LIBRARY_PATH}" \ LD_LIBRARY_PATH="/usr/local/lib/:${LD_LIBRARY_PATH}" \
SB_HOME="/opt/superbench" \ SB_HOME=/opt/superbench \
SB_MICRO_PATH="/opt/superbench" SB_MICRO_PATH=/opt/superbench \
ANSIBLE_DEPRECATION_WARNINGS=FALSE \
ANSIBLE_COLLECTIONS_PATH=/usr/share/ansible/collections
WORKDIR ${SB_HOME} WORKDIR ${SB_HOME}
ADD third_party third_party ADD third_party third_party
RUN ROCM_VERSION=release/rocm-rel-5.1 make -j ${NUM_MAKE_JOBS} -C third_party rocm RUN ROCM_VERSION=release/rocm-rel-5.1 make -C third_party rocm
ADD . . ADD . .
RUN python3 -m pip install .[torch,ort] && \ RUN python3 -m pip install .[torch,ort] && \
......
...@@ -16,13 +16,8 @@ add_executable(ib_validation ib_validation_performance.cc) ...@@ -16,13 +16,8 @@ add_executable(ib_validation ib_validation_performance.cc)
find_package(MPI REQUIRED) find_package(MPI REQUIRED)
# Boost # Boost
execute_process(COMMAND wget -O boost_1_71_0.tar.gz https://boostorg.jfrog.io/artifactory/main/release/1.71.0/source/boost_1_71_0.tar.gz WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/)
execute_process(COMMAND tar xzvf boost_1_71_0.tar.gz WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/)
execute_process(COMMAND ./bootstrap.sh WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/boost_1_71_0/)
execute_process(COMMAND ./b2 --with-program_options install WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/boost_1_71_0/)
list(APPEND CMAKE_PREFIX_PATH ${CMAKE_CURRENT_SOURCE_DIR}/boost_1_71_0/build/)
find_package(Boost REQUIRED COMPONENTS program_options) find_package(Boost REQUIRED COMPONENTS program_options)
include_directories(${Boost_INCLUDE_DIRS}) include_directories(${Boost_INCLUDE_DIRS})
target_link_libraries(ib_validation PUBLIC MPI::MPI_CXX ${Boost_LIBRARIES}) target_link_libraries(ib_validation PUBLIC MPI::MPI_CXX ${Boost_LIBRARIES})
install(TARGETS ib_validation RUNTIME DESTINATION bin) install(TARGETS ib_validation RUNTIME DESTINATION bin)
# Copyright (c) Microsoft Corporation - All rights reserved # Copyright (c) Microsoft Corporation - All rights reserved
# Licensed under the MIT License # Licensed under the MIT License
...@@ -28,7 +27,7 @@ cuda_cutlass: ...@@ -28,7 +27,7 @@ cuda_cutlass:
ifneq (,$(wildcard cutlass/CMakeLists.txt)) ifneq (,$(wildcard cutlass/CMakeLists.txt))
cmake -DCMAKE_INSTALL_BINDIR=$(SB_MICRO_PATH)/bin -DCMAKE_INSTALL_LIBDIR=$(SB_MICRO_PATH)/lib -DCMAKE_BUILD_TYPE=Release \ cmake -DCMAKE_INSTALL_BINDIR=$(SB_MICRO_PATH)/bin -DCMAKE_INSTALL_LIBDIR=$(SB_MICRO_PATH)/lib -DCMAKE_BUILD_TYPE=Release \
-DCUTLASS_NVCC_ARCHS='70;75;80;86' -DCUTLASS_ENABLE_EXAMPLES=OFF -DCUTLASS_ENABLE_TESTS=OFF -S ./cutlass -B ./cutlass/build -DCUTLASS_NVCC_ARCHS='70;75;80;86' -DCUTLASS_ENABLE_EXAMPLES=OFF -DCUTLASS_ENABLE_TESTS=OFF -S ./cutlass -B ./cutlass/build
cmake --build ./cutlass/build -j 8 --target install cmake --build ./cutlass/build -j $(shell nproc --ignore=2) --target install
endif endif
# Build cuda-samples/Samples/bandwidthTest. # Build cuda-samples/Samples/bandwidthTest.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment