small patches sufficient for building with iree-amd-aie

nod-ai · Aug 21, 2024 · a9fdf61 · a9fdf61
1 parent e9b1c0b
commit a9fdf61
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 513 deletions.
diff --git a/src/runtime_src/core/common/CMakeLists.txt b/src/runtime_src/core/common/CMakeLists.txt
@@ -7,7 +7,7 @@ add_subdirectory(xdp)
 if(CMAKE_VERSION VERSION_LESS "3.18.0")
   message(WARNING "CMake version is less than 3.18.0, build of submodule aiebu disabled")
 elseif (${XRT_NATIVE_BUILD} STREQUAL "yes")
-  add_subdirectory(aiebu)
+#  add_subdirectory(aiebu)
 else()
   message(WARNING "Edge device, build of submodule aiebu disabled")
 endif()

diff --git a/src/runtime_src/core/common/query.h b/src/runtime_src/core/common/query.h
@@ -19,7 +19,7 @@
 
 #include <boost/format.hpp>
 
-#include <stdexcept>
+#include <any>
 
 namespace xrt_core {
 

diff --git a/src/runtime_src/tools/xclbinutil/SectionAIEResourcesBin.cxx b/src/runtime_src/tools/xclbinutil/SectionAIEResourcesBin.cxx
@@ -79,9 +79,7 @@ SectionAIEResourcesBin::getSubSectionEnum(const std::string& sSubSectionName)
 }
 
 // -------------------------------------------------------------------------
-
-const std::string&
-SectionAIEResourcesBin::getSubSectionName(SectionAIEResourcesBin::SubSection eSubSection)
+std::string SectionAIEResourcesBin::getSubSectionName(SectionAIEResourcesBin::SubSection eSubSection)
 {
   auto subSectionTable = getSubSectionTable();
   auto iter = std::find_if(subSectionTable.begin(), subSectionTable.end(), [&](const auto& entry) {return entry.second == eSubSection;});

diff --git a/src/runtime_src/tools/xclbinutil/SectionAIEResourcesBin.h b/src/runtime_src/tools/xclbinutil/SectionAIEResourcesBin.h
@@ -30,7 +30,7 @@ class SectionAIEResourcesBin : public Section {
   };
  public:
   static SubSection getSubSectionEnum(const std::string& _sSubSectionName);
-  static const std::string& getSubSectionName(SubSection eSubSection);
+  static std::string getSubSectionName(SubSection eSubSection);
 
  public:
   bool subSectionExists(const std::string& _sSubSectionName) const override;