Skip to content

Commit f98fe15

Browse files
oleksandr-pavlykoleksandr-pavlyk
authored
Merge pull request #1775 from IntelPython/update-clang-format-version-used
Update clang-format version used
2 parents c7af3a0 + bad1b4e commit f98fe15

File tree

106 files changed

+558
-564
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+558
-564
lines changed

‎.git-blame-ignore-revs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,6 @@
1111

1212
# Linter changes
1313
084ba59ce87efb55e09fff6ae33665d0f14f22b5
14+
15+
# Transition from clang-format 11 to clang-format 18
16+
b37657e6ad9af16eaec2982d8e2397acd2af2881

‎.github/workflows/cpp_style_checks.yml‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,20 @@ jobs:
2020
- name: Run clang-format style check for C/C++ programs.
2121
uses: jidicula/clang-format-action@v4.13.0
2222
with:
23-
clang-format-version: '11'
23+
clang-format-version: '18'
2424
check-path: 'libsyclinterface'
2525
- name: Run clang-format style check for api headers.
2626
uses: jidicula/clang-format-action@v4.13.0
2727
with:
28-
clang-format-version: '11'
28+
clang-format-version: '18'
2929
check-path: 'dpctl/apis'
30+
- name: Run clang-format style check for libtensor/source.
31+
uses: jidicula/clang-format-action@v4.13.0
32+
with:
33+
clang-format-version: '18'
34+
check-path: 'dpctl/tensor/libtensor/source'
35+
- name: Run clang-format style check for libtensor/include.
36+
uses: jidicula/clang-format-action@v4.13.0
37+
with:
38+
clang-format-version: '18'
39+
check-path: 'dpctl/tensor/libtensor/include'

‎.github/workflows/pre-commit.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ permissions: read-all
99

1010
jobs:
1111
pre-commit:
12-
runs-on: ubuntu-20.04
12+
runs-on: ubuntu-24.04
1313
steps:
1414
- uses: actions/checkout@v4.1.7
1515
- uses: actions/setup-python@v5
1616
with:
17-
python-version: '3.10'
17+
python-version: '3.12'
1818
- name: Version of clang-format
1919
run: |
2020
clang-format --version

‎dpctl/apis/include/dpctl4pybind11.hpp‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -187,22 +187,10 @@ class dpctl_capi
187187
return api;
188188
}
189189

190-
py::object default_sycl_queue_pyobj()
191-
{
192-
return *default_sycl_queue_;
193-
}
194-
py::object default_usm_memory_pyobj()
195-
{
196-
return *default_usm_memory_;
197-
}
198-
py::object default_usm_ndarray_pyobj()
199-
{
200-
return *default_usm_ndarray_;
201-
}
202-
py::object as_usm_memory_pyobj()
203-
{
204-
return *as_usm_memory_;
205-
}
190+
py::object default_sycl_queue_pyobj() { return *default_sycl_queue_; }
191+
py::object default_usm_memory_pyobj() { return *default_usm_memory_; }
192+
py::object default_usm_ndarray_pyobj() { return *default_usm_ndarray_; }
193+
py::object as_usm_memory_pyobj() { return *as_usm_memory_; }
206194

207195
private:
208196
struct Deleter

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

Lines changed: 13 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,7 @@ namespace accumulators
4747

4848
using namespace dpctl::tensor::offset_utils;
4949

50-
template <typename T> T ceiling_quotient(T n, T m)
51-
{
52-
return (n + m - 1) / m;
53-
}
50+
template <typename T> T ceiling_quotient(T n, T m) { return (n + m - 1) / m; }
5451

5552
template <typename inputT, typename outputT> struct NonZeroIndicator
5653
{
@@ -70,10 +67,7 @@ template <typename T> struct NoOpTransformer
7067
{
7168
constexpr NoOpTransformer() {}
7269

73-
T operator()(const T &val) const
74-
{
75-
return val;
76-
}
70+
T operator()(const T &val) const { return val; }
7771
};
7872

7973
template <typename srcTy, typename dstTy> struct CastTransformer
@@ -108,20 +102,11 @@ template <typename T> class stack_t
108102
}
109103
~stack_t(){};
110104

111-
T *get_src_ptr() const
112-
{
113-
return src_;
114-
}
105+
T *get_src_ptr() const { return src_; }
115106

116-
size_t get_size() const
117-
{
118-
return size_;
119-
}
107+
size_t get_size() const { return size_; }
120108

