From 275c753ad3eb1fc12311cd6ab5505715c590a23e Mon Sep 17 00:00:00 2001 From: "Kenneth Benzie (Benie)" Date: Thu, 25 Apr 2024 12:06:54 +0100 Subject: [PATCH] [L0] Use relative includes for adapter internals Fix build issues when using decoupled adapter fetch in intel/llvm by using relative include paths instead of longer explicit paths. This was causing redefinitions of objects. This patch also adds a missing `#pragma once` from the `adapter.hpp` header. --- source/adapters/level_zero/adapter.hpp | 1 + source/adapters/level_zero/context.cpp | 2 +- source/adapters/level_zero/queue.cpp | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/source/adapters/level_zero/adapter.hpp b/source/adapters/level_zero/adapter.hpp index 5de83b02e4..36eedb0f9d 100644 --- a/source/adapters/level_zero/adapter.hpp +++ b/source/adapters/level_zero/adapter.hpp @@ -7,6 +7,7 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // //===----------------------------------------------------------------------===// +#pragma once #include "logger/ur_logger.hpp" #include diff --git a/source/adapters/level_zero/context.cpp b/source/adapters/level_zero/context.cpp index 782fa1c840..f9cf5009fb 100644 --- a/source/adapters/level_zero/context.cpp +++ b/source/adapters/level_zero/context.cpp @@ -13,9 +13,9 @@ #include #include -#include "adapters/level_zero/queue.hpp" #include "context.hpp" #include "logger/ur_logger.hpp" +#include "queue.hpp" #include "ur_level_zero.hpp" UR_APIEXPORT ur_result_t UR_APICALL urContextCreate( diff --git a/source/adapters/level_zero/queue.cpp b/source/adapters/level_zero/queue.cpp index 0701ad4318..c6aaf4b034 100644 --- a/source/adapters/level_zero/queue.cpp +++ b/source/adapters/level_zero/queue.cpp @@ -16,8 +16,8 @@ #include #include "adapter.hpp" -#include "adapters/level_zero/event.hpp" #include "common.hpp" +#include "event.hpp" #include "queue.hpp" #include "ur_api.h" #include "ur_level_zero.hpp"