Skip to content

Commit b34c57f

Browse files
ihb2032ihb2032
committed
fix: fix clang-tidy
1 parent e7d9d5f commit b34c57f

27 files changed

Lines changed: 309 additions & 658 deletions

‎src/ailego/math/euclidean_distance_matrix.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -480,6 +480,8 @@ struct EuclideanDistanceMatrix<float, 1, 1> {
480480
static void Compute(const ValueType *m, const ValueType *q, size_t dim,
481481
float *out);
482482
};
483+
484+
483485
//--------------------------------------------------
484486
// Sparse
485487
//--------------------------------------------------

‎src/ailego/math/euclidean_distance_matrix_fp16_dispatch.cc‎

Lines changed: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ float SquaredEuclideanDistanceFp16NEON(const Float16 *lhs, const Float16 *rhs,
2626
#if defined(__riscv_zvfh)
2727
float SquaredEuclideanDistanceRVV(const Float16 *lhs, const Float16 *rhs,
2828
size_t size);
29-
float EuclideanDistanceRVV(const Float16 *lhs, const Float16 *rhs, size_t size);
3029
#endif
3130

3231
#if defined(__AVX512FP16__)
@@ -47,21 +46,15 @@ float SquaredEuclideanDistanceFp16AVX(const Float16 *lhs, const Float16 *rhs,
4746
float SquaredEuclideanDistanceFp16Scalar(const Float16 *lhs, const Float16 *rhs,
4847
size_t size);
4948

50-
#if (defined(__F16C__) && defined(__AVX__)) || \
51-
(defined(__ARM_NEON) && defined(__aarch64__)) || defined(__riscv_zvfh)
5249
//! Compute the distance between matrix and query (FP16, M=1, N=1)
5350
void SquaredEuclideanDistanceMatrix<Float16, 1, 1>::Compute(const ValueType *m,
5451
const ValueType *q,
5552
size_t dim,
5653
float *out) {
57-
#if defined(__riscv_zvfh)
58-
if (zvec::ailego::internal::CpuFeatures::static_flags_.RISCV_ZVFH) {
59-
*out = SquaredEuclideanDistanceRVV(m, q, dim);
60-
return;
61-
}
62-
#endif
6354
#if defined(__ARM_NEON)
6455
*out = SquaredEuclideanDistanceFp16NEON(m, q, dim);
56+
#elif defined(__riscv_zvfh)
57+
*out = SquaredEuclideanDistanceRVV(m, q, dim);
6558
#else
6659
#if defined(__AVX512FP16__)
6760
if (zvec::ailego::internal::CpuFeatures::static_flags_.AVX512_FP16) {
@@ -83,30 +76,17 @@ void SquaredEuclideanDistanceMatrix<Float16, 1, 1>::Compute(const ValueType *m,
8376
}
8477
#endif
8578
*out = SquaredEuclideanDistanceFp16Scalar(m, q, dim);
79+
8680
#endif //__ARM_NEON
8781
}
8882

8983
//! Compute the distance between matrix and query (FP16, M=1, N=1)
9084
void EuclideanDistanceMatrix<Float16, 1, 1>::Compute(const ValueType *m,
9185
const ValueType *q,
9286
size_t dim, float *out) {
93-
#if defined(__riscv_zvfh)
94-
if (zvec::ailego::internal::CpuFeatures::static_flags_.RISCV_ZVFH) {
95-
*out = EuclideanDistanceRVV(m, q, dim);
96-
return;
97-
}
98-
#if !defined(__ARM_NEON) && !defined(__AVX__)
99-
float sum = 0.0f;
100-
for (size_t i = 0; i < dim; ++i) {
101-
sum += MathHelper::SquaredDifference(m[i], q[i]);
102-
}
103-
*out = std::sqrt(sum);
104-
return;
105-
#endif
106-
#endif
10787
SquaredEuclideanDistanceMatrix<Float16, 1, 1>::Compute(m, q, dim, out);
10888
*out = std::sqrt(*out);
10989
}
11090

11191
} // namespace ailego
112-
} // namespace zvec
92+
} // namespace zvec

‎src/ailego/math/euclidean_distance_matrix_fp16_rvv.cc‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#include <cmath>
1615
#include <zvec/ailego/internal/platform.h>
1716
#include "euclidean_distance_matrix.h"
1817

@@ -53,11 +52,6 @@ float SquaredEuclideanDistanceRVV(const Float16 *lhs, const Float16 *rhs,
5352
return SquaredEuclideanDistanceRVVImpl(lhs, rhs, size);
5453
}
5554

56-
float EuclideanDistanceRVV(const Float16 *lhs, const Float16 *rhs,
57-
size_t size) {
58-
return std::sqrt(SquaredEuclideanDistanceRVVImpl(lhs, rhs, size));
59-
}
60-
6155
#endif // __riscv_zvfh
6256

