Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix nasty lda bug in lange #278

Merged
merged 2 commits into from
Jun 27, 2024
Merged

fix nasty lda bug in lange #278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8891c9c
fix nasty lda bug in lange
bodono Jun 26, 2024
8dbbe2a
switch to using blas amax instead
bodono Jun 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions include/scs_blas.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down
20 changes: 17 additions & 3 deletions src/linalg.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down Expand Up @@ -140,10 +144,20 @@ 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;
return BLAS(lange)("Max", &blen, &bone, a, &bone, SCS_NULL);
scs_int idx = (scs_int)BLASI(amax)(&blen, a, &bone);
/* Returned idx is 1-based. */
return ABS(a[idx - 1]);
}

/* axpy a += sc*b */
Expand Down
Loading