Skip to content

Commit 38283f6

Browse files
authored
Fix portability problems
1 parent 28f1518 commit 38283f6

5 files changed

Lines changed: 17 additions & 13 deletions

File tree

utest/test_extensions/test_cgemv_t.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ static float check_cgemv(char api, char order, char trans, blasint m, blasint n,
126126
srand_generate(data_cgemv_t.y_test, m * inc_y * 2);
127127

128128
// Copy vector y for reference funcs
129-
for (int i = 0; i < m * inc_y * 2; i++) {
129+
for (i = 0; i < m * inc_y * 2; i++) {
130130
data_cgemv_t.y_verify[i] = data_cgemv_t.y_test[i];
131131
}
132132

@@ -1129,4 +1129,4 @@ CTEST(cgemv, c_api_xerbla_invalid_order_col_major)
11291129
int passed = c_api_check_badargs(corder, ctrans, m, n, lda, inc_x, inc_y, expected_info);
11301130
ASSERT_EQUAL(TRUE, passed);
11311131
}
1132-
#endif
1132+
#endif

utest/test_extensions/test_csbmv.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ static float check_csbmv(char uplo, blasint n, blasint k, float *alpha, blasint
188188
char trans = 'N';
189189

190190
// Symmetric band packed matrix for sbmv
191-
float a[lda * n * 2];
191+
float *a = (float*) malloc(lda * n * 2 * sizeof(float));
192192

193193
// Fill symmetric packed matrix sp_matrix, vector b_test, vector c_test
194194
srand_generate(data_csbmv.sp_matrix, n * (n + 1));
@@ -216,7 +216,7 @@ static float check_csbmv(char uplo, blasint n, blasint k, float *alpha, blasint
216216
// Find the differences between output vector caculated by csbmv and cgemv
217217
for (i = 0; i < n * inc_c * 2; i++)
218218
data_csbmv.c_test[i] -= data_csbmv.c_verify[i];
219-
219+
free(a);
220220
// Find the norm of differences
221221
return BLASFUNC(scnrm2)(&n, data_csbmv.c_test, &inc_c);
222222
}
@@ -603,4 +603,4 @@ CTEST(csbmv, xerbla_lda_invalid)
603603
int passed = check_badargs(uplo, n, k, lda, inc_b, inc_c, expected_info);
604604
ASSERT_EQUAL(TRUE, passed);
605605
}
606-
#endif
606+
#endif

utest/test_extensions/test_idamin.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -402,13 +402,14 @@ CTEST(idamin, min_idx_in_vec_tail){
402402
CTEST(idamin, min_idx_in_vec_tail_inc_1){
403403
blasint i;
404404
blasint N = ELEMENTS, inc = 1;
405-
double x[ELEMENTS * inc];
405+
double *x = (double*)malloc(ELEMENTS * inc * sizeof(double));
406406
for (i = 0; i < N * inc; i ++) {
407407
x[i] = i + 1000;
408408
}
409409

410410
x[(N - 1) * inc] = 0.0f;
411411
blasint index = BLASFUNC(idamin)(&N, x, &inc);
412+
free(x);
412413
ASSERT_EQUAL(N, index);
413414
}
414415

@@ -775,13 +776,14 @@ CTEST(idamin, c_api_min_idx_in_vec_tail){
775776
CTEST(idamin, c_api_min_idx_in_vec_tail_inc_1){
776777
blasint i;
777778
blasint N = ELEMENTS, inc = 1;
778-
double x[ELEMENTS * inc];
779+
double *x = (double*) malloc(ELEMENTS * inc * sizeof(double));
779780
for (i = 0; i < N * inc; i ++) {
780781
x[i] = i + 1000;
781782
}
782783

783784
x[(N - 1) * inc] = 0.0;
784785
blasint index = cblas_idamin(N, x, inc);
786+
free(x);
785787
ASSERT_EQUAL(N - 1, index);
786788
}
787-
#endif
789+
#endif

utest/test_extensions/test_isamin.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -402,13 +402,14 @@ CTEST(isamin, min_idx_in_vec_tail){
402402
CTEST(isamin, min_idx_in_vec_tail_inc_1){
403403
blasint i;
404404
blasint N = ELEMENTS, inc = 1;
405-
float x[ELEMENTS * inc];
405+
float *x = (float*) (ELEMENTS * inc * sizeof(float));
406406
for (i = 0; i < N * inc; i ++) {
407407
x[i] = i + 1000;
408408
}
409409

410410
x[(N - 1) * inc] = 0.0f;
411411
blasint index = BLASFUNC(isamin)(&N, x, &inc);
412+
free(x);
412413
ASSERT_EQUAL(N, index);
413414
}
414415

@@ -775,13 +776,14 @@ CTEST(isamin, c_api_min_idx_in_vec_tail){
775776
CTEST(isamin, c_api_min_idx_in_vec_tail_inc_1){
776777
blasint i;
777778
blasint N = ELEMENTS, inc = 1;
778-
float x[ELEMENTS * inc];
779+
float *x = (float*)malloc(ELEMENTS * inc * sizeof(float));
779780
for (i = 0; i < N * inc; i ++) {
780781
x[i] = i + 1000;
781782
}
782783

783784
x[(N - 1) * inc] = 0.0f;
784785
blasint index = cblas_isamin(N, x, inc);
786+
free(x);
785787
ASSERT_EQUAL(N - 1, index);
786788
}
787-
#endif
789+
#endif

utest/test_extensions/test_zgemv_t.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ static double check_zgemv(char api, char order, char trans, blasint m, blasint n
126126
drand_generate(data_zgemv_t.y_test, m * inc_y * 2);
127127

128128
// Copy vector y for reference funcs
129-
for (int i = 0; i < m * inc_y * 2; i++)
129+
for (i = 0; i < m * inc_y * 2; i++)
130130
{
131131
data_zgemv_t.y_verify[i] = data_zgemv_t.y_test[i];
132132
}
@@ -1133,4 +1133,4 @@ CTEST(zgemv, c_api_xerbla_invalid_order_col_major)
11331133
int passed = c_api_check_badargs(corder, ctrans, m, n, lda, inc_x, inc_y, expected_info);
11341134
ASSERT_EQUAL(TRUE, passed);
11351135
}
1136-
#endif
1136+
#endif

0 commit comments

Comments
 (0)