6357
} // namespace ailego

‎src/ailego/math/euclidean_distance_matrix_fp32_dispatch.cc‎

Lines changed: 10 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,16 @@
1818
namespace zvec {
1919
namespace ailego {
2020

21-
#if defined(__riscv_vector)
22-
float SquaredEuclideanDistanceRVV(const float *lhs, const float *rhs,
23-
size_t size);
24-
float EuclideanDistanceRVV(const float *lhs, const float *rhs, size_t size);
25-
#endif
26-
2721
#if defined(__ARM_NEON)
2822
void SquaredEuclideanDistanceFp32NEON(const float *lhs, const float *rhs,
2923
size_t size, float *out);
3024
#endif
3125

26+
#if defined(__riscv_vector)
27+
float SquaredEuclideanDistanceRVV(const float *lhs, const float *rhs,
28+
size_t size);
29+
#endif
30+
3231
#if defined(__AVX512F__)
3332
float SquaredEuclideanDistanceFp32AVX512(const float *lhs, const float *rhs,
3433
size_t size);
@@ -50,31 +49,22 @@ float SquaredEuclideanDistanceFp32Scalar(const float *lhs, const float *rhs,
5049
//-----------------------------------------------------------
5150
// SquaredEuclideanDistance
5251
//-----------------------------------------------------------
53-
#if defined(__SSE__) || defined(__ARM_NEON) || defined(__riscv_vector)
5452
//! Compute the distance between matrix and query (FP32, M=1, N=1)
5553
void SquaredEuclideanDistanceMatrix<float, 1, 1>::Compute(const ValueType *m,
5654
const ValueType *q,
5755
size_t dim,
5856
float *out) {
59-
#if defined(__riscv_vector)
60-
if (zvec::ailego::internal::CpuFeatures::static_flags_.RISCV_VECTOR) {
61-
*out = SquaredEuclideanDistanceRVV(m, q, dim);
62-
return;
63-
}
64-
#endif // __riscv_vector
65-
6657
#if defined(__ARM_NEON)
6758
SquaredEuclideanDistanceFp32NEON(m, q, dim, out);
68-
return;
69-
#endif // __ARM_NEON
70-
59+
#elif defined(__riscv_vector)
60+
*out = SquaredEuclideanDistanceRVV(m, q, dim);
61+
#else
7162
#if defined(__AVX512F__)
7263
if (zvec::ailego::internal::CpuFeatures::static_flags_.AVX512F) {
7364
*out = SquaredEuclideanDistanceFp32AVX512(m, q, dim);
7465
return;
7566
}
7667
#endif // __AVX512F__
77-
7868
#if defined(__AVX__)
7969
if (zvec::ailego::internal::CpuFeatures::static_flags_.AVX) {
8070
*out = SquaredEuclideanDistanceFp32AVX(m, q, dim);
@@ -88,10 +78,9 @@ void SquaredEuclideanDistanceMatrix<float, 1, 1>::Compute(const ValueType *m,
8878
return;
8979
}
9080
#endif // __SSE__
91-
9281
*out = SquaredEuclideanDistanceFp32Scalar(m, q, dim);
82+
#endif // __ARM_NEON
9383
}
94-
#endif // __SSE__ || __ARM_NEON || __riscv_vector
9584

9685
//-----------------------------------------------------------
9786
// EuclideanDistance
@@ -100,16 +89,9 @@ void SquaredEuclideanDistanceMatrix<float, 1, 1>::Compute(const ValueType *m,
10089
void EuclideanDistanceMatrix<float, 1, 1>::Compute(const ValueType *m,
10190
const ValueType *q,
10291
size_t dim, float *out) {
103-
#if defined(__riscv_vector)
104-
if (zvec::ailego::internal::CpuFeatures::static_flags_.RISCV_VECTOR) {
105-
*out = EuclideanDistanceRVV(m, q, dim);
106-
return;
107-
}
108-
#endif // __riscv_vector
109-
11092
SquaredEuclideanDistanceMatrix<float, 1, 1>::Compute(m, q, dim, out);
11193
*out = std::sqrt(*out);
11294
}
11395

11496
} // namespace ailego
115-
} // namespace zvec
97+
} // namespace zvec

‎src/ailego/math/euclidean_distance_matrix_fp32_rvv.cc‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#include <cmath>
1615
#include <zvec/ailego/internal/platform.h>
1716
#include "distance_matrix_euclidean_utility.i"
1817
#include "euclidean_distance_matrix.h"
@@ -53,11 +52,6 @@ float SquaredEuclideanDistanceRVV(const float *lhs, const float *rhs,
5352
return SquaredEuclideanDistanceRVVImpl(lhs, rhs, size);
5453
}
5554

56-
//! Euclidean Distance
57-
float EuclideanDistanceRVV(const float *lhs, const float *rhs, size_t size) {
58-
return std::sqrt(SquaredEuclideanDistanceRVVImpl(lhs, rhs, size));
59-
}
60-
6155
#endif // __riscv_vector
6256

6357
} // namespace ailego

‎src/ailego/math/euclidean_distance_matrix_int8_dispatch.cc‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ namespace ailego {
2121
#if defined(__riscv_vector)
2222
float SquaredEuclideanDistanceRVV(const int8_t *lhs, const int8_t *rhs,
2323
size_t size);
24-
float EuclideanDistanceRVV(const int8_t *lhs, const int8_t *rhs, size_t size);
2524
#endif
2625

2726
#if defined(__AVX2__)
@@ -43,11 +42,8 @@ void SquaredEuclideanDistanceMatrix<int8_t, 1, 1>::Compute(const ValueType *m,
4342
size_t dim,
4443
float *out) {
4544
#if defined(__riscv_vector)
46-
if (zvec::ailego::internal::CpuFeatures::static_flags_.RISCV_VECTOR) {
47-
*out = SquaredEuclideanDistanceRVV(m, q, dim);
48-
return;
49-
}
50-
#endif
45+
*out = SquaredEuclideanDistanceRVV(m, q, dim);
46+
#else
5147
#if defined(__AVX2__)
5248
if (zvec::ailego::internal::CpuFeatures::static_flags_.AVX2) {
5349
*out = SquaredEuclideanDistanceInt8AVX2(m, q, dim);
@@ -63,21 +59,16 @@ void SquaredEuclideanDistanceMatrix<int8_t, 1, 1>::Compute(const ValueType *m,
6359
#endif
6460

6561
*out = SquaredEuclideanDistanceInt8Scalar(m, q, dim);
62+
#endif // __riscv_vector
6663
}
6764

6865
//! Compute the distance between matrix and query (INT8, M=1, N=1)
6966
void EuclideanDistanceMatrix<int8_t, 1, 1>::Compute(const ValueType *m,
7067
const ValueType *q,
7168
size_t dim, float *out) {
72-
#if defined(__riscv_vector)
73-
if (zvec::ailego::internal::CpuFeatures::static_flags_.RISCV_VECTOR) {
74-
*out = EuclideanDistanceRVV(m, q, dim);
75-
return;
76-
}
77-
#endif
7869
SquaredEuclideanDistanceMatrix<int8_t, 1, 1>::Compute(m, q, dim, out);
7970
*out = std::sqrt(*out);
8071
}
8172

8273
} // namespace ailego
83-
} // namespace zvec
74+
} // namespace zvec

‎src/ailego/math/euclidean_distance_matrix_int8_rvv.cc‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#include <cmath>
1615
#include <zvec/ailego/internal/platform.h>
1716
#include "euclidean_distance_matrix.h"
1817

@@ -51,10 +50,6 @@ float SquaredEuclideanDistanceRVV(const int8_t *lhs, const int8_t *rhs,
5150
return SquaredEuclideanDistanceRVVImpl(lhs, rhs, size);
5251
}
5352

54-
float EuclideanDistanceRVV(const int8_t *lhs, const int8_t *rhs, size_t size) {
55-
return std::sqrt(SquaredEuclideanDistanceRVVImpl(lhs, rhs, size));
56-
}
57-
5853
#endif // __riscv_vector
5954

6055
} // namespace ailego

