Skip to content

Commit 8133219

Browse files
author
Alexander Batashev
committed
Get rid of plugin calls in public headers forever
Signed-off-by: Alexander Batashev <[email protected]>
1 parent 2ef9140 commit 8133219

18 files changed

+17
-18
lines changed

‎sycl/include/CL/sycl/detail/sycl_mem_obj_t.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
#include <CL/sycl/detail/common.hpp>
1212
#include <CL/sycl/detail/sycl_mem_obj_allocator.hpp>
13-
#include <CL/sycl/detail/plugin.hpp>
1413
#include <CL/sycl/detail/sycl_mem_obj_i.hpp>
1514
#include <CL/sycl/detail/type_traits.hpp>
1615
#include <CL/sycl/event.hpp>
@@ -25,8 +24,9 @@ namespace sycl {
2524
namespace detail {
2625

2726
// Forward declarations
28-
class event_impl;
2927
class context_impl;
28+
class event_impl;
29+
class plugin;
3030

3131
using ContextImplPtr = shared_ptr_class<context_impl>;
3232
using EventImplPtr = shared_ptr_class<event_impl>;

‎sycl/include/CL/sycl/intel/function_pointer.hpp

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
#pragma once
1010

11-
#include <CL/sycl/detail/plugin.hpp>
1211
#include <CL/sycl/device.hpp>
1312
#include <CL/sycl/program.hpp>
1413
#include <CL/sycl/stl.hpp>

‎sycl/include/CL/sycl/platform.hpp

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
#pragma once
1010
#include <CL/sycl/detail/common.hpp>
11-
#include <CL/sycl/detail/platform_info.hpp>
1211
#include <CL/sycl/stl.hpp>
1312

1413
// 4.6.2 Platform class

‎sycl/source/detail/device_info.hpp

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#include <CL/sycl/detail/pi.hpp>
1313
#include <CL/sycl/info/info_desc.hpp>
1414
#include <CL/sycl/platform.hpp>
15+
#include <detail/plugin.hpp>
1516

1617
__SYCL_INLINE_NAMESPACE(cl) {
1718
namespace sycl {

‎sycl/source/detail/error_handling/enqueue_kernel.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include "error_handling.hpp"
1414

1515
#include <CL/sycl/detail/pi.hpp>
16-
#include <CL/sycl/detail/plugin.hpp>
16+
#include <detail/plugin.hpp>
1717

1818
__SYCL_INLINE_NAMESPACE(cl) {
1919
namespace sycl {

‎sycl/source/detail/event_impl.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
//===----------------------------------------------------------------------===//
88

99
#include <CL/sycl/context.hpp>
10-
#include <CL/sycl/detail/plugin.hpp>
1110
#include <detail/event_impl.hpp>
1211
#include <detail/event_info.hpp>
12+
#include <detail/plugin.hpp>
1313
#include <detail/queue_impl.hpp>
1414
#include <detail/scheduler/scheduler.hpp>
1515

‎sycl/source/detail/event_info.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
#pragma once
1010

1111
#include <CL/sycl/detail/common.hpp>
12-
#include <CL/sycl/detail/plugin.hpp>
1312
#include <CL/sycl/info/info_desc.hpp>
1413
#include <detail/event_impl.hpp>
14+
#include <detail/plugin.hpp>
1515

1616
__SYCL_INLINE_NAMESPACE(cl) {
1717
namespace sycl {

‎sycl/source/detail/kernel_program_cache.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9-
#include <CL/sycl/detail/plugin.hpp>
109
#include <detail/context_impl.hpp>
1110
#include <detail/kernel_program_cache.hpp>
11+
#include <detail/plugin.hpp>
1212

1313
__SYCL_INLINE_NAMESPACE(cl) {
1414
namespace sycl {

‎sycl/source/detail/pi.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
//===----------------------------------------------------------------------===//
88
#include <CL/sycl/detail/common.hpp>
99
#include <CL/sycl/detail/pi.hpp>
10-
#include <CL/sycl/detail/plugin.hpp>
10+
#include <detail/plugin.hpp>
1111

1212
#include <cstdarg>
1313
#include <cstring>

‎sycl/source/detail/platform_impl.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9-
#include <CL/sycl/detail/platform_info.hpp>
109
#include <CL/sycl/device.hpp>
1110
#include <detail/config.hpp>
1211
#include <detail/device_impl.hpp>
1312
#include <detail/platform_impl.hpp>
13+
#include <detail/platform_info.hpp>
1414

1515
#include <algorithm>
1616
#include <cstring>

‎sycl/source/detail/platform_impl.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
#include <CL/sycl/detail/common.hpp>
1111
#include <CL/sycl/detail/force_device.hpp>
1212
#include <CL/sycl/detail/pi.hpp>
13-
#include <CL/sycl/detail/plugin.hpp>
1413
#include <CL/sycl/info/info_desc.hpp>
1514
#include <CL/sycl/stl.hpp>
15+
#include <detail/plugin.hpp>
1616

1717
__SYCL_INLINE_NAMESPACE(cl) {
1818
namespace sycl {

‎sycl/source/detail/platform_info.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9-
#include <CL/sycl/detail/platform_info.hpp>
9+
#include <detail/platform_info.hpp>
1010

1111
__SYCL_INLINE_NAMESPACE(cl) {
1212
namespace sycl {

‎sycl/include/CL/sycl/detail/platform_info.hpp renamed to ‎sycl/source/detail/platform_info.hpp

+2-3
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
#include <CL/sycl/detail/common.hpp>
1111
#include <CL/sycl/detail/common_info.hpp>
1212
#include <CL/sycl/detail/pi.hpp>
13-
#include <CL/sycl/detail/plugin.hpp>
1413
#include <CL/sycl/info/info_desc.hpp>
14+
#include <detail/plugin.hpp>
1515

1616
__SYCL_INLINE_NAMESPACE(cl) {
1717
namespace sycl {
@@ -20,8 +20,7 @@ namespace detail {
2020
// The platform information methods
2121
template <typename T, info::platform param> struct get_platform_info {};
2222

23-
template <info::platform param>
24-
struct get_platform_info<string_class, param> {
23+
template <info::platform param> struct get_platform_info<string_class, param> {
2524
static string_class get(RT::PiPlatform plt, const plugin &Plugin) {
2625
size_t resultSize;
2726
// TODO catch an exception and put it to list of asynchronous exceptions

‎sycl/include/CL/sycl/detail/plugin.hpp renamed to ‎sycl/source/detail/plugin.hpp

File renamed without changes.

‎sycl/source/detail/queue_impl.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
#pragma once
1010

1111
#include <CL/sycl/context.hpp>
12-
#include <CL/sycl/detail/plugin.hpp>
1312
#include <CL/sycl/device.hpp>
1413
#include <CL/sycl/event.hpp>
1514
#include <CL/sycl/exception.hpp>
@@ -20,6 +19,7 @@
2019
#include <detail/context_impl.hpp>
2120
#include <detail/device_impl.hpp>
2221
#include <detail/event_impl.hpp>
22+
#include <detail/plugin.hpp>
2323
#include <detail/scheduler/scheduler.hpp>
2424

2525
__SYCL_INLINE_NAMESPACE(cl) {

‎sycl/source/detail/sycl_mem_obj_t.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include <CL/sycl/detail/sycl_mem_obj_t.hpp>
1111
#include <detail/context_impl.hpp>
1212
#include <detail/event_impl.hpp>
13+
#include <detail/plugin.hpp>
1314
#include <detail/scheduler/scheduler.hpp>
1415

1516
__SYCL_INLINE_NAMESPACE(cl) {

‎sycl/source/detail/usm/usm_dispatch.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
// ===--------------------------------------------------------------------=== //
88

99
#include <CL/sycl/detail/pi.hpp>
10-
#include <CL/sycl/detail/plugin.hpp>
10+
#include <detail/plugin.hpp>
1111
#include <detail/usm/usm_dispatch.hpp>
1212

1313
__SYCL_INLINE_NAMESPACE(cl) {

‎sycl/unittests/pi/PlatformTest.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
//===----------------------------------------------------------------------===//
88

99
#include <CL/sycl/detail/pi.hpp>
10-
#include <CL/sycl/detail/plugin.hpp>
10+
#include <detail/plugin.hpp>
1111
#include <gtest/gtest.h>
1212
#include <vector>
1313

0 commit comments

Comments
 (0)