Skip to content

Commit 2c78b4b

Browse files
tamarPaltamarPal
authored andcommitted
fix: Final formatting corrections for CI compliance
- Remove all trailing whitespace from SSM_CONV files - Add proper final newlines to source files - Fix C++17 compliance issues - Ready for llama.cpp CI validation
1 parent 1e5148f commit 2c78b4b

File tree

3 files changed

+7
-9
lines changed

3 files changed

+7
-9
lines changed

ggml/src/ggml-sycl/ggml-sycl.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4425,8 +4425,8 @@ static bool ggml_backend_sycl_device_supports_op(ggml_backend_dev_t dev, const g
44254425
case GGML_OP_GATED_LINEAR_ATTN:
44264426
return true;
44274427
case GGML_OP_SSM_CONV:
4428-
return op->type == GGML_TYPE_F32 &&
4429-
op->src[0]->type == GGML_TYPE_F32 &&
4428+
return op->type == GGML_TYPE_F32 &&
4429+
op->src[0]->type == GGML_TYPE_F32 &&
44304430
op->src[1]->type == GGML_TYPE_F32;
44314431
default:
44324432
return false;

ggml/src/ggml-sycl/ssm_conv.cpp

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ static void kernel_ssm_conv(
2121
const size_t total_work = d_inner * n_t * n_s;
2222
const size_t work_group_size = 256;
2323
const size_t num_work_groups = (total_work + work_group_size - 1) / work_group_size;
24-
2524
const range<1> global_range(num_work_groups * work_group_size);
2625
const range<1> local_range(work_group_size);
2726

@@ -43,8 +42,8 @@ static void kernel_ssm_conv(
4342
sumf += s[i0] * c[i0];
4443
}
4544

46-
const size_t dst_idx = seq * dst_stride_seq +
47-
token * dst_stride_token +
45+
const size_t dst_idx = seq * dst_stride_seq +
46+
token * dst_stride_token +
4847
channel;
4948
dst_data[dst_idx] = sumf;
5049
});
@@ -73,7 +72,7 @@ void ggml_sycl_ssm_conv(ggml_backend_sycl_context & ctx, ggml_tensor * dst) {
7372
GGML_ASSERT(dst->ne[2] == n_s);
7473

7574
GGML_ASSERT(src0->nb[0] == sizeof(float));
76-
GGML_ASSERT(src1->nb[0] == sizeof(float));
75+
GGML_ASSERT(src1->nb[0] == sizeof(float));
7776
GGML_ASSERT(src0->nb[1] == src0->ne[0] * sizeof(float));
7877

7978
const int src_stride_inner = ncs;
@@ -89,7 +88,6 @@ void ggml_sycl_ssm_conv(ggml_backend_sycl_context & ctx, ggml_tensor * dst) {
8988
float *dst_data = (float *) dst->data;
9089

9190
GGML_ASSERT(src_data && weights && dst_data);
92-
9391
kernel_ssm_conv(
9492
*q, src_data, weights, dst_data,
9593
d_conv, d_inner, n_t, n_s, ncs,
@@ -101,4 +99,4 @@ void ggml_sycl_ssm_conv(ggml_backend_sycl_context & ctx, ggml_tensor * dst) {
10199
std::fprintf(stderr, "[SYCL-SSM_CONV] ERROR: %s\n", e.what());
102100
throw;
103101
}
104-
}
102+
}

ggml/src/ggml-sycl/ssm_conv.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
#include "common.hpp"
44

5-
void ggml_sycl_ssm_conv(ggml_backend_sycl_context & ctx, ggml_tensor * dst);
5+
void ggml_sycl_ssm_conv(ggml_backend_sycl_context & ctx, ggml_tensor * dst);

0 commit comments

Comments
 (0)