‎src/ailego/math/inner_product_matrix_fp16_dispatch.cc‎

Lines changed: 18 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -61,73 +61,65 @@ float MinusInnerProductFp16Scalar(const Float16 *lhs, const Float16 *rhs,
6161
void InnerProductMatrix<Float16, 1, 1>::Compute(const ValueType *m,
6262
const ValueType *q, size_t dim,
6363
float *out) {
64-
#if defined(__riscv_zvfh)
65-
if (zvec::ailego::internal::CpuFeatures::static_flags_.RISCV_ZVFH) {
66-
*out = InnerProductRVV(m, q, dim);
67-
return;
68-
}
69-
#endif // __riscv_zvfh
70-
7164
#if defined(__ARM_NEON)
7265
*out = InnerProductFp16NEON(m, q, dim);
66+
#elif defined(__riscv_zvfh)
67+
*out = InnerProductRVV(m, q, dim);
7368
#else
7469
#if defined(__AVX512FP16__)
7570
if (zvec::ailego::internal::CpuFeatures::static_flags_.AVX512_FP16) {
7671
*out = InnerProductFp16AVX512FP16(m, q, dim);
7772
return;
7873
}
79-
#endif // __AVX512FP16__
74+
#endif //__AVX512FP16__
8075
#if defined(__AVX512F__)
8176
if (zvec::ailego::internal::CpuFeatures::static_flags_.AVX512F) {
8277
*out = InnerProductFp16AVX512(m, q, dim);
8378
return;
8479
}
85-
#endif // __AVX512F__
80+
#endif //__AVX512F__
8681
#if defined(__AVX__)
8782
if (zvec::ailego::internal::CpuFeatures::static_flags_.AVX) {
8883
*out = InnerProductFp16AVX(m, q, dim);
8984
return;
9085
}
91-
#endif // __AVX__
86+
#endif //__AVX__
9287
*out = InnerProductFp16Scalar(m, q, dim);
93-
#endif // __ARM_NEON
88+
89+
#endif //__ARM_NEON
9490
}
9591

9692
//! Compute the distance between matrix and query (FP16, M=1, N=1)
9793
void MinusInnerProductMatrix<Float16, 1, 1>::Compute(const ValueType *m,
9894
const ValueType *q,
9995
size_t dim, float *out) {
100-
#if defined(__riscv_zvfh)
101-
if (zvec::ailego::internal::CpuFeatures::static_flags_.RISCV_ZVFH) {
102-
*out = MinusInnerProductRVV(m, q, dim);
103-
return;
104-
}
105-
#endif // __riscv_zvfh
106-
10796
#if defined(__ARM_NEON)
10897
*out = MinusInnerProductFp16NEON(m, q, dim);
98+
#elif defined(__riscv_zvfh)
99+
*out = MinusInnerProductRVV(m, q, dim);
109100
#else
110101
#if defined(__AVX512FP16__)
111102
if (zvec::ailego::internal::CpuFeatures::static_flags_.AVX512_FP16) {
112103
*out = MinusInnerProductFp16AVX512FP16(m, q, dim);
113104
return;
114105
}
115-
#endif // __AVX512FP16__
106+
#endif //__AVX512FP16__
116107
#if defined(__AVX512F__)
117108
if (zvec::ailego::internal::CpuFeatures::static_flags_.AVX512F) {
118109
*out = MinusInnerProductFp16AVX512(m, q, dim);
119110
return;
120111
}
121-
#endif // __AVX512F__
112+
#endif //__AVX512F__
122113
#if defined(__AVX__)
123114
if (zvec::ailego::internal::CpuFeatures::static_flags_.AVX) {
124115
*out = MinusInnerProductFp16AVX(m, q, dim);
125116
return;
126117
}
127-
#endif // __AVX__
118+
#endif //__AVX__
128119

129120
*out = MinusInnerProductFp16Scalar(m, q, dim);
130-
#endif // __ARM_NEON
121+
122+
#endif //__ARM_NEON
131123
}
132124

133125
//--------------------------------------------------
@@ -140,7 +132,7 @@ float InnerProductSparseInSegmentFp16AVX512FP16(uint32_t m_sparse_count,
140132
uint32_t q_sparse_count,
141133
const uint16_t *q_sparse_index,
142134
const Float16 *q_sparse_value);
143-
#endif // __AVX512FP16__
135+
#endif //__AVX512FP16__
144136

145137
#if defined(__AVX__)
146138
float InnerProductSparseInSegmentFp16AVX(uint32_t m_sparse_count,
@@ -149,7 +141,7 @@ float InnerProductSparseInSegmentFp16AVX(uint32_t m_sparse_count,
149141
uint32_t q_sparse_count,
150142
const uint16_t *q_sparse_index,
151143
const Float16 *q_sparse_value);
152-
#endif // __AVX__
144+
#endif //__AVX__
153145

154146
float InnerProductSparseInSegmentFp16Scalar(uint32_t m_sparse_count,
155147
const uint16_t *m_sparse_index,
@@ -179,14 +171,14 @@ float ComputeInnerProductSparseInSegmentFp16(uint32_t m_sparse_count,
179171
m_sparse_count, m_sparse_index, m_sparse_value, q_sparse_count,
180172
q_sparse_index, q_sparse_value);
181173
}
182-
#endif // __AVX512FP16__
174+
#endif
183175
#if defined(__AVX__)
184176
if (zvec::ailego::internal::CpuFeatures::static_flags_.AVX) {
185177
return InnerProductSparseInSegmentFp16AVX(m_sparse_count, m_sparse_index,
186178
m_sparse_value, q_sparse_count,
187179
q_sparse_index, q_sparse_value);
188180
}
189-
#endif // __AVX__
181+
#endif
190182
return InnerProductSparseInSegmentFp16Scalar(m_sparse_count, m_sparse_index,
191183
m_sparse_value, q_sparse_count,
192184
q_sparse_index, q_sparse_value);

0 commit comments

Comments
 (0)