Merge remote-tracking branch 'origin/ck-poc2' into ck-poc

requirements.txt

@@ -28,3 +28,4 @@ half,https://github.com/pfultz2/half/archive/1.12.0.tar.gz -X header -H sha256:0
 pybind/pybind11@d159a563383d10c821ba7b2a71905d1207db6de4 --build
 msgpack/msgpack-c@cpp-3.3.0 -DMSGPACK_BUILD_TESTS=Off
 sqlite3@3.17 -DCMAKE_POSITION_INDEPENDENT_CODE=On
+ROCmSoftwarePlatform/composable_kernel@639147432b6922bd8e4051ba751e4e63dd4eb196 -X header

src/targets/gpu/CMakeLists.txt

@@ -360,6 +360,9 @@ string(REGEX REPLACE --offload-arch=[a-z0-9:+-]+ "" HIP_COMPILER_FLAGS "${HIP_CO
 string(APPEND HIP_COMPILER_FLAGS " ")
 foreach(_unused RANGE 2)
     string(REGEX REPLACE " /[^ ]+\\.(a|so) " " " HIP_COMPILER_FLAGS "${HIP_COMPILER_FLAGS}")
+# Add ck includes
+find_path(CK_INCLUDE_PATH ck/ck.hpp)
+string(APPEND HIP_COMPILER_FLAGS " -isystem ${CK_INCLUDE_PATH}")
 endforeach()
 
 message(STATUS "Hip compiler flags: ${HIP_COMPILER_FLAGS}")
@@ -393,7 +396,6 @@ endif()
 target_compile_definitions(migraphx_gpu PUBLIC -D__HIP_PLATFORM_HCC__=1)
 target_link_libraries(migraphx_gpu PUBLIC migraphx MIOpen roc::rocblas)
 target_link_libraries(migraphx_gpu PRIVATE migraphx_device migraphx_kernels)
-#target_include_directories(migraphx_gpu PRIVATE /opt/rocm/ck/include)
 
 add_subdirectory(driver)