121-
T *get_local_scans_ptr() const
122-
{
123-
return local_scans_;
124-
}
109+
T *get_local_scans_ptr() const { return local_scans_; }
125110
};
126111

127112
template <typename T> class stack_strided_t
@@ -140,25 +125,13 @@ template <typename T> class stack_strided_t
140125
}
141126
~stack_strided_t(){};
142127

143-
T *get_src_ptr() const
144-
{
145-
return src_;
146-
}
128+
T *get_src_ptr() const { return src_; }
147129

148-
size_t get_size() const
149-
{
150-
return size_;
151-
}
130+
size_t get_size() const { return size_; }
152131

153-
T *get_local_scans_ptr() const
154-
{
155-
return local_scans_;
156-
}
132+
T *get_local_scans_ptr() const { return local_scans_; }
157133

158-
size_t get_local_stride() const
159-
{
160-
return local_stride_;
161-
}
134+
size_t get_local_stride() const { return local_stride_; }
162135
};
163136

164137
} // end of anonymous namespace
@@ -283,7 +256,8 @@ inclusive_scan_base_step(sycl::queue &exec_q,
283256

284257
outputT wg_iscan_val;
285258
if constexpr (can_use_inclusive_scan_over_group<ScanOpT,
286-
outputT>::value) {
259+
outputT>::value)
260+
{
287261
wg_iscan_val = sycl::inclusive_scan_over_group(
288262
it.get_group(), local_iscan.back(), scan_op, identity);
289263
}
@@ -305,7 +279,8 @@ inclusive_scan_base_step(sycl::queue &exec_q,
305279
}
306280

307281
for (nwiT m_wi = 0; (m_wi < n_wi) && (i + m_wi < acc_nelems);
308-
++m_wi) {
282+
++m_wi)
283+
{
309284
output[out_iter_offset + out_indexer(i + m_wi)] =
310285
local_iscan[m_wi];
311286
}

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

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -573,28 +573,27 @@ sycl::event non_zero_indexes_impl(sycl::queue &exec_q,
573573
sycl::event comp_ev = exec_q.submit([&](sycl::handler &cgh) {
574574
cgh.depends_on(depends);
575575
cgh.parallel_for<class non_zero_indexes_krn<indT1, indT2>>(
576-
sycl::range<1>(iter_size), [=](sycl::id<1> idx)
577-
{
578-
auto i = idx[0];
579-
580-
auto cs_curr_val = cumsum_data[i] - 1;
581-
auto cs_prev_val = (i > 0) ? cumsum_data[i - 1] : indT1(0);
582-
bool cond = (cs_curr_val == cs_prev_val);
583-
584-
ssize_t i_ = static_cast<ssize_t>(i);
585-
for (int dim = nd; --dim > 0;) {
586-
auto sd = mask_shape[dim];
587-
ssize_t q = i_ / sd;
588-
ssize_t r = (i_ - q * sd);
576+
sycl::range<1>(iter_size), [=](sycl::id<1> idx) {
577+
auto i = idx[0];
578+
579+
auto cs_curr_val = cumsum_data[i] - 1;
580+
auto cs_prev_val = (i > 0) ? cumsum_data[i - 1] : indT1(0);
581+
bool cond = (cs_curr_val == cs_prev_val);
582+
583+
ssize_t i_ = static_cast<ssize_t>(i);
584+
for (int dim = nd; --dim > 0;) {
585+
auto sd = mask_shape[dim];
586+
ssize_t q = i_ / sd;
587+
ssize_t r = (i_ - q * sd);
588+
if (cond) {
589+
indexes_data[cs_curr_val + dim * nz_elems] =
590+
static_cast<indT2>(r);
591+
}
592+
i_ = q;
593+
}
589594
if (cond) {
590-
indexes_data[cs_curr_val + dim * nz_elems] =
591-
static_cast<indT2>(r);
595+
indexes_data[cs_curr_val] = static_cast<indT2>(i_);
592596
}
593-
i_ = q;
594-
}
595-
if (cond) {
596-
indexes_data[cs_curr_val] = static_cast<indT2>(i_);
597-
}
598597
});
599598
});
600599

‎dpctl/tensor/libtensor/include/kernels/clip.hpp‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@ template <typename T> T clip(const T &x, const T &min, const T &max)
6060
return min_complex(max_complex(x, min), max);
6161
}
6262
else if constexpr (std::is_floating_point_v<T> ||
63-
std::is_same_v<T, sycl::half>) {
63+
std::is_same_v<T, sycl::half>)
64+
{
6465
auto tmp = (std::isnan(x) || x > min) ? x : min;
6566
return (std::isnan(tmp) || tmp < max) ? tmp : max;
6667
}
@@ -121,7 +122,8 @@ class ClipContigFunctor
121122
sg.get_group_id()[0] * max_sgSize);
122123

123124
if (base + n_vecs * vec_sz * sgSize < nelems &&
124-
sgSize == max_sgSize) {
125+
sgSize == max_sgSize)
126+
{
125127
sycl::vec<T, vec_sz> x_vec;
126128
sycl::vec<T, vec_sz> min_vec;
127129
sycl::vec<T, vec_sz> max_vec;
@@ -155,7 +157,8 @@ class ClipContigFunctor
155157
}
156158
else {
157159
for (size_t k = base + sg.get_local_id()[0]; k < nelems;
158-
k += sgSize) {
160+
k += sgSize)
161+
{
159162
dst_p[k] = clip(x_p[k], min_p[k], max_p[k]);
160163
}
161164
}

‎dpctl/tensor/libtensor/include/kernels/copy_and_cast.hpp‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,8 @@ class ContigCopyFunctor
248248
sg.get_group_id()[0] * max_sgSize);
249249

