Skip to content

Commit 4e0db43

Browse files
xctanxctan
committed
rename more aarch64 to repack
1 parent 40ddb1e commit 4e0db43

File tree

5 files changed

+29
-29
lines changed

5 files changed

+29
-29
lines changed

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ ifdef LLAMA_SERVER_SSL
367367
endif
368368

369369
ifndef GGML_NO_CPU_AARCH64
370-
MK_CPPFLAGS += -DGGML_USE_CPU_AARCH64
370+
MK_CPPFLAGS += -DGGML_USE_CPU_REPACK
371371
endif
372372

373373
# warnings

‎ggml/src/ggml-cpu/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ function(ggml_add_cpu_backend_variant_impl tag_name)
413413
endif()
414414

415415
if (GGML_CPU_REPACK)
416-
target_compile_definitions(${GGML_CPU_NAME} PRIVATE GGML_USE_CPU_AARCH64)
416+
target_compile_definitions(${GGML_CPU_NAME} PRIVATE GGML_USE_CPU_REPACK)
417417
endif()
418418

419419
if (GGML_CPU_KLEIDIAI)

‎ggml/src/ggml-cpu/ggml-cpu.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ std::vector<ggml_backend_buffer_type_t>& ggml_backend_cpu_get_extra_buffers_type
5151
}
5252
#endif
5353

