Skip to content

[UR][L0] reset command lists on error unknown#13522

Merged
ldrumm merged 4 commits intointel:syclfrom
nrspruit:fix_error_unknown
Apr 26, 2024
Merged

[UR][L0] reset command lists on error unknown#13522
ldrumm merged 4 commits intointel:syclfrom
nrspruit:fix_error_unknown

Conversation

@nrspruit
Copy link
Contributor

@nrspruit nrspruit commented Apr 22, 2024

Signed-off-by: Neil R. Spruit <neil.r.spruit@intel.com>
@kbenzie kbenzie force-pushed the fix_error_unknown branch from cac5c62 to e9d50d4 Compare April 25, 2024 09:26
@kbenzie kbenzie marked this pull request as ready for review April 25, 2024 09:34
@kbenzie kbenzie requested a review from a team as a code owner April 25, 2024 09:34
@kbenzie
Copy link
Contributor

kbenzie commented Apr 25, 2024

I've got a fix for these build issues in oneapi-src/unified-runtime#1548 which I'll pull in here to get this passing again.

@kbenzie
Copy link
Contributor

kbenzie commented Apr 26, 2024

@intel/llvm-gatekeepers please merge

@ldrumm
Copy link
Contributor

ldrumm commented Apr 26, 2024

 $ git show 196f62f34e70dd79f3f683abe103cc33d3c49a92 -m
commit 196f62f34e70dd79f3f683abe103cc33d3c49a92 (from 37242e39480d8bb73cb8cc3a54152edab43fd85b) (origin/main, origin/HEAD)
Merge: 37242e39 275c753a
Author: Kenneth Benzie (Benie) <k.benzie@codeplay.com>
Date:   Thu Apr 25 15:03:51 2024 +0100

    Merge pull request #1548 from kbenzie/benie/l0-fix-decoupled-use-case
    
    [L0] Use relative includes for adapter internals

diff --git a/source/adapters/level_zero/adapter.hpp b/source/adapters/level_zero/adapter.hpp
index 5de83b02..36eedb0f 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 <atomic>
diff --git a/source/adapters/level_zero/context.cpp b/source/adapters/level_zero/context.cpp
index 782fa1c8..f9cf5009 100644
--- a/source/adapters/level_zero/context.cpp
+++ b/source/adapters/level_zero/context.cpp
@@ -13,9 +13,9 @@
 #include <mutex>
 #include <string.h>
 
-#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 0701ad43..c6aaf4b0 100644
--- a/source/adapters/level_zero/queue.cpp
+++ b/source/adapters/level_zero/queue.cpp
@@ -16,8 +16,8 @@
 #include <vector>
 
 #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"

Is that right? It doesn't match the description is all

@ldrumm
Copy link
Contributor

ldrumm commented Apr 26, 2024

Nevermind. Just saw your other comment

@kbenzie
Copy link
Contributor

kbenzie commented Apr 26, 2024

Yeah, the previous commit e9d50d4 is the commit which lines up with the description.

@ldrumm ldrumm merged commit fc94a16 into intel:sycl Apr 26, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

Comments