From 6b01b901ed87a0e67f549edf75001ee46169840d Mon Sep 17 00:00:00 2001 From: Illia Silin <98187287+illsilin@users.noreply.github.com> Date: Thu, 15 Feb 2024 15:46:01 -0800 Subject: [PATCH] upgrade the ccache version and update links (#1169) [ROCm/composable_kernel commit: b9ab9f4b4fd3e5787216e291d6ffb485465c38d1] --- Dockerfile | 11 +++++++---- dev-requirements.txt | 2 +- docs/Contributors_Guide.rst | 8 ++++---- docs/dockerhub.rst | 4 ++-- docs/tutorial_hello_world.rst | 4 ++-- 5 files changed, 16 insertions(+), 13 deletions(-) diff --git a/Dockerfile b/Dockerfile index 48ee97eec2..38f234943c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -44,7 +44,6 @@ ENV PATH=$PATH:${SCCACHE_INSTALL_LOCATION} RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --allow-unauthenticated \ build-essential \ cmake \ - ccache \ git \ hip-rocclr \ iputils-ping \ @@ -74,6 +73,10 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --allow- apt-get clean && \ rm -rf /var/lib/apt/lists/* +#Install latest ccache +RUN git clone https://github.com/ccache/ccache.git && \ + cd ccache && mkdir build && cd build && cmake .. && make install + #Install ninja build tracing tools RUN wget -qO /usr/local/bin/ninja.gz https://github.com/ninja-build/ninja/releases/latest/download/ninja-linux.zip RUN gunzip /usr/local/bin/ninja.gz @@ -111,7 +114,7 @@ ENV LANG=C.UTF-8 RUN groupadd -f render # Install the new rocm-cmake version -RUN git clone -b master https://github.com/RadeonOpenCompute/rocm-cmake.git && \ +RUN git clone -b master https://github.com/ROCm/rocm-cmake.git && \ cd rocm-cmake && mkdir build && cd build && \ cmake .. && cmake --build . && cmake --build . --target install @@ -123,7 +126,7 @@ RUN sh -c "echo compiler version = '$compiler_version'" RUN sh -c "echo compiler commit = '$compiler_commit'" RUN if ( [ "$compiler_version" = "amd-staging" ] || [ "$compiler_version" = "amd-mainline-open" ] ) && [ "$compiler_commit" = "" ]; then \ - git clone -b "$compiler_version" https://github.com/RadeonOpenCompute/llvm-project.git && \ + git clone -b "$compiler_version" https://github.com/ROCm/llvm-project.git && \ cd llvm-project && mkdir build && cd build && \ cmake -DCMAKE_INSTALL_PREFIX=/opt/rocm/llvm -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_ASSERTIONS=1 -DLLVM_TARGETS_TO_BUILD="AMDGPU;X86" -DLLVM_ENABLE_PROJECTS="clang;lld" -DLLVM_ENABLE_RUNTIMES="compiler-rt" ../llvm && \ make -j 8 ; \ @@ -131,7 +134,7 @@ RUN if ( [ "$compiler_version" = "amd-staging" ] || [ "$compiler_version" = "amd fi RUN if ( [ "$compiler_version" = "amd-staging" ] || [ "$compiler_version" = "amd-mainline-open" ] ) && [ "$compiler_commit" != "" ]; then \ - git clone -b "$compiler_version" https://github.com/RadeonOpenCompute/llvm-project.git && \ + git clone -b "$compiler_version" https://github.com/ROCm/llvm-project.git && \ cd llvm-project && git checkout "$compiler_commit" && echo "checking out commit $compiler_commit" && mkdir build && cd build && \ cmake -DCMAKE_INSTALL_PREFIX=/opt/rocm/llvm -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_ASSERTIONS=1 -DLLVM_TARGETS_TO_BUILD="AMDGPU;X86" -DLLVM_ENABLE_PROJECTS="clang;lld" -DLLVM_ENABLE_RUNTIMES="compiler-rt" ../llvm && \ make -j 8 ; \ diff --git a/dev-requirements.txt b/dev-requirements.txt index d5d91f8c27..ca883c19e1 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,3 +1,3 @@ ROCm/rocm-recipes -RadeonOpenCompute/rocm-cmake@04f694df2a8dc9d7e35fa4dee4ba5fa407ec04f8 --build +ROCm/rocm-cmake@04f694df2a8dc9d7e35fa4dee4ba5fa407ec04f8 --build danmar/cppcheck@2.9 diff --git a/docs/Contributors_Guide.rst b/docs/Contributors_Guide.rst index b91984357a..3788ba609c 100644 --- a/docs/Contributors_Guide.rst +++ b/docs/Contributors_Guide.rst @@ -17,7 +17,7 @@ Getting started `Composable Kernel User Guide `_. It provides insight into the core concepts, environment configuration, and steps to obtain or build the library. You can also find some of this information in the - `README file `_ + `README file `_ on the project's GitHub page. #. **Additional reading:** The blog post `AMD Composable Kernel library: efficient fused kernels for AI apps with just a few lines of code `_ provides a deeper understanding of the CK library and showcases its performance capabilities. `_ @@ -33,7 +33,7 @@ You can make an impact by reporting issues or proposing code enhancements throug Reporting issues ---------------- -Use `Github issues `_ +Use `Github issues `_ to track public bugs and enhancement requests. If you encounter an issue with the library, please check if the problem has already been @@ -68,7 +68,7 @@ Creating Pull Requests ---------------------- You can submit `Pull Requests (PR) on GitHub -`_. +`_. All contributors are required to develop their changes on a separate branch and then create a pull request to merge their changes into the `develop` branch, which is the default @@ -89,7 +89,7 @@ When submitting a Pull Request you should: the project's root directory. We leverage `pre-commit` to run `clang-format` automatically. We highly recommend contributors utilize this method to maintain consistent code formatting. Instructions on setting up `pre-commit` can be found in the project's - `README file `_ + `README file `_ * Link your PR to any related issues: diff --git a/docs/dockerhub.rst b/docs/dockerhub.rst index fb89bef72b..21121f1b82 100644 --- a/docs/dockerhub.rst +++ b/docs/dockerhub.rst @@ -38,7 +38,7 @@ The docker images have everything you need for running CK including: * `ROCm `_ * `CMake `_ -* `Compiler `_ +* `Compiler `_ * `Composable Kernel library `_ Running the docker container @@ -97,5 +97,5 @@ Editing the docker image ======================= If you want to customize the docker image, edit the -`Dockerfile `_ +`Dockerfile `_ from the GitHub repository to suit your needs. diff --git a/docs/tutorial_hello_world.rst b/docs/tutorial_hello_world.rst index d89331e579..c31460785b 100644 --- a/docs/tutorial_hello_world.rst +++ b/docs/tutorial_hello_world.rst @@ -32,7 +32,7 @@ CK library acceleration features are based on: If you need more technical details and benchmarking results read the following `blog post `_. -To download the library visit the `composable_kernel repository `_. +To download the library visit the `composable_kernel repository `_. Hardware targets ================ @@ -58,7 +58,7 @@ This tutorial is based on the use of docker images as explained in :ref:`docker- .. note:: - You can also `install ROCm `_ on your system, clone the `Composable Kernel repository `_ on GitHub, and use that to build and run the examples using the commands described below. + You can also `install ROCm `_ on your system, clone the `Composable Kernel repository `_ on GitHub, and use that to build and run the examples using the commands described below. Both the docker container and GitHub repository include the Composable Kernel library. Navigate to the library::