Squashed 'fin/' changes from 53d2563fe..0e164bf66

0e164bf66 setting json version (#37)
f3f7fed18 Remove function redefinition (#36)
e1de51a58 Performance DB de-serialize test (#34)
043cdcdaa Layout support in Fin (#33)
3a1d58236 Hotfix (#32)
ee3f0d543 4.4 Tuning Bugfixes (#31)
832dbe234 Tunability Reporting (#27)
a564a229f include gfx90a_110 (#28)

git-subtree-dir: fin
git-subtree-split: 0e164bf66280932586e25e15d09c60b02cbd6fc3

CMakeLists.txt

@@ -101,14 +101,6 @@ set_property( CACHE FIN_BACKEND PROPERTY STRINGS
 # HIP is always required
 find_package(hip REQUIRED PATHS /opt/rocm)
 find_package(rocblas REQUIRED PATHS /opt/rocm)
-# probably not required
-target_flags(HIP_COMPILER_FLAGS hip::device)
-# Remove cuda arch flags
-string(REGEX REPLACE --cuda-gpu-arch=[a-z0-9]+ "" HIP_COMPILER_FLAGS "${HIP_COMPILER_FLAGS}")
-
-message(STATUS "Hip compiler flags: ${HIP_COMPILER_FLAGS}")
-
-add_definitions("-DHIP_COMPILER_FLAGS=${HIP_COMPILER_FLAGS}")
 
 # OpenCL 1.2
 if( FIN_BACKEND STREQUAL "OpenCL")
@@ -208,6 +200,8 @@ elseif(FIN_BACKEND STREQUAL "HIP")
     set(MIOPEN_TIDY_ERRORS ALL)
 endif()
 
+if(NOT MIOPEN_ENABLE_FIN)
+    message("MIOPEN_ENABLE_FIN is NOT SET")
 include(ClangTidy)
 enable_clang_tidy(
     CHECKS
@@ -329,6 +323,9 @@ enable_cppcheck(
         MIOPEN_USE_MIOPENGEMM=1
         __linux__=1
 )
+else()
+    message("MIOPEN_ENABLE_FIN is SET")
+endif()
 
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib)
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib)

Dockerfile

@@ -8,7 +8,12 @@ RUN dpkg --add-architecture i386
 # Add rocm repository
 RUN apt-get update
 RUN DEBIAN_FRONTEND=noninteractive apt-get install -y curl apt-utils wget gnupg2
-RUN curl https://raw.githubusercontent.com/RadeonOpenCompute/ROCm-docker/master/add-rocm.sh | bash
+
+#RUN curl https://raw.githubusercontent.com/RadeonOpenCompute/ROCm-docker/master/add-rocm.sh | bash
+ARG ROCMVERSION=4.5
+ARG DEB_ROCM_REPO=http://repo.radeon.com/rocm/apt/.apt_$ROCMVERSION/
+RUN wget -qO - http://repo.radeon.com/rocm/rocm.gpg.key | apt-key add -
+RUN sh -c "echo deb [arch=amd64] $DEB_ROCM_REPO ubuntu main > /etc/apt/sources.list.d/rocm.list"
 
 # Install dependencies required to build hcc
 # Ubuntu csomic contains llvm-7 required to build Tensile

requirements.txt

@@ -1,5 +1,5 @@
 RadeonOpenCompute/rocm-cmake@cdd0f632b3a65bd4411593bb827eb664e25c80bc --build
 # ROCmSoftwarePlatform/MIOpen@9b2d37f9f1e4b5492ef8256cf8168363ca5fd2da 
-nlohmann/json
+nlohmann/json@v3.10.4
 #ROCmSoftwarePlatform/rocBLAS@9790a8658341bc665c11c311129ad0dfc533d5c4