Skip to content

Commit 559ada9

Browse files
konradkusiak97konradkusiak97
committed
Partial cleanup of includes of graph.hpp and graph_impl.hpp in other files
1 parent 092194d commit 559ada9

File tree

11 files changed

+27
-18
lines changed

11 files changed

+27
-18
lines changed

‎sycl/include/sycl/ext/oneapi/experimental/graph.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
//
21
//==--------- graph.hpp --- SYCL graph extension ---------------------------==//
2+
//
33
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
44
// See https://llvm.org/LICENSE.txt for license information.
55
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

‎sycl/source/detail/async_alloc.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include <detail/context_impl.hpp>
1111
#include <detail/event_impl.hpp>
1212
#include <detail/graph_impl.hpp>
13+
#include <detail/graph_node_impl.hpp>
1314
#include <detail/queue_impl.hpp>
1415
#include <sycl/detail/ur.hpp>
1516
#include <sycl/ext/oneapi/experimental/async_alloc/async_alloc.hpp>
@@ -187,7 +188,8 @@ __SYCL_EXPORT void async_free(sycl::handler &h, void *ptr) {
187188

188189
__SYCL_EXPORT void async_free(const sycl::queue &q, void *ptr,
189190
const sycl::detail::code_location &CodeLoc) {
190-
submit(q, [&](sycl::handler &h) { async_free(h, ptr); }, CodeLoc);
191+
submit(
192+
q, [&](sycl::handler &h) { async_free(h, ptr); }, CodeLoc);
191193
}
192194

193195
} // namespace ext::oneapi::experimental

‎sycl/source/detail/graph_dynamic_impl.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
#include "graph_dynamic_impl.hpp"
1212
#include <detail/cg.hpp> // for CG
13+
#include <detail/graph_node_impl.hpp> // for NodeShared
1314
#include <detail/handler_impl.hpp> // for handler_impl
1415
#include <detail/sycl_mem_obj_t.hpp> // for SYCLMemObjT
1516
#include <sycl/detail/kernel_desc.hpp> // for kernel_param_kind_t

