Skip to content

Commit 772b97d

Browse files
author
Diptorup Deb
committed
Rename DPPLSyclBEType to DPPLSyclBackendType. Drop superfluous enum specifier.
1 parent d6bcd74 commit 772b97d

13 files changed

+92
-89
lines changed

‎backends/include/dppl_sycl_context_interface.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,14 @@ DPPL_API
5757
bool DPPLContext_IsHost (__dppl_keep const DPPLSyclContextRef CtxRef);
5858

5959
/*!
60-
* @brief
60+
* @brief Returns the sycl backend for the DPPLSyclContextRef pointer.
6161
*
6262
* @param CtxRef An opaque pointer to a sycl::context.
63-
* @return {return} My Param doc
63+
* @return The sycl backend for the DPPLSyclContextRef returned as
64+
* a DPPLSyclBackendType enum type.
6465
*/
6566
DPPL_API
66-
DPPLSyclBEType
67+
DPPLSyclBackendType
6768
DPPLContext_GetBackend (__dppl_keep const DPPLSyclContextRef CtxRef);
6869

6970
/*!

‎backends/include/dppl_sycl_enum_types.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ DPPL_C_EXTERN_C_BEGIN
3535
* @brief Redefinition of DPC++-specific Sycl backend types.
3636
*
3737
*/
38-
enum DPPLSyclBEType
38+
enum DPPLSyclBackendType
3939
{
4040
DPPL_UNKNOWN_BACKEND = 0x0,
4141
DPPL_OPENCL = 1 << 16,
@@ -57,7 +57,7 @@ enum DPPLSyclDeviceType
5757
DPPL_AUTOMATIC = 1 << 4,
5858
DPPL_HOST_DEVICE = 1 << 5,
5959
DPPL_ALL = 1 << 6
60-
// IMP: before adding new values here look at DPPLSyclBEType enum. The
60+
// IMP: before adding new values here look at DPPLSyclBackendType enum. The
6161
// values should not overlap.
6262
};
6363

‎backends/include/dppl_sycl_platform_interface.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,20 +51,20 @@ DPPL_API
5151
size_t DPPLPlatform_GetNumBackends ();
5252

5353
/*!
54-
* @brief Returns an array of the unique DPPLSyclBEType values on the system.
54+
* @brief Returns an array of the unique DPPLSyclBackendType values on the system.
5555
*
56-
* @return An array of DPPLSyclBEType enum values.
56+
* @return An array of DPPLSyclBackendType enum values.
5757
*/
5858
DPPL_API
59-
__dppl_give enum DPPLSyclBEType* DPPLPlatform_GetListOfBackends ();
59+
__dppl_give DPPLSyclBackendType* DPPLPlatform_GetListOfBackends ();
6060

6161
/*!
62-
* @brief Frees an array of DPPLSyclBEType enum values.
62+
* @brief Frees an array of DPPLSyclBackendType enum values.
6363
*
64-
* @param BEArr An array of DPPLSyclBEType enum values to be freed.
64+
* @param BEArr An array of DPPLSyclBackendType enum values to be freed.
6565
*/
6666
DPPL_API
67-
void DPPLPlatform_DeleteListOfBackends (__dppl_take enum DPPLSyclBEType* BEArr);
67+
void DPPLPlatform_DeleteListOfBackends (__dppl_take DPPLSyclBackendType* BEArr);
6868

6969
/*!
7070
* @brief Prints out some selected info about all sycl::platform on the system.

‎backends/include/dppl_sycl_queue_interface.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,11 @@ bool DPPLQueue_AreEq (__dppl_keep const DPPLSyclQueueRef QRef1,
5959
* @brief Returns the Sycl backend for the provided sycl::queue.
6060
*
6161
* @param QRef An opaque pointer to the sycl queue.
62-
* @return A enum DPPLSyclBEType corresponding to the backed for the queue.
62+
* @return A enum DPPLSyclBackendType corresponding to the backed for the
63+
* queue.
6364
*/
6465
DPPL_API
65-
enum DPPLSyclBEType DPPLQueue_GetBackend (__dppl_keep DPPLSyclQueueRef QRef);
66+
DPPLSyclBackendType DPPLQueue_GetBackend (__dppl_keep DPPLSyclQueueRef QRef);
6667

