From 8dbbe2a4c760b30fd95e94973eef84979caf3204 Mon Sep 17 00:00:00 2001 From: Brendan O'Donoghue Date: Thu, 27 Jun 2024 10:35:20 -0600 Subject: [PATCH] switch to using blas amax instead --- include/scs_blas.h | 4 ++++ src/linalg.c | 18 ++++++++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/include/scs_blas.h b/include/scs_blas.h index 4942610b1..ed9807d70 100644 --- a/include/scs_blas.h +++ b/include/scs_blas.h @@ -17,8 +17,10 @@ extern "C" { /* single or double precision */ #ifndef SFLOAT #define BLAS(x) d##x +#define BLASI(x) id##x #else #define BLAS(x) s##x +#define BLASI(x) is##x #endif #else /* this extra indirection is needed for BLASSUFFIX to work correctly as a @@ -28,8 +30,10 @@ extern "C" { /* single or double precision */ #ifndef SFLOAT #define BLAS(x) stitch__(d, x, BLASSUFFIX) +#define BLASI(x) stitch__(id, x, BLASSUFFIX) #else #define BLAS(x) stitch__(s, x, BLASSUFFIX) +#define BLASI(x) stitch__(is, x, BLASSUFFIX) #endif #endif diff --git a/src/linalg.c b/src/linalg.c index d45a8cd3d..0d0ecea34 100644 --- a/src/linalg.c +++ b/src/linalg.c @@ -102,12 +102,16 @@ extern "C" { scs_float BLAS(nrm2)(blas_int *n, const scs_float *x, blas_int *incx); scs_float BLAS(dot)(const blas_int *n, const scs_float *x, const blas_int *incx, const scs_float *y, const blas_int *incy); -scs_float BLAS(lange)(const char *norm, const blas_int *m, const blas_int *n, - const scs_float *a, blas_int *lda, scs_float *work); void BLAS(axpy)(blas_int *n, const scs_float *a, const scs_float *x, blas_int *incx, scs_float *y, blas_int *incy); void BLAS(scal)(const blas_int *n, const scs_float *sa, scs_float *sx, const blas_int *incx); +blas_int BLASI(amax)(blas_int *n, const scs_float *x, blas_int *incx); + +/* Possibly not working correctly on all platforms. +scs_float BLAS(lange)(const char *norm, const blas_int *m, const blas_int *n, + const scs_float *a, blas_int *lda, scs_float *work); +*/ #ifdef __cplusplus } @@ -140,11 +144,21 @@ scs_float SCS(norm_2)(const scs_float *v, scs_int len) { return BLAS(nrm2)(&blen, v, &bone); } +/* Possibly not working correctly on all platforms. scs_float SCS(norm_inf)(const scs_float *a, scs_int len) { blas_int bone = 1; blas_int blen = (blas_int)len; return BLAS(lange)("Max", &blen, &bone, a, &blen, SCS_NULL); } +*/ + +scs_float SCS(norm_inf)(const scs_float *a, scs_int len) { + blas_int bone = 1; + blas_int blen = (blas_int)len; + scs_int idx = (scs_int)BLASI(amax)(&blen, a, &bone); + /* Returned idx is 1-based. */ + return ABS(a[idx - 1]); +} /* axpy a += sc*b */ void SCS(add_scaled_array)(scs_float *a, const scs_float *b, scs_int len,