Skip to content

Commit 6f06849

Browse files
committed
CANN: Add x86 build ci
1 parent b0c75ac commit 6f06849

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1766,16 +1766,17 @@ jobs:
17661766
if: ${{ github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'Ascend NPU') }}
17671767
defaults:
17681768
run:
1769-
shell: bash -el {0}
1770-
runs-on: ubuntu-24.04-arm
1769+
shell: bash -el {0}
17711770
strategy:
17721771
matrix:
1772+
arch: [x86, aarch64]
17731773
cann:
17741774
- '8.1.RC1.alpha001-910b-openeuler22.03-py3.10'
17751775
device:
17761776
- 'ascend910b3'
17771777
build:
17781778
- 'Release'
1779+
runs-on: ${{ matrix.arch == 'aarch64' && 'ubuntu-24.04-arm' || 'ubuntu-24.04' }}
17791780
container: ascendai/cann:${{ matrix.cann }}
17801781
steps:
17811782
- name: Checkout

ggml/src/ggml-cann/ggml-cann.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,7 @@ struct ggml_cann_pool_buf_prio : public ggml_cann_pool {
329329
* @param size Size of the buffer to free.
330330
*/
331331
void free(void* ptr, size_t size) override {
332+
GGML_UNUSED(size);
332333
auto it = buffer_pool.find(ptr);
333334
if (it == buffer_pool.end()) {
334335
GGML_ABORT("cann pool[%d]: buffer %p not found in pool\n", device, ptr);
@@ -531,6 +532,7 @@ struct ggml_cann_pool_buf : public ggml_cann_pool {
531532
* @param size Size of the buffer to free.
532533
*/
533534
void free(void* ptr, size_t size) override {
535+
GGML_UNUSED(size);
534536
for (int i = 0; i < MAX_BUFFERS; ++i) {
535537
ggml_cann_buffer& b = buffer_pool[i];
536538
if (b.ptr != ptr) {

0 commit comments

Comments
 (0)