Use new embed.cmake

requirements.txt

@@ -28,5 +28,5 @@ ROCmSoftwarePlatform/half@rocm-5.6.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@4b0b327b81668978249fd9b6eb1c35214e7d78ea -DCK_BUILD_JIT_LIB=On -DCMAKE_POSITION_INDEPENDENT_CODE=On
+#ROCmSoftwarePlatform/composable_kernel@761899c25989feb3c591b8fb0d0995509c3ecd20 -DCK_BUILD_JIT_LIB=On -DCMAKE_POSITION_INDEPENDENT_CODE=On
 ROCmSoftwarePlatform/rocMLIR@a48dfb1f163fb0b38369e73e580968b72e85b594 -DBUILD_FAT_LIBROCKCOMPILER=On

src/targets/gpu/include/migraphx/gpu/ck.hpp

@@ -28,6 +28,7 @@
 #include <migraphx/env.hpp>
 #include <migraphx/shape.hpp>
 #include <migraphx/stringutils.hpp>
+#include <string_view>
 
 #include "ck/host/device_gemm_multiple_d.hpp"
 #include "ck/host/device_batched_gemm_softmax_gemm.hpp"
@@ -55,17 +56,17 @@ template <class P>
 std::string ck_disable_warnings(P p)
 {
     return interpolate_string(disable_warning_pragma,
-                              {{"content", std::string{p.first, p.second}}});
+                              {{"content", std::string{p.data(), p.size()}}});
 }
 
-static std::unordered_map<std::string, std::string> create_ck_header_strings()
+static std::unordered_map<std::string_view, std::string_view> create_ck_header_strings()
 {
-    std::unordered_map<std::string, std::string> result;
+    std::unordered_map<std::string_view, std::string_view> result;
     auto ck_headers = ck::host::GetHeaders();
 
     std::transform(
-        ck_headers.begin(), ck_headers.end(), std::inserter(result, result.begin()), [&](auto&& p) {
-            return std::make_pair(p.first, ck_disable_warnings(p.second));
+        ck_headers.begin(), ck_headers.end(), std::inserter(result, result.begin()), [&](auto& p) {
+            return std::pair<std::string_view, std::string_view>(p.first, ck_disable_warnings(p.second));
         });
     return result;
 }
@@ -75,9 +76,8 @@ static std::vector<src_file> create_ck_headers()
     static const auto& header_strings = create_ck_header_strings();
     std::vector<src_file> srcs;
     std::transform(
-        header_strings.begin(), header_strings.end(), std::back_inserter(srcs), [&](auto&& p) {
-            return src_file{fs::path{p.first},
-                            {p.second.data(), p.second.data() + p.second.size()}};
+        header_strings.begin(), header_strings.end(), std::back_inserter(srcs), [&](auto& p) {
+            return src_file{p};
         });
     return srcs;
 }