‎sycl/source/detail/graph_dynamic_impl.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ inline namespace _V1 {
2121
// Forward declarations
2222
class handler;
2323

24-
namespace detail {
2524
// Forward declarations
25+
namespace detail {
2626
class CG;
2727
} // namespace detail
2828

‎sycl/source/detail/graph_impl.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ inline namespace _V1 {
2828
// Forward declarations
2929
class handler;
3030

31-
namespace detail {
3231
// Forward declarations
32+
namespace detail {
3333
class SYCLMemObjT;
3434
class queue_impl;
3535
class NDRDescT;

‎sycl/source/detail/handler_impl.hpp

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,19 @@
1010

1111
#include "sycl/handler.hpp"
1212
#include <detail/cg.hpp>
13-
#include <detail/graph_impl.hpp>
1413
#include <detail/kernel_bundle_impl.hpp>
1514
#include <memory>
16-
#include <sycl/ext/oneapi/experimental/graph.hpp>
1715

1816
namespace sycl {
1917
inline namespace _V1 {
18+
19+
// Forward declarations
2020
namespace ext::oneapi::experimental::detail {
21+
class graph_impl;
22+
class exec_graph_impl;
2123
class dynamic_parameter_impl;
22-
}
24+
} // namespace ext::oneapi::experimental::detail
25+
2326
namespace detail {
2427

2528
using KernelBundleImplPtr = std::shared_ptr<detail::kernel_bundle_impl>;

‎sycl/source/detail/queue_impl.hpp

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include <detail/device_impl.hpp>
1515
#include <detail/event_impl.hpp>
1616
#include <detail/global_handler.hpp>
17+
#include <detail/graph_impl.hpp>
1718
#include <detail/handler_impl.hpp>
1819
#include <detail/kernel_impl.hpp>
1920
#include <detail/scheduler/scheduler.hpp>
@@ -31,8 +32,6 @@
3132
#include <sycl/property_list.hpp>
3233
#include <sycl/queue.hpp>
3334

34-
#include "detail/graph_impl.hpp"
35-
3635
#include <memory>
3736
#include <utility>
3837

@@ -44,11 +43,10 @@
4443
namespace sycl {
4544
inline namespace _V1 {
4645

47-
// forward declaration
48-
46+
// Forward declaration
4947
namespace ext::oneapi::experimental::detail {
50-
class graph_impl;
51-
}
48+
class node_impl;
49+
} // namespace ext::oneapi::experimental::detail
5250

5351
namespace detail {
5452

@@ -106,7 +104,7 @@ class queue_impl : public std::enable_shared_from_this<queue_impl> {
106104
queue_impl(device_impl &Device, const async_handler &AsyncHandler,
107105
const property_list &PropList, private_tag tag)
108106
: queue_impl(Device, getDefaultOrNew(Device), AsyncHandler, PropList,
109-
tag) {};
107+
tag){};
110108

111109
/// Constructs a SYCL queue with an async_handler and property_list provided
112110
/// form a device and a context.
@@ -282,7 +280,8 @@ class queue_impl : public std::enable_shared_from_this<queue_impl> {
282280
ur_native_handle_t nativeHandle = 0;
283281
getAdapter()->call<UrApiKind::urQueueGetNativeHandle>(MQueue, nullptr,
284282
&nativeHandle);
285-
__SYCL_OCL_CALL(clRetainCommandQueue, ur::cast<cl_command_queue>(nativeHandle));
283+
__SYCL_OCL_CALL(clRetainCommandQueue,
284+
ur::cast<cl_command_queue>(nativeHandle));
286285
return ur::cast<cl_command_queue>(nativeHandle);
287286
}
288287

‎sycl/source/detail/scheduler/graph_builder.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include <detail/context_impl.hpp>
1111
#include <detail/event_impl.hpp>
1212
#include <detail/graph_impl.hpp>
13+
#include <detail/graph_node_impl.hpp>
1314
#include <detail/memory_manager.hpp>
1415
#include <detail/queue_impl.hpp>
1516
#include <detail/scheduler/scheduler.hpp>

‎sycl/source/detail/scheduler/scheduler.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
#include <detail/global_handler.hpp>
1212
#include <detail/graph_impl.hpp>
13+
#include <detail/graph_node_impl.hpp>
1314
#include <detail/jit_compiler.hpp>
1415
#include <detail/queue_impl.hpp>
1516
#include <detail/stream_impl.hpp>

‎sycl/source/handler.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include <detail/global_handler.hpp>
1515
#include <detail/graph_dynamic_impl.hpp>
1616
#include <detail/graph_impl.hpp>
17+
#include <detail/graph_node_impl.hpp>
1718
#include <detail/handler_impl.hpp>
1819
#include <detail/helpers.hpp>
1920
#include <detail/host_task.hpp>
@@ -34,8 +35,10 @@
3435
#include <sycl/info/info_desc.hpp>
3536
#include <sycl/stream.hpp>
3637

37-
#include "sycl/ext/oneapi/experimental/graph.hpp"
3838
#include <sycl/ext/oneapi/bindless_images_memory.hpp>
39+
#include <sycl/ext/oneapi/experimental/graph.hpp>
40+
#include <sycl/ext/oneapi/experimental/graph_dynamic.hpp>
41+
#include <sycl/ext/oneapi/experimental/graph_node.hpp>
3942
#include <sycl/ext/oneapi/experimental/work_group_memory.hpp>
4043
#include <sycl/ext/oneapi/memcpy2d.hpp>
4144

‎sycl/unittests/Extensions/CommandGraph/Common.hpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,10 @@
55
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
66
//
77
//===----------------------------------------------------------------------===//
8-
#include "sycl/ext/oneapi/experimental/graph.hpp"
8+
#include <sycl/ext/oneapi/experimental/graph.hpp>
99
#include <sycl/sycl.hpp>
1010

1111
#include "../../thread_safety/ThreadUtils.h"
12-
#include "detail/graph_impl.hpp"
1312

1413
#include <detail/config.hpp>
1514
#include <helpers/ScopedEnvVar.hpp>

0 commit comments

Comments
 (0)