refactor: cleanup include path for graph capturing

Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>

Author: JablonskiMateusz

level_zero/api/core/ze_barrier_api_entrypoints.h

@@ -9,10 +9,9 @@
 
 #include "level_zero/core/source/cmdlist/cmdlist.h"
 #include "level_zero/core/source/device/device.h"
+#include "level_zero/experimental/source/graph/graph_captured_apis.h"
 #include <level_zero/ze_api.h>
 
-#include "graph_captured_apis.h"
-
 namespace L0 {
 ze_result_t ZE_APICALL zeCommandListAppendBarrier(
  ze_command_list_handle_t hCommandList,

level_zero/api/core/ze_cmdlist_api_entrypoints.h

@@ -10,10 +10,9 @@
 #include "level_zero/api/core/ze_mutable_cmdlist_api_entrypoints.h"
 #include "level_zero/core/source/cmdlist/cmdlist.h"
 #include "level_zero/core/source/context/context.h"
+#include "level_zero/experimental/source/graph/graph_captured_apis.h"
 #include <level_zero/ze_api.h>
 
-#include "graph_captured_apis.h"
-
 namespace L0 {
 ze_result_t ZE_APICALL zeCommandListCreate(
  ze_context_handle_t hContext,

level_zero/api/core/ze_copy_api_entrypoints.h

@@ -11,10 +11,9 @@
 
 #include "level_zero/core/source/cmdlist/cmdlist.h"
 #include "level_zero/core/source/cmdlist/cmdlist_memory_copy_params.h"
+#include "level_zero/experimental/source/graph/graph_captured_apis.h"
 #include <level_zero/ze_api.h>
 
-#include "graph_captured_apis.h"
-
 namespace L0 {
 ze_result_t ZE_APICALL zeCommandListAppendMemoryCopy(
  ze_command_list_handle_t hCommandList,

level_zero/api/core/ze_event_api_entrypoints.h

@@ -8,10 +8,9 @@
 #pragma once
 
 #include "level_zero/core/source/event/event.h"
+#include "level_zero/experimental/source/graph/graph_captured_apis.h"
 #include <level_zero/ze_api.h>
 
-#include "graph_captured_apis.h"
-
 namespace L0 {
 ze_result_t ZE_APICALL zeEventPoolCreate(
  ze_context_handle_t hContext,

level_zero/api/core/ze_module_api_entrypoints.h

@@ -12,10 +12,9 @@
 #include "level_zero/core/source/kernel/kernel.h"
 #include "level_zero/core/source/module/module.h"
 #include "level_zero/core/source/module/module_build_log.h"
+#include "level_zero/experimental/source/graph/graph_captured_apis.h"
 #include <level_zero/ze_api.h>
 
-#include "graph_captured_apis.h"
-
 namespace L0 {
 ze_result_t ZE_APICALL zeModuleCreate(
  ze_context_handle_t hContext,

level_zero/core/test/unit_tests/experimental/CMakeLists.txt

@@ -12,9 +12,4 @@ target_sources(${TARGET_NAME} PRIVATE
  ${CMAKE_CURRENT_SOURCE_DIR}/test_graph_export.cpp
 )
 
-target_include_directories(${TARGET_NAME}
- PUBLIC
- "${NEO_SOURCE_DIR}/level_zero/experimental/source/graph/captured_apis${BRANCH_DIR_SUFFIX}"
-)
-
 add_subdirectories()

level_zero/core/test/unit_tests/experimental/test_graph_export.cpp

@@ -12,7 +12,7 @@
 
 #include "level_zero/core/test/unit_tests/fixtures/module_fixture.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_module.h"
-#include "level_zero/experimental/source/graph/captured_apis/graph_captured_apis.h"
+#include "level_zero/experimental/source/graph/graph_captured_apis.h"
 #include "level_zero/experimental/source/graph/graph_export.h"
 #include "level_zero/include/level_zero/driver_experimental/zex_graph.h"
 

level_zero/core/test/unit_tests/experimental/test_graph_export.h

@@ -11,7 +11,6 @@
 #include "level_zero/core/test/unit_tests/experimental/test_graph.h"
 #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_module.h"
-#include "level_zero/experimental/source/graph/captured_apis/graph_captured_apis.h"
 #include "level_zero/experimental/source/graph/graph_export.h"
 
 #include "gtest/gtest.h"

level_zero/experimental/source/graph/CMakeLists.txt

@@ -11,7 +11,7 @@ target_sources(${L0_STATIC_LIB_NAME}
  ${CMAKE_CURRENT_SOURCE_DIR}/graph.h
  ${CMAKE_CURRENT_SOURCE_DIR}/graph_export.cpp
  ${CMAKE_CURRENT_SOURCE_DIR}/graph_export.h
- ${CMAKE_CURRENT_SOURCE_DIR}/captured_apis${BRANCH_DIR_SUFFIX}graph_captured_apis.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/graph_captured_apis.h
 )
 
 add_subdirectories()

level_zero/experimental/source/graph/graph.h

@@ -9,10 +9,9 @@
 
 #include "shared/source/utilities/stackvec.h"
 
+#include "level_zero/experimental/source/graph/graph_captured_apis.h"
 #include "level_zero/ze_api.h"
 
-#include "graph_captured_apis.h"
-
 #include <atomic>
 #include <memory>
 #include <span>
@@ -304,4 +303,4 @@ constexpr size_t maxVariantSize = 2 * 64;
  static_assert(sizeof(Closure<CaptureApi::X>) <= maxVariantSize, #X " is too big for common variant. Please export some of its state to ClosureExternalStorage");
 RR_CAPTURED_APIS()
 #undef RR_CAPTURED_API
-} // namespace L0
+} // namespace L0