6768
/*!
6869
* @brief Returns the Sycl context for the queue.

‎backends/include/dppl_sycl_queue_manager.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ __dppl_give DPPLSyclQueueRef DPPLQueueMgr_GetCurrentQueue ();
6565
*/
6666
DPPL_API
6767
__dppl_give DPPLSyclQueueRef
68-
DPPLQueueMgr_GetQueue (enum DPPLSyclBEType BETy,
69-
enum DPPLSyclDeviceType DeviceTy,
68+
DPPLQueueMgr_GetQueue (DPPLSyclBackendType BETy,
69+
DPPLSyclDeviceType DeviceTy,
7070
size_t DNum);
7171

7272
/*!
@@ -88,8 +88,8 @@ size_t DPPLQueueMgr_GetNumActivatedQueues ();
8888
* @return The number of available queues.
8989
*/
9090
DPPL_API
91-
size_t DPPLQueueMgr_GetNumQueues (enum DPPLSyclBEType BETy,
92-
enum DPPLSyclDeviceType DeviceTy);
91+
size_t DPPLQueueMgr_GetNumQueues (DPPLSyclBackendType BETy,
92+
DPPLSyclDeviceType DeviceTy);
9393

9494
/*!
9595
* @brief Returns True if the passed in queue and the current queue are the
@@ -115,8 +115,8 @@ bool DPPLQueueMgr_IsCurrentQueue (__dppl_keep const DPPLSyclQueueRef QRef);
115115
*/
116116
DPPL_API
117117
__dppl_give DPPLSyclQueueRef
118-
DPPLQueueMgr_SetAsDefaultQueue (enum DPPLSyclBEType BETy,
119-
enum DPPLSyclDeviceType DeviceTy,
118+
DPPLQueueMgr_SetAsDefaultQueue (DPPLSyclBackendType BETy,
119+
DPPLSyclDeviceType DeviceTy,
120120
size_t DNum);
121121

122122
/*!
@@ -141,8 +141,8 @@ DPPLQueueMgr_SetAsDefaultQueue (enum DPPLSyclBEType BETy,
141141
*/
142142
DPPL_API
143143
__dppl_give DPPLSyclQueueRef
144-
DPPLQueueMgr_PushQueue (enum DPPLSyclBEType BETy,
145-
enum DPPLSyclDeviceType DeviceTy,
144+
DPPLQueueMgr_PushQueue (DPPLSyclBackendType BETy,
145+
DPPLSyclDeviceType DeviceTy,
146146
size_t DNum);
147147

148148
/*!

‎backends/source/dppl_sycl_context_interface.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ void DPPLContext_Delete (__dppl_take DPPLSyclContextRef CtxRef)
5555
delete unwrap(CtxRef);
5656
}
5757

58-
DPPLSyclBEType
58+
DPPLSyclBackendType
5959
DPPLContext_GetBackend (__dppl_keep const DPPLSyclContextRef CtxRef)
6060
{
6161
auto BE = unwrap(CtxRef)->get_platform().get_backend();

‎backends/source/dppl_sycl_platform_interface.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,27 +36,27 @@ using namespace cl::sycl;
3636

3737
namespace
3838
{
39-
std::set<DPPLSyclBEType>
39+
std::set<DPPLSyclBackendType>
4040
get_set_of_backends ()
4141
{
42-
std::set<DPPLSyclBEType> be_set;
42+
std::set<DPPLSyclBackendType> be_set;
4343
for (auto p : platform::get_platforms()) {
4444
if(p.is_host())
4545
continue;
4646
auto be = p.get_backend();
4747
switch (be)
4848
{
4949
case backend::host:
50-
be_set.insert(DPPLSyclBEType::DPPL_HOST);
50+
be_set.insert(DPPLSyclBackendType::DPPL_HOST);
5151
break;
5252
case backend::cuda:
53-
be_set.insert(DPPLSyclBEType::DPPL_CUDA);
53+
be_set.insert(DPPLSyclBackendType::DPPL_CUDA);
5454
break;
5555
case backend::level_zero:
56-
be_set.insert(DPPLSyclBEType::DPPL_LEVEL_ZERO);
56+
be_set.insert(DPPLSyclBackendType::DPPL_LEVEL_ZERO);
5757
break;
5858
case backend::opencl:
59-
be_set.insert(DPPLSyclBEType::DPPL_OPENCL);
59+
be_set.insert(DPPLSyclBackendType::DPPL_OPENCL);
6060
break;
6161
default:
6262
break;
@@ -164,14 +164,14 @@ size_t DPPLPlatform_GetNumBackends ()
164164
return get_set_of_backends().size();
165165
}
166166

167-
__dppl_give enum DPPLSyclBEType *DPPLPlatform_GetListOfBackends ()
167+
__dppl_give DPPLSyclBackendType *DPPLPlatform_GetListOfBackends ()
168168
{
169169
auto be_set = get_set_of_backends();
170170

171171
if (be_set.empty())
172172
return nullptr;
173173

174-
DPPLSyclBEType *BEArr = new DPPLSyclBEType[be_set.size()];
174+
DPPLSyclBackendType *BEArr = new DPPLSyclBackendType[be_set.size()];
175175

176176
auto i = 0ul;
177177
for (auto be : be_set) {
@@ -182,7 +182,7 @@ __dppl_give enum DPPLSyclBEType *DPPLPlatform_GetListOfBackends ()
182182
return BEArr;
183183
}
184184

185-
void DPPLPlatform_DeleteListOfBackends (__dppl_take enum DPPLSyclBEType *BEArr)
185+
void DPPLPlatform_DeleteListOfBackends (__dppl_take DPPLSyclBackendType *BEArr)
186186
{
187187
delete[] BEArr;
188188
}

‎backends/source/dppl_sycl_queue_interface.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ bool DPPLQueue_AreEq (__dppl_keep const DPPLSyclQueueRef QRef1,
128128
return (*unwrap(QRef1) == *unwrap(QRef2));
129129
}
130130

131-
enum DPPLSyclBEType DPPLQueue_GetBackend (__dppl_keep DPPLSyclQueueRef QRef)
131+
DPPLSyclBackendType DPPLQueue_GetBackend (__dppl_keep DPPLSyclQueueRef QRef)
132132
{
133133
auto Q = unwrap(QRef);
134134
auto C = Q->get_context();
@@ -197,11 +197,11 @@ DPPLQueue_SubmitRange (__dppl_keep const DPPLSyclKernelRef KRef,
197197
"dimensions.");
198198
}
199199
});
200-
} catch (runtime_error re) {
200+
} catch (runtime_error &re) {
201201
// \todo fix error handling
202202
std::cerr << re.what() << '\n';
203203
return nullptr;
204-
} catch (std::runtime_error sre) {
204+
} catch (std::runtime_error &sre) {
205205
std::cerr << sre.what() << '\n';
206206
return nullptr;
207207
}
@@ -258,11 +258,11 @@ DPPLQueue_SubmitNDRange(__dppl_keep const DPPLSyclKernelRef KRef,
258258
"dimensions.");
259259
}
260260
});
261-
} catch (runtime_error re) {
261+
} catch (runtime_error &re) {
262262
// \todo fix error handling
263263
std::cerr << re.what() << '\n';
264264
return nullptr;
265-
} catch (std::runtime_error sre) {
265+
} catch (std::runtime_error &sre) {
266266
std::cerr << sre.what() << '\n';
267267
return nullptr;
268268
}

0 commit comments

Comments
 (0)