Skip to content

Commit d72b38a

Browse files
committed
Fix v2 L0 adapter
1 parent f8d9e9e commit d72b38a

File tree

3 files changed

+21
-2
lines changed

3 files changed

+21
-2
lines changed

source/adapters/level_zero/program.hpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,12 @@
1010
#pragma once
1111

1212
#include "common.hpp"
13-
#include "context.hpp"
1413
#include "device.hpp"
14+
#ifdef UR_ADAPTER_LEVEL_ZERO_V2
15+
#include "v2/context.hpp"
16+
#else
17+
#include "context.hpp"
18+
#endif
1519

1620
struct ur_program_handle_t_ : _ur_object {
1721
// ur_program_handle_t_() {}

source/adapters/level_zero/ur_level_zero.hpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,17 @@
2525
#include <zes_api.h>
2626

2727
#include "common.hpp"
28+
#ifdef UR_ADAPTER_LEVEL_ZERO_V2
29+
#include "v2/context.hpp"
30+
#else
2831
#include "context.hpp"
32+
#endif
2933
#include "device.hpp"
34+
#ifdef UR_ADAPTER_LEVEL_ZERO_V2
35+
#include "v2/event.hpp"
36+
#else
3037
#include "event.hpp"
38+
#endif
3139
#include "image.hpp"
3240
#include "kernel.hpp"
3341
#include "memory.hpp"

source/adapters/level_zero/v2/kernel.cpp

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,14 @@ ur_kernel_handle_t_::ur_kernel_handle_t_(ur_program_handle_t hProgram,
4040
deviceKernels(hProgram->Context->getPlatform()->getNumDevices()) {
4141
ur::level_zero::urProgramRetain(hProgram);
4242

43-
for (auto [zeDevice, zeModule] : hProgram->ZeModuleMap) {
43+
for (auto &Dev : hProgram->AssociatedDevices) {
44+
auto zeDevice = Dev->ZeDevice;
45+
// Program may be associated with all devices from the context but built
46+
// only for subset of devices.
47+
if (hProgram->getState(zeDevice) != ur_program_handle_t_::state::Exe)
48+
continue;
49+
50+
auto zeModule = hProgram->getZeModuleHandle(zeDevice);
4451
ZeStruct<ze_kernel_desc_t> zeKernelDesc;
4552
zeKernelDesc.pKernelName = kernelName;
4653

0 commit comments

Comments
 (0)