From 1b46196c9cb1e3bc6ab4bbd1354718d72b88a70a Mon Sep 17 00:00:00 2001 From: Jun Liu Date: Sun, 29 Oct 2023 21:14:02 -0700 Subject: [PATCH] Update dependencies and Dockerfile ROCm versions (#2463) * update sqlite3 and boost * fix MIOPEN_USE_COMPOSABLEKERNEL issue; more updates * sync googletest version with FIN * fix merge conflict * suppress float-equal warning in gtest * update FIn to the latest of its develop * update docker rocm to 5.7.1 --- Dockerfile | 6 +++--- cmake/googletest.cmake | 3 ++- dev-requirements.txt | 2 +- fin | 2 +- install_deps.cmake | 2 +- rbuild.ini | 4 ++-- requirements.txt | 6 +++--- 7 files changed, 13 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2c4a52af8d..9a722cdf06 100755 --- a/Dockerfile +++ b/Dockerfile @@ -18,13 +18,13 @@ DEBIAN_FRONTEND=noninteractive apt-get install -y --allow-unauthenticated \ ENV APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=DontWarn RUN curl -fsSL https://repo.radeon.com/rocm/rocm.gpg.key | gpg --dearmor -o /etc/apt/trusted.gpg.d/rocm-keyring.gpg -RUN wget https://repo.radeon.com/amdgpu-install/5.7/ubuntu/focal/amdgpu-install_5.7.50700-1_all.deb --no-check-certificate +RUN wget https://repo.radeon.com/amdgpu-install/5.7.1/ubuntu/focal/amdgpu-install_5.7.50701-1_all.deb --no-check-certificate RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --allow-unauthenticated \ - ./amdgpu-install_5.7.50700-1_all.deb + ./amdgpu-install_5.7.50701-1_all.deb # Add rocm repository -RUN export ROCM_APT_VER=5.7;\ +RUN export ROCM_APT_VER=5.7.1;\ echo $ROCM_APT_VER &&\ sh -c 'echo deb [arch=amd64 signed-by=/etc/apt/trusted.gpg.d/rocm-keyring.gpg] https://repo.radeon.com/amdgpu/$ROCM_APT_VER/ubuntu focal main > /etc/apt/sources.list.d/amdgpu.list' &&\ sh -c 'echo deb [arch=amd64 signed-by=/etc/apt/trusted.gpg.d/rocm-keyring.gpg] https://repo.radeon.com/rocm/apt/$ROCM_APT_VER focal main > /etc/apt/sources.list.d/rocm.list' diff --git a/cmake/googletest.cmake b/cmake/googletest.cmake index 39dea8fc73..5df2f3963f 100644 --- a/cmake/googletest.cmake +++ b/cmake/googletest.cmake @@ -24,13 +24,14 @@ list(APPEND GTEST_CMAKE_CXX_FLAGS -Wno-old-style-cast -Wno-deprecated -Wno-unsafe-buffer-usage + -Wno-float-equal ) message(STATUS "Suppressing googltest warnings with flags: ${GTEST_CMAKE_CXX_FLAGS}") FetchContent_Declare( googletest GIT_REPOSITORY https://github.com/google/googletest.git - GIT_TAG e2239ee6043f73722e7aa812a459f54a28552929 + GIT_TAG f8d7d77c06936315286eb55f8de22cd23c188571 ) # Will be necessary for windows build diff --git a/dev-requirements.txt b/dev-requirements.txt index 86ee06ae33..6efae8c0de 100755 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,3 +1,3 @@ -ROCmSoftwarePlatform/rocm-recipes +ROCmSoftwarePlatform/rocm-recipes@d7b71f8ff71572833c8cf15b74279dd034e66f9d -f requirements.txt danmar/cppcheck@2.9 diff --git a/fin b/fin index e0122cbc4a..ae2ff171f9 160000 --- a/fin +++ b/fin @@ -1 +1 @@ -Subproject commit e0122cbc4a1707aae6c8503cd847339804218e8d +Subproject commit ae2ff171f9803e2731092a1309ed71ffc18ec2c1 diff --git a/install_deps.cmake b/install_deps.cmake index a4f5433c7d..e3d012f167 100755 --- a/install_deps.cmake +++ b/install_deps.cmake @@ -113,5 +113,5 @@ cget(init ${TOOLCHAIN_FLAG} -DCMAKE_INSTALL_RPATH=${PREFIX}/lib ${PARSE_UNPARSED cget(ignore pcre) # Install dependencies -cget(install -U ROCmSoftwarePlatform/rocm-recipes@7c09d33ac418c31cd5fe1f6e3c2605061dd367c6) +cget(install -U ROCmSoftwarePlatform/rocm-recipes@d7b71f8ff71572833c8cf15b74279dd034e66f9d) cget(install -U -f requirements.txt) diff --git a/rbuild.ini b/rbuild.ini index 106428931e..dfd523b9eb 100755 --- a/rbuild.ini +++ b/rbuild.ini @@ -3,7 +3,7 @@ cxx = ${rocm_path}/llvm/bin/clang++ cc = ${rocm_path}/llvm/bin/clang ignore = pcre deps = - ROCmSoftwarePlatform/rocm-recipes@7c09d33ac418c31cd5fe1f6e3c2605061dd367c6 + ROCmSoftwarePlatform/rocm-recipes@d7b71f8ff71572833c8cf15b74279dd034e66f9d -f requirements.txt [develop] @@ -20,5 +20,5 @@ cxx = ${rocm_path}/llvm/bin/clang++ cc = ${rocm_path}/llvm/bin/clang ignore = pcre deps = - ROCmSoftwarePlatform/rocm-recipes@7c09d33ac418c31cd5fe1f6e3c2605061dd367c6 + ROCmSoftwarePlatform/rocm-recipes@d7b71f8ff71572833c8cf15b74279dd034e66f9d -f dev-requirements.txt diff --git a/requirements.txt b/requirements.txt index 0b3149c3fe..d1864085e2 100755 --- a/requirements.txt +++ b/requirements.txt @@ -1,8 +1,8 @@ -sqlite3@3.17 -DCMAKE_POSITION_INDEPENDENT_CODE=On -boost@1.79 -DCMAKE_POSITION_INDEPENDENT_CODE=On --build -DCMAKE_CXX_FLAGS=" -std=c++14 -Wno-enum-constexpr-conversion -Wno-deprecated-builtins -Wno-deprecated-declarations " +sqlite3@3.43.2 -DCMAKE_POSITION_INDEPENDENT_CODE=On +boost@1.83 -DCMAKE_POSITION_INDEPENDENT_CODE=On --build -DCMAKE_CXX_FLAGS=" -std=c++14 -Wno-enum-constexpr-conversion -Wno-deprecated-builtins -Wno-deprecated-declarations " ROCmSoftwarePlatform/half@10abd99e7815f0ca5d892f58dd7d15a23b7cf92c --build ROCmSoftwarePlatform/rocMLIR@rocm-5.5.0 -H sha256:a5f62769d28a73e60bc8d61022820f050e97c977c8f6f6275488db31512e1f42 -DBUILD_FAT_LIBROCKCOMPILER=1 -DCMAKE_IGNORE_PATH=/opt/conda/envs/py_3.9 -DCMAKE_IGNORE_PREFIX_PATH=/opt/conda -nlohmann/json@v3.9.1 -DJSON_MultipleHeaders=ON -DJSON_BuildTests=Off +nlohmann/json@v3.11.2 -DJSON_MultipleHeaders=ON -DJSON_BuildTests=Off ROCmSoftwarePlatform/FunctionalPlus@v0.2.18-p0 ROCmSoftwarePlatform/eigen@3.4.0 ROCmSoftwarePlatform/frugally-deep@9683d557eb672ee2304f80f6682c51242d748a50