250250
if (base + n_vecs * vec_sz * sgSize < nelems &&
251-
sgSize == max_sgSize) {
251+
sgSize == max_sgSize)
252+
{
252253
sycl::vec<srcT, vec_sz> src_vec;
253254
sycl::vec<dstT, vec_sz> dst_vec;
254255

@@ -273,7 +274,8 @@ class ContigCopyFunctor
273274
}
274275
else {
275276
for (size_t k = base + sg.get_local_id()[0]; k < nelems;
276-
k += sgSize) {
277+
k += sgSize)
278+
{
277279
dst_p[k] = fn(src_p[k]);
278280
}
279281
}
@@ -803,10 +805,7 @@ template <typename IndexerT, typename TransformerT> struct CompositionIndexer
803805
{
804806
CompositionIndexer(IndexerT f, TransformerT t) : f_(f), t_(t) {}
805807

806-
auto operator()(size_t gid) const
807-
{
808-
return f_(t_(gid));
809-
}
808+
auto operator()(size_t gid) const { return f_(t_(gid)); }
810809

811810
private:
812811
IndexerT f_;
@@ -827,10 +826,7 @@ struct RolledNDIndexer
827826
{
828827
}
829828

830-
ssize_t operator()(size_t gid) const
831-
{
832-
return compute_offset(gid);
833-
}
829+
ssize_t operator()(size_t gid) const { return compute_offset(gid); }
834830

835831
private:
836832
int nd_ = -1;

‎dpctl/tensor/libtensor/include/kernels/elementwise_functions/abs.hpp‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,8 @@ template <typename fnT, typename T> struct AbsContigFactory
141141
fnT get()
142142
{
143143
if constexpr (std::is_same_v<typename AbsOutputType<T>::value_type,
144-
void>) {
144+
void>)
145+
{
145146
fnT fn = nullptr;
146147
return fn;
147148
}
@@ -191,7 +192,8 @@ template <typename fnT, typename T> struct AbsStridedFactory
191192
fnT get()
192193
{
193194
if constexpr (std::is_same_v<typename AbsOutputType<T>::value_type,
194-
void>) {
195+
void>)
196+
{
195197
fnT fn = nullptr;
196198
return fn;
197199
}

‎dpctl/tensor/libtensor/include/kernels/elementwise_functions/acos.hpp‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,8 @@ template <typename fnT, typename T> struct AcosContigFactory
175175
fnT get()
176176
{
177177
if constexpr (std::is_same_v<typename AcosOutputType<T>::value_type,
178-
void>) {
178+
void>)
179+
{
179180
fnT fn = nullptr;
180181
return fn;
181182
}
@@ -222,7 +223,8 @@ template <typename fnT, typename T> struct AcosStridedFactory
222223
fnT get()
223224
{
224225
if constexpr (std::is_same_v<typename AcosOutputType<T>::value_type,
225-
void>) {
226+
void>)
227+
{
226228
fnT fn = nullptr;
227229
return fn;
228230
}

0 commit comments

Comments
 (0)