Skip to content

Commit

Permalink
Merge branch 'cderb/gtest_package' of https://github.com/ROCmSoftware…
Browse files Browse the repository at this point in the history
…Platform/MIOpen into cderb/gtest_package
  • Loading branch information
cderb committed Dec 15, 2023
2 parents 7711895 + d912f17 commit d13348e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
5 changes: 5 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -403,6 +403,11 @@ option(BUILD_FILE_REORG_BACKWARD_COMPATIBILITY "Build with file/folder reorg wit
set( MIOPEN_INSTALL_DIR miopen)
set( DATA_INSTALL_DIR ${CMAKE_INSTALL_DATAROOTDIR}/miopen )

if(MIOPEN_ENABLE_AI_KERNEL_TUNING OR MIOPEN_ENABLE_AI_IMMED_MODE_FALLBACK)
find_package(frugally-deep CONFIG REQUIRED)
find_package(Eigen3 REQUIRED)
endif()

set(MIOPEN_GPU_SYNC Off CACHE BOOL "")
if(BUILD_DEV)
set(MIOPEN_BUILD_DEV 1)
Expand Down
2 changes: 0 additions & 2 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -733,8 +733,6 @@ if(BUILD_TESTING)
endif()

if(MIOPEN_ENABLE_AI_KERNEL_TUNING OR MIOPEN_ENABLE_AI_IMMED_MODE_FALLBACK)
find_package(frugally-deep CONFIG REQUIRED GLOBAL)
find_package(Eigen3 REQUIRED GLOBAL)
target_link_libraries(MIOpen PRIVATE frugally-deep::fdeep Eigen3::Eigen)
if(NOT TARGET nlohmann_json)
# frugally-deep has broken linking to nlohmann_json
Expand Down

0 comments on commit d13348e

Please sign in to comment.