Skip to content

Commit 87052e2

Browse files
Replace use of anonymous namespace in headers
Using anonymous namespace in headers is against best C++ practices due to internal linkage of entities in that namespace.
1 parent 620bdd0 commit 87052e2

File tree

4 files changed

+17
-16
lines changed

4 files changed

+17
-16
lines changed

dpctl/tensor/libtensor/include/kernels/accumulators.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ template <typename BinOpT, typename T> struct can_use_inclusive_scan_over_group
9090
static constexpr bool value = sycl::has_known_identity<BinOpT, T>::value;
9191
};
9292

93-
namespace
93+
namespace detail
9494
{
9595
template <typename T> class stack_t
9696
{
@@ -141,7 +141,7 @@ template <typename T> class stack_strided_t
141141
std::size_t get_local_stride() const { return local_stride_; }
142142
};
143143

144-
} // end of anonymous namespace
144+
} // end of namespace detail
145145

146146
// Iterative cumulative summation
147147

@@ -627,7 +627,7 @@ sycl::event inclusive_scan_iter_1d(sycl::queue &exec_q,
627627
throw std::bad_alloc();
628628
}
629629

630-
std::vector<stack_t<outputT>> stack{};
630+
std::vector<detail::stack_t<outputT>> stack{};
631631

632632
// inclusive scans over blocks
633633
n_groups_ = n_groups;
@@ -867,7 +867,7 @@ sycl::event inclusive_scan_iter(sycl::queue &exec_q,
867867
throw std::bad_alloc();
868868
}
869869

870-
std::vector<stack_strided_t<outputT>> stack{};
870+
std::vector<detail::stack_strided_t<outputT>> stack{};
871871

872872
// inclusive scans over blocks
873873
acc_groups_ = acc_groups;

dpctl/tensor/libtensor/include/kernels/boolean_advanced_indexing.hpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ struct MaskedPlaceStridedFunctor
212212

213213
// ======= Masked extraction ================================
214214

215-
namespace
215+
namespace detail
216216
{
217217

218218
template <std::size_t I, std::size_t... IR>
@@ -234,7 +234,7 @@ std::size_t get_lws(std::size_t n)
234234
return _get_lws_impl<lws0, lws1, lws2>(n);
235235
}
236236

237-
} // end of anonymous namespace
237+
} // end of namespace detail
238238

239239
template <typename MaskedDstIndexerT, typename dataT, typename indT>
240240
class masked_extract_all_slices_contig_impl_krn;
@@ -278,7 +278,7 @@ sycl::event masked_extract_all_slices_contig_impl(
278278

279279
const std::size_t masked_extent = iteration_size;
280280

281-
const std::size_t lws = get_lws(masked_extent);
281+
const std::size_t lws = detail::get_lws(masked_extent);
282282

283283
const std::size_t n_groups = (iteration_size + lws - 1) / lws;
284284

@@ -357,7 +357,7 @@ sycl::event masked_extract_all_slices_strided_impl(
357357

358358
const std::size_t masked_nelems = iteration_size;
359359

360-
const std::size_t lws = get_lws(masked_nelems);
360+
const std::size_t lws = detail::get_lws(masked_nelems);
361361

362362
const std::size_t n_groups = (masked_nelems + lws - 1) / lws;
363363

@@ -452,7 +452,7 @@ sycl::event masked_extract_some_slices_strided_impl(
452452

453453
const std::size_t masked_extent = masked_nelems;
454454

455-
const std::size_t lws = get_lws(masked_extent);
455+
const std::size_t lws = detail::get_lws(masked_extent);
456456

457457
const std::size_t n_groups = ((masked_extent + lws - 1) / lws);
458458
const std::size_t orthog_extent = static_cast<std::size_t>(orthog_nelems);

dpctl/tensor/libtensor/include/utils/sycl_alloc_utils.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ smart_malloc_host(std::size_t count,
142142
return smart_malloc<T>(count, q, sycl::usm::alloc::host, propList);
143143
}
144144

145-
namespace
145+
namespace detail
146146
{
147147
template <typename T> struct valid_smart_ptr : public std::false_type
148148
{
@@ -172,7 +172,7 @@ struct all_valid_smart_ptrs<Arg, RestArgs...>
172172
static constexpr bool value = valid_smart_ptr<Arg>::value &&
173173
(all_valid_smart_ptrs<RestArgs...>::value);
174174
};
175-
} // namespace
175+
} // end of namespace detail
176176

177177
template <typename... Args>
178178
sycl::event async_smart_free(sycl::queue &exec_q,
@@ -184,7 +184,7 @@ sycl::event async_smart_free(sycl::queue &exec_q,
184184
n > 0, "async_smart_free requires at least one smart pointer argument");
185185

186186
static_assert(
187-
all_valid_smart_ptrs<Args...>::value,
187+
detail::all_valid_smart_ptrs<Args...>::value,
188188
"async_smart_free requires unique_ptr created with smart_malloc");
189189

190190
std::vector<void *> ptrs;

dpctl/tensor/libtensor/include/utils/sycl_utils.hpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ std::size_t choose_workgroup_size(const std::size_t nelems,
132132
return wg;
133133
}
134134

135-
namespace
135+
namespace detail
136136
{
137137

138138
template <typename LocAccT, typename OpT>
@@ -158,7 +158,7 @@ void _fold(LocAccT &local_mem_acc,
158158
}
159159
}
160160

161-
} // namespace
161+
} // end of namespace detail
162162

163163
template <typename T, typename GroupT, typename LocAccT, typename OpT>
164164
T custom_reduce_over_group(const GroupT &wg,
@@ -184,7 +184,8 @@ T custom_reduce_over_group(const GroupT &wg,
184184
for (std::uint32_t sz = high_sz; sz >= low_sz; sz >>= 1) {
185185
if (n_witems >= sz) {
186186
const std::uint32_t n_witems_ = (n_witems + 1) >> 1;
187-
_fold(local_mem_acc, lid, n_witems - n_witems_, n_witems_, op);
187+
detail::_fold(local_mem_acc, lid, n_witems - n_witems_,
188+
n_witems_, op);
188189
sycl::group_barrier(wg, sycl::memory_scope::work_group);
189190
n_witems = n_witems_;
190191
}
@@ -196,7 +197,7 @@ T custom_reduce_over_group(const GroupT &wg,
196197
for (std::uint32_t sz = high_sz; sz >= low_sz; sz >>= 1) {
197198
if (n_witems >= sz) {
198199
n_witems >>= 1;
199-
_fold(local_mem_acc, lid, n_witems, op);
200+
detail::_fold(local_mem_acc, lid, n_witems, op);
200201
sycl::group_barrier(wg, sycl::memory_scope::work_group);
201202
}
202203
}

0 commit comments

Comments
 (0)