From 06b45905e7878ce67f4c238c6bde7f5dca6a2d90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20S=C3=A1nchez?= Date: Mon, 12 Feb 2024 23:16:03 +0000 Subject: [PATCH] Remove r_cnjg due to conflicts with f2c. --- blas/CMakeLists.txt | 2 +- blas/f2c/chbmv.c | 8 +++++--- blas/f2c/chpmv.c | 8 +++++--- blas/f2c/ctbmv.c | 8 +++++--- blas/f2c/d_cnjg.c | 6 ------ blas/f2c/r_cnjg.c | 6 ------ blas/f2c/zhbmv.c | 8 +++++--- blas/f2c/zhpmv.c | 8 +++++--- blas/f2c/ztbmv.c | 8 +++++--- 9 files changed, 31 insertions(+), 31 deletions(-) delete mode 100644 blas/f2c/d_cnjg.c delete mode 100644 blas/f2c/r_cnjg.c diff --git a/blas/CMakeLists.txt b/blas/CMakeLists.txt index c530957fb..4ae060302 100644 --- a/blas/CMakeLists.txt +++ b/blas/CMakeLists.txt @@ -18,7 +18,7 @@ set(EigenBlas_SRCS single.cpp double.cpp complex_single.cpp complex_double.cpp f2c/lsame.c f2c/dspmv.c f2c/ssbmv.c f2c/chbmv.c f2c/sspmv.c f2c/zhbmv.c f2c/chpmv.c f2c/dsbmv.c f2c/zhpmv.c f2c/dtbmv.c f2c/stbmv.c f2c/ctbmv.c - f2c/ztbmv.c f2c/d_cnjg.c f2c/r_cnjg.c + f2c/ztbmv.c ) if (EIGEN_Fortran_COMPILER_WORKS) diff --git a/blas/f2c/chbmv.c b/blas/f2c/chbmv.c index 2b9d52886..410a3ced3 100644 --- a/blas/f2c/chbmv.c +++ b/blas/f2c/chbmv.c @@ -12,6 +12,11 @@ #include "datatypes.h" +static inline void r_cnjg(complex *r, complex *z) { + r->r = z->r; + r->i = -(z->i); +} + /* Subroutine */ int chbmv_(char *uplo, integer *n, integer *k, complex *alpha, complex *a, integer *lda, complex *x, integer *incx, complex *beta, complex *y, integer *incy, ftnlen uplo_len) { /* System generated locals */ @@ -19,9 +24,6 @@ real r__1; complex q__1, q__2, q__3, q__4; - /* Builtin functions */ - void r_cnjg(complex *, complex *); - /* Local variables */ integer i__, j, l, ix, iy, jx, jy, kx, ky, info; complex temp1, temp2; diff --git a/blas/f2c/chpmv.c b/blas/f2c/chpmv.c index 3dd5e5872..eb0e75359 100644 --- a/blas/f2c/chpmv.c +++ b/blas/f2c/chpmv.c @@ -12,6 +12,11 @@ #include "datatypes.h" +static inline void r_cnjg(complex *r, complex *z) { + r->r = z->r; + r->i = -(z->i); +} + /* Subroutine */ int chpmv_(char *uplo, integer *n, complex *alpha, complex *ap, complex *x, integer *incx, complex *beta, complex *y, integer *incy, ftnlen uplo_len) { /* System generated locals */ @@ -19,9 +24,6 @@ real r__1; complex q__1, q__2, q__3, q__4; - /* Builtin functions */ - void r_cnjg(complex *, complex *); - /* Local variables */ integer i__, j, k, kk, ix, iy, jx, jy, kx, ky, info; complex temp1, temp2; diff --git a/blas/f2c/ctbmv.c b/blas/f2c/ctbmv.c index 8038e720e..e67482c71 100644 --- a/blas/f2c/ctbmv.c +++ b/blas/f2c/ctbmv.c @@ -12,15 +12,17 @@ #include "datatypes.h" +static inline void r_cnjg(complex *r, complex *z) { + r->r = z->r; + r->i = -(z->i); +} + /* Subroutine */ int ctbmv_(char *uplo, char *trans, char *diag, integer *n, integer *k, complex *a, integer *lda, complex *x, integer *incx, ftnlen uplo_len, ftnlen trans_len, ftnlen diag_len) { /* System generated locals */ integer a_dim1, a_offset, i__1, i__2, i__3, i__4, i__5; complex q__1, q__2, q__3; - /* Builtin functions */ - void r_cnjg(complex *, complex *); - /* Local variables */ integer i__, j, l, ix, jx, kx, info; complex temp; diff --git a/blas/f2c/d_cnjg.c b/blas/f2c/d_cnjg.c deleted file mode 100644 index dad02f5ec..000000000 --- a/blas/f2c/d_cnjg.c +++ /dev/null @@ -1,6 +0,0 @@ -#include "datatypes.h" - -void d_cnjg(doublecomplex *r, doublecomplex *z) { - r->r = z->r; - r->i = -(z->i); -} diff --git a/blas/f2c/r_cnjg.c b/blas/f2c/r_cnjg.c deleted file mode 100644 index dd4d346f7..000000000 --- a/blas/f2c/r_cnjg.c +++ /dev/null @@ -1,6 +0,0 @@ -#include "datatypes.h" - -void r_cnjg(complex *r, complex *z) { - r->r = z->r; - r->i = -(z->i); -} diff --git a/blas/f2c/zhbmv.c b/blas/f2c/zhbmv.c index 9d6d5db1e..43862a66b 100644 --- a/blas/f2c/zhbmv.c +++ b/blas/f2c/zhbmv.c @@ -12,6 +12,11 @@ #include "datatypes.h" +static inline void d_cnjg(doublecomplex *r, doublecomplex *z) { + r->r = z->r; + r->i = -(z->i); +} + /* Subroutine */ int zhbmv_(char *uplo, integer *n, integer *k, doublecomplex *alpha, doublecomplex *a, integer *lda, doublecomplex *x, integer *incx, doublecomplex *beta, doublecomplex *y, integer *incy, ftnlen uplo_len) { @@ -20,9 +25,6 @@ doublereal d__1; doublecomplex z__1, z__2, z__3, z__4; - /* Builtin functions */ - void d_cnjg(doublecomplex *, doublecomplex *); - /* Local variables */ integer i__, j, l, ix, iy, jx, jy, kx, ky, info; doublecomplex temp1, temp2; diff --git a/blas/f2c/zhpmv.c b/blas/f2c/zhpmv.c index 3f93b97db..d61307f28 100644 --- a/blas/f2c/zhpmv.c +++ b/blas/f2c/zhpmv.c @@ -12,6 +12,11 @@ #include "datatypes.h" +static inline void d_cnjg(doublecomplex *r, doublecomplex *z) { + r->r = z->r; + r->i = -(z->i); +} + /* Subroutine */ int zhpmv_(char *uplo, integer *n, doublecomplex *alpha, doublecomplex *ap, doublecomplex *x, integer *incx, doublecomplex *beta, doublecomplex *y, integer *incy, ftnlen uplo_len) { /* System generated locals */ @@ -19,9 +24,6 @@ doublereal d__1; doublecomplex z__1, z__2, z__3, z__4; - /* Builtin functions */ - void d_cnjg(doublecomplex *, doublecomplex *); - /* Local variables */ integer i__, j, k, kk, ix, iy, jx, jy, kx, ky, info; doublecomplex temp1, temp2; diff --git a/blas/f2c/ztbmv.c b/blas/f2c/ztbmv.c index 9a413705b..157c49180 100644 --- a/blas/f2c/ztbmv.c +++ b/blas/f2c/ztbmv.c @@ -12,15 +12,17 @@ #include "datatypes.h" +static inline void d_cnjg(doublecomplex *r, doublecomplex *z) { + r->r = z->r; + r->i = -(z->i); +} + /* Subroutine */ int ztbmv_(char *uplo, char *trans, char *diag, integer *n, integer *k, doublecomplex *a, integer *lda, doublecomplex *x, integer *incx, ftnlen uplo_len, ftnlen trans_len, ftnlen diag_len) { /* System generated locals */ integer a_dim1, a_offset, i__1, i__2, i__3, i__4, i__5; doublecomplex z__1, z__2, z__3; - /* Builtin functions */ - void d_cnjg(doublecomplex *, doublecomplex *); - /* Local variables */ integer i__, j, l, ix, jx, kx, info; doublecomplex temp;