Skip to content

Commit

Permalink
Squashed 'fin/' changes from 53d2563fe..f3f7fed18
Browse files Browse the repository at this point in the history
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: f3f7fed18ba0473c6ff0f388ff2d0deffde01a46
  • Loading branch information
cderb committed Nov 17, 2021
1 parent 8e0a630 commit f86de63
Show file tree
Hide file tree
Showing 10 changed files with 268 additions and 55 deletions.
13 changes: 5 additions & 8 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down
7 changes: 6 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading

0 comments on commit f86de63

Please sign in to comment.