54-
#ifdef GGML_USE_CPU_AARCH64
55-
if (ggml_backend_cpu_aarch64_buffer_type()) {
56-
bufts.push_back(ggml_backend_cpu_aarch64_buffer_type());
54+
#ifdef GGML_USE_CPU_REPACK
55+
if (ggml_backend_cpu_repack_buffer_type()) {
56+
bufts.push_back(ggml_backend_cpu_repack_buffer_type());
5757
}
5858
#endif
5959

@@ -596,8 +596,8 @@ static ggml_backend_feature * ggml_backend_cpu_get_features(ggml_backend_reg_t r
596596
#ifdef GGML_USE_CPU_KLEIDIAI
597597
features.push_back({ "KLEIDIAI", "1" });
598598
#endif
599-
#ifdef GGML_USE_CPU_AARCH64
600-
features.push_back({ "AARCH64_REPACK", "1" });
599+
#ifdef GGML_USE_CPU_REPACK
600+
features.push_back({ "REPACK", "1" });
601601
#endif
602602

603603
features.push_back({ nullptr, nullptr });

‎ggml/src/ggml-cpu/repack.cpp

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1421,7 +1421,7 @@ static const tensor_traits<block_iq4_nl, 4, 4, GGML_TYPE_Q8_0> iq4_nl_4x4_q8_0;
14211421

14221422
} // namespace ggml::cpu::repack
14231423

1424-
static const ggml::cpu::tensor_traits * ggml_aarch64_get_optimal_repack_type(const struct ggml_tensor * cur) {
1424+
static const ggml::cpu::tensor_traits * ggml_repack_get_optimal_repack_type(const struct ggml_tensor * cur) {
14251425
if (cur->type == GGML_TYPE_Q4_0) {
14261426
if (ggml_cpu_has_avx2() || (ggml_cpu_has_sve() && ggml_cpu_has_matmul_int8() && ggml_cpu_get_sve_cnt() == QK8_0)) {
14271427
if (cur->ne[1] % 8 == 0) {
@@ -1455,14 +1455,14 @@ static const ggml::cpu::tensor_traits * ggml_aarch64_get_optimal_repack_type(con
14551455
return nullptr;
14561456
}
14571457

1458-
static enum ggml_status ggml_backend_cpu_aarch64_buffer_init_tensor(ggml_backend_buffer_t buffer, struct ggml_tensor * tensor) {
1459-
tensor->extra = (void *) const_cast<ggml::cpu::tensor_traits *>(ggml_aarch64_get_optimal_repack_type(tensor));
1458+
static enum ggml_status ggml_backend_cpu_repack_buffer_init_tensor(ggml_backend_buffer_t buffer, struct ggml_tensor * tensor) {
1459+
tensor->extra = (void *) const_cast<ggml::cpu::tensor_traits *>(ggml_repack_get_optimal_repack_type(tensor));
14601460

14611461
GGML_UNUSED(buffer);
14621462
return GGML_STATUS_SUCCESS;
14631463
}
14641464

1465-
static void ggml_backend_cpu_aarch64_buffer_set_tensor(ggml_backend_buffer_t buffer, struct ggml_tensor * tensor,
1465+
static void ggml_backend_cpu_repack_buffer_set_tensor(ggml_backend_buffer_t buffer, struct ggml_tensor * tensor,
14661466
const void * data, size_t offset, size_t size) {
14671467
GGML_ASSERT(offset == 0);
14681468
GGML_ASSERT(size == ggml_nbytes(tensor));
@@ -1474,28 +1474,28 @@ static void ggml_backend_cpu_aarch64_buffer_set_tensor(ggml_backend_buffer_t buf
14741474
GGML_UNUSED(buffer);
14751475
}
14761476

1477-
static const char * ggml_backend_cpu_aarch64_buffer_type_get_name(ggml_backend_buffer_type_t buft) {
1478-
return "CPU_AARCH64";
1477+
static const char * ggml_backend_cpu_repack_buffer_type_get_name(ggml_backend_buffer_type_t buft) {
1478+
return "CPU_REPACK";
14791479

14801480
GGML_UNUSED(buft);
14811481
}
14821482

1483-
static ggml_backend_buffer_t ggml_backend_cpu_aarch64_buffer_type_alloc_buffer(ggml_backend_buffer_type_t buft, size_t size) {
1483+
static ggml_backend_buffer_t ggml_backend_cpu_repack_buffer_type_alloc_buffer(ggml_backend_buffer_type_t buft, size_t size) {
14841484
ggml_backend_buffer_t buffer = ggml_backend_buft_alloc_buffer(ggml_backend_cpu_buffer_type(), size);
14851485

14861486
if (buffer == nullptr) {
14871487
return nullptr;
14881488
}
14891489

14901490
buffer->buft = buft;
1491-
buffer->iface.init_tensor = ggml_backend_cpu_aarch64_buffer_init_tensor;
1492-
buffer->iface.set_tensor = ggml_backend_cpu_aarch64_buffer_set_tensor;
1491+
buffer->iface.init_tensor = ggml_backend_cpu_repack_buffer_init_tensor;
1492+
buffer->iface.set_tensor = ggml_backend_cpu_repack_buffer_set_tensor;
14931493
buffer->iface.get_tensor = nullptr;
14941494
buffer->iface.cpy_tensor = nullptr;
14951495
return buffer;
14961496
}
14971497

1498-
static size_t ggml_backend_cpu_aarch64_buffer_type_get_alignment(ggml_backend_buffer_type_t buft) {
1498+
static size_t ggml_backend_cpu_repack_buffer_type_get_alignment(ggml_backend_buffer_type_t buft) {
14991499
return TENSOR_ALIGNMENT;
15001500

15011501
GGML_UNUSED(buft);
@@ -1507,8 +1507,8 @@ class extra_buffer_type : ggml::cpu::extra_buffer_type {
15071507
if ( op->op == GGML_OP_MUL_MAT &&
15081508
op->src[0]->buffer &&
15091509
(ggml_n_dims(op->src[0]) == 2) &&
1510-
op->src[0]->buffer->buft == ggml_backend_cpu_aarch64_buffer_type() &&
1511-
ggml_aarch64_get_optimal_repack_type(op->src[0])
1510+
op->src[0]->buffer->buft == ggml_backend_cpu_repack_buffer_type() &&
1511+
ggml_repack_get_optimal_repack_type(op->src[0])
15121512
) {
15131513
if (op->src[1]->buffer && !ggml_backend_buft_is_host(op->src[1]->buffer->buft)) {
15141514
return false;
@@ -1523,8 +1523,8 @@ class extra_buffer_type : ggml::cpu::extra_buffer_type {
15231523
} else if (op->op == GGML_OP_MUL_MAT_ID
15241524
&& op->src[0]->buffer
15251525
&& (ggml_n_dims(op->src[0]) == 3)
1526-
&& op->src[0]->buffer->buft == ggml_backend_cpu_aarch64_buffer_type()
1527-
&& ggml_aarch64_get_optimal_repack_type(op->src[0])
1526+
&& op->src[0]->buffer->buft == ggml_backend_cpu_repack_buffer_type()
1527+
&& ggml_repack_get_optimal_repack_type(op->src[0])
15281528
) {
15291529
if (op->src[1]->buffer && !ggml_backend_buft_is_host(op->src[1]->buffer->buft)) {
15301530
return false;
@@ -1541,7 +1541,7 @@ class extra_buffer_type : ggml::cpu::extra_buffer_type {
15411541

15421542
ggml::cpu::tensor_traits * get_tensor_traits(const struct ggml_tensor * op) override {
15431543
if (op->op == GGML_OP_MUL_MAT || op->op == GGML_OP_MUL_MAT_ID) {
1544-
if (op->src[0]->buffer && op->src[0]->buffer->buft == ggml_backend_cpu_aarch64_buffer_type()) {
1544+
if (op->src[0]->buffer && op->src[0]->buffer->buft == ggml_backend_cpu_repack_buffer_type()) {
15451545
return (ggml::cpu::tensor_traits *) op->src[0]->extra;
15461546
}
15471547
}
@@ -1550,12 +1550,12 @@ class extra_buffer_type : ggml::cpu::extra_buffer_type {
15501550
};
15511551
} // namespace ggml::cpu::repack
15521552

1553-
ggml_backend_buffer_type_t ggml_backend_cpu_aarch64_buffer_type(void) {
1554-
static struct ggml_backend_buffer_type ggml_backend_cpu_buffer_type_aarch64 = {
1553+
ggml_backend_buffer_type_t ggml_backend_cpu_repack_buffer_type(void) {
1554+
static struct ggml_backend_buffer_type ggml_backend_cpu_buffer_type_repack = {
15551555
/* .iface = */ {
1556-
/* .get_name = */ ggml_backend_cpu_aarch64_buffer_type_get_name,
1557-
/* .alloc_buffer = */ ggml_backend_cpu_aarch64_buffer_type_alloc_buffer,
1558-
/* .get_alignment = */ ggml_backend_cpu_aarch64_buffer_type_get_alignment,
1556+
/* .get_name = */ ggml_backend_cpu_repack_buffer_type_get_name,
1557+
/* .alloc_buffer = */ ggml_backend_cpu_repack_buffer_type_alloc_buffer,
1558+
/* .get_alignment = */ ggml_backend_cpu_repack_buffer_type_get_alignment,
15591559
/* .get_max_size = */ nullptr, // defaults to SIZE_MAX
15601560
/* .get_alloc_size = */ nullptr, // defaults to ggml_nbytes
15611561
/* .is_host = */ nullptr,
@@ -1564,5 +1564,5 @@ ggml_backend_buffer_type_t ggml_backend_cpu_aarch64_buffer_type(void) {
15641564
/* .context = */ new ggml::cpu::repack::extra_buffer_type(),
15651565
};
15661566

1567-
return &ggml_backend_cpu_buffer_type_aarch64;
1567+
return &ggml_backend_cpu_buffer_type_repack;
15681568
}

‎ggml/src/ggml-cpu/repack.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
// GGML internal header
1010

11-
ggml_backend_buffer_type_t ggml_backend_cpu_aarch64_buffer_type(void);
11+
ggml_backend_buffer_type_t ggml_backend_cpu_repack_buffer_type(void);
1212

1313
template <int K> constexpr int QK_0() {
1414
if constexpr (K == 4) {

0 commit comments

Comments
 (0)