Fix 2 CBLAS issues

CBLAS/include/cblas.h

@@ -143,19 +143,13 @@ void cblas_zaxpy(const CBLAS_INT N, const void *alpha, const void *X,
 /*
  * Routines with S and D prefix only
  */
-void cblas_srotg(float *a, float *b, float *c, float *s);
 void cblas_srotmg(float *d1, float *d2, float *b1, const float b2, float *P);
-void cblas_srot(const CBLAS_INT N, float *X, const CBLAS_INT incX,
-                float *Y, const CBLAS_INT incY, const float c, const float s);
 void cblas_srotm(const CBLAS_INT N, float *X, const CBLAS_INT incX,
-                float *Y, const CBLAS_INT incY, const float *P);
-
-void cblas_drotg(double *a, double *b, double *c, double *s);
+                 float *Y, const CBLAS_INT incY, const float *P);
 void cblas_drotmg(double *d1, double *d2, double *b1, const double b2, double *P);
-void cblas_drot(const CBLAS_INT N, double *X, const CBLAS_INT incX,
-                double *Y, const CBLAS_INT incY, const double c, const double  s);
 void cblas_drotm(const CBLAS_INT N, double *X, const CBLAS_INT incX,
-                double *Y, const CBLAS_INT incY, const double *P);
+                 double *Y, const CBLAS_INT incY, const double *P);
+
 
 
 /*
@@ -168,6 +162,20 @@ void cblas_zscal(const CBLAS_INT N, const void *alpha, void *X, const CBLAS_INT
 void cblas_csscal(const CBLAS_INT N, const float alpha, void *X, const CBLAS_INT incX);
 void cblas_zdscal(const CBLAS_INT N, const double alpha, void *X, const CBLAS_INT incX);
 
+void cblas_srotg(float *a, float *b, float *c, float *s);
+void cblas_drotg(double *a, double *b, double *c, double *s);
+void cblas_crotg(void *a, void *b, float *c, void *s);
+void cblas_zrotg(void *a, void *b, double *c, void *s);
+
+void cblas_srot(const CBLAS_INT N, float *X, const CBLAS_INT incX,
+                float *Y, const CBLAS_INT incY, const float c, const float s);
+void cblas_drot(const CBLAS_INT N, double *X, const CBLAS_INT incX,
+                double *Y, const CBLAS_INT incY, const double c, const double  s);
+void cblas_csrot(const CBLAS_INT N, void *X, const CBLAS_INT incX,
+                 void *Y, const CBLAS_INT incY, const float c, const float s);
+void cblas_zdrot(const CBLAS_INT N, void *X, const CBLAS_INT incX,
+                 void *Y, const CBLAS_INT incY, const double c, const double s);
+
 /*
  * ===========================================================================
  * Prototypes for level 2 BLAS

CBLAS/include/cblas_f77.h

@@ -93,6 +93,13 @@
 #define F77_dznrm2_sub_base 	F77_GLOBAL(dznrm2sub,DZNRM2SUB)
 #define F77_dzasum_sub_base 	F77_GLOBAL(dzasumsub,DZASUMSUB)
 #define F77_sdsdot_sub_base 	F77_GLOBAL(sdsdotsub,SDSDOTSUB)
+#define F77_crotg_base		F77_GLOBAL(crotg, CROTG)
+#define F77_csrot_base		F77_GLOBAL(csrot, CSROT)
+#define F77_zrotg_base		F77_GLOBAL(zrotg, ZROTG)
+#define F77_zdrot_base		F77_GLOBAL(zdrot, ZDROT)
+#define F77_scabs1_sub_base F77_GLOBAL(scabs1sub, SCABS1SUB)
+#define F77_dcabs1_sub_base F77_GLOBAL(dcabs1sub, DCABS1SUB)
+
 /*
  * Level 2 BLAS
  */
@@ -200,6 +207,7 @@
  * Level 1 Fortran variadic definitions
  */
 
+
 /* Single Precision */
 
    #define F77_srot(...) F77_srot_base(__VA_ARGS__)
@@ -215,6 +223,7 @@
    #define F77_snrm2_sub(...) F77_snrm2_sub_base(__VA_ARGS__)
    #define F77_sasum_sub(...) F77_sasum_sub_base(__VA_ARGS__)
    #define F77_isamax_sub(...) F77_isamax_sub_base(__VA_ARGS__)
+   #define F77_scabs1_sub(...) F77_scabs1_sub_base(__VA_ARGS__)
 
 /* Double Precision */
 
@@ -232,9 +241,12 @@
    #define F77_dnrm2_sub(...) F77_dnrm2_sub_base(__VA_ARGS__)
    #define F77_dasum_sub(...) F77_dasum_sub_base(__VA_ARGS__)
    #define F77_idamax_sub(...) F77_idamax_sub_base(__VA_ARGS__)
+   #define F77_dcabs1_sub(...) F77_dcabs1_sub_base(__VA_ARGS__)
 
 /* Single Complex Precision */
 
+   #define F77_crotg(...) F77_crotg_base(__VA_ARGS__)
+   #define F77_csrot(...) F77_csrot_base(__VA_ARGS__)
    #define F77_cswap(...) F77_cswap_base(__VA_ARGS__)
    #define F77_ccopy(...) F77_ccopy_base(__VA_ARGS__)
    #define F77_caxpy(...) F77_caxpy_base(__VA_ARGS__)
@@ -249,6 +261,8 @@
 
 /* Double Complex Precision */
 
+   #define F77_zrotg(...) F77_zrotg_base(__VA_ARGS__)
+   #define F77_zdrot(...) F77_zdrot_base(__VA_ARGS__)
    #define F77_zswap(...) F77_zswap_base(__VA_ARGS__)
    #define F77_zcopy(...) F77_zcopy_base(__VA_ARGS__)
    #define F77_zaxpy(...) F77_zaxpy_base(__VA_ARGS__)
@@ -579,6 +593,8 @@ void F77_xerbla_base(FCHAR, void *
 
 /* Single Complex Precision */
 
+   void F77_crotg_base(void *, void *, float *, void *);
+   void F77_csrot_base(FINT, void *X, FINT, void *, FINT, const float *, const float *);
    void F77_cswap_base( FINT, void *, FINT, void *, FINT);
    void F77_ccopy_base( FINT, const void *, FINT, void *, FINT);
    void F77_caxpy_base( FINT, const void *, const void *, FINT, void *, FINT);
@@ -590,9 +606,12 @@ void F77_xerbla_base(FCHAR, void *
    void F77_csscal_base( FINT, const float *, void *, FINT);
    void F77_scnrm2_sub_base( FINT, const void *, FINT, float *);
    void F77_scasum_sub_base( FINT, const void *, FINT, float *);
+   void F77_scabs1_sub_base( const void *, float *);
 
 /* Double Complex Precision */
 
+   void F77_zrotg_base(void *, void *, double *, void *);
+   void F77_zdrot_base(FINT, void *X, FINT, void *, FINT, const double *, const double *);
    void F77_zswap_base( FINT, void *, FINT, void *, FINT);
    void F77_zcopy_base( FINT, const void *, FINT, void *, FINT);
    void F77_zaxpy_base( FINT, const void *, const void *, FINT, void *, FINT);
@@ -604,6 +623,7 @@ void F77_xerbla_base(FCHAR, void *
    void F77_dznrm2_sub_base( FINT, const void *, FINT, double *);
    void F77_dzasum_sub_base( FINT, const void *, FINT, double *);
    void F77_izamax_sub_base( FINT, const void *, FINT, FINT2);
+   void F77_dcabs1_sub_base( const void *, double *);
 
 /*
  * Level 2 Fortran Prototypes

CBLAS/src/CMakeLists.txt

@@ -26,15 +26,19 @@ set(DLEV1 cblas_drotg.c cblas_drotmg.c cblas_drot.c cblas_drotm.c
          dasumsub.f idamaxsub.f)
 
 # Files for level 1 single precision complex
-set(CLEV1 cblas_cswap.c cblas_cscal.c cblas_csscal.c cblas_ccopy.c
+set(CLEV1 cblas_crotg.c cblas_csrot.c
+         cblas_cswap.c cblas_cscal.c cblas_csscal.c cblas_ccopy.c
          cblas_caxpy.c cblas_cdotu_sub.c cblas_cdotc_sub.c
-         cblas_icamax.c cdotcsub.f cdotusub.f icamaxsub.f)
+         cblas_icamax.c cdotcsub.f cdotusub.f icamaxsub.f
+         cblas_scabs1.c scabs1sub.f )
 
 # Files for level 1 double precision complex
-set(ZLEV1 cblas_zswap.c cblas_zscal.c cblas_zdscal.c cblas_zcopy.c
+set(ZLEV1 cblas_zrotg.c cblas_zdrot.c
+         cblas_zswap.c cblas_zscal.c cblas_zdscal.c cblas_zcopy.c
          cblas_zaxpy.c cblas_zdotu_sub.c cblas_zdotc_sub.c cblas_dznrm2.c
          cblas_dzasum.c cblas_izamax.c zdotcsub.f zdotusub.f
-         dzasumsub.f dznrm2sub.f izamaxsub.f)
+         dzasumsub.f dznrm2sub.f izamaxsub.f
+         cblas_dcabs1.c dcabs1sub.f)
 
 # Common files for level 1 single precision
 set(SCLEV1 cblas_scasum.c scasumsub.f cblas_scnrm2.c scnrm2sub.f)

CBLAS/src/Makefile

@@ -36,15 +36,19 @@ dlev1 = cblas_drotg.o cblas_drotmg.o cblas_drot.o  cblas_drotm.o \
         dasumsub.o idamaxsub.o
 
 # Files for level 1 single precision complex
-clev1 = cblas_cswap.o cblas_cscal.o cblas_csscal.o cblas_ccopy.o \
+clev1 = cblas_crotg.o cblas_csrot.o \
+        cblas_cswap.o cblas_cscal.o cblas_csscal.o cblas_ccopy.o \
         cblas_caxpy.o cblas_cdotu_sub.o cblas_cdotc_sub.o \
-        cblas_icamax.o cdotcsub.o cdotusub.o icamaxsub.o
+        cblas_icamax.o cdotcsub.o cdotusub.o icamaxsub.o \
+        cblas_scabs1.o scabs1sub.o
 
 # Files for level 1 double precision complex
-zlev1 = cblas_zswap.o cblas_zscal.o cblas_zdscal.o cblas_zcopy.o \
+zlev1 = cblas_zrotg.o cblas_zdrot.o \
+        cblas_zswap.o cblas_zscal.o cblas_zdscal.o cblas_zcopy.o \
         cblas_zaxpy.o cblas_zdotu_sub.o cblas_zdotc_sub.o cblas_dznrm2.o \
         cblas_dzasum.o cblas_izamax.o zdotcsub.o zdotusub.o \
-        dzasumsub.o dznrm2sub.o izamaxsub.o
+        dzasumsub.o dznrm2sub.o izamaxsub.o \
+        cblas_dcabs1.o dcabs1sub.o
 
 # Common files for level 1 single precision
 sclev1 = cblas_scasum.o scasumsub.o cblas_scnrm2.o scnrm2sub.o

CBLAS/src/cblas_crotg.c

@@ -0,0 +1,13 @@
+/*
+ * cblas_crotg.c
+ *
+ * The program is a C interface to crotg.
+ *
+ */
+#include "cblas.h"
+#include "cblas_f77.h"
+void cblas_crotg(void *a, void *b, float *c, void *s)
+{
+   F77_crotg(a,b,c,s);
+}
+

CBLAS/src/cblas_csrot.c

@@ -0,0 +1,21 @@
+/*
+ * cblas_csrot.c
+ *
+ * The program is a C interface to csrot.
+ *
+ */
+#include "cblas.h"
+#include "cblas_f77.h"
+void cblas_csrot(const CBLAS_INT N, void *X, const CBLAS_INT incX,
+   void *Y, const CBLAS_INT incY, const float c, const float s)
+{
+#ifdef F77_INT
+   F77_INT F77_N=N, F77_incX=incX, F77_incY=incY;
+#else
+   #define F77_N N
+   #define F77_incX incX
+   #define F77_incY incY
+#endif
+   F77_csrot(&F77_N, X, &F77_incX, Y, &F77_incY, &c, &s);
+   return;
+}

CBLAS/src/cblas_dcabs1.c

@@ -0,0 +1,15 @@
+/*
+ * cblas_scabs1.c
+ *
+ * The program is a C interface to scabs1.
+ *
+ */
+#include "cblas.h"
+#include "cblas_f77.h"
+double cblas_dcabs1(const void *c)
+{
+   double cabs1 = 0.0;
+   F77_dcabs1_sub(c, &cabs1);
+   return cabs1; 
+}
+

CBLAS/src/cblas_scabs1.c

@@ -0,0 +1,15 @@
+/*
+ * cblas_scabs1.c
+ *
+ * The program is a C interface to scabs1.
+ *
+ */
+#include "cblas.h"
+#include "cblas_f77.h"
+float cblas_scabs1(const void *c)
+{
+   float cabs1 = 0.0;
+   F77_scabs1_sub(c, &cabs1);
+   return cabs1; 
+}
+

CBLAS/src/cblas_zdrot.c

@@ -0,0 +1,21 @@
+/*
+ * cblas_zdrot.c
+ *
+ * The program is a C interface to zdrot.
+ *
+ */
+#include "cblas.h"
+#include "cblas_f77.h"
+void cblas_zdrot(const CBLAS_INT N, void *X, const CBLAS_INT incX,
+   void *Y, const CBLAS_INT incY, const double c, const double s)
+{
+#ifdef F77_INT
+   F77_INT F77_N=N, F77_incX=incX, F77_incY=incY;
+#else
+   #define F77_N N
+   #define F77_incX incX
+   #define F77_incY incY
+#endif
+   F77_zdrot(&F77_N, X, &F77_incX, Y, &F77_incY, &c, &s);
+   return;
+}

CBLAS/src/cblas_zrotg.c

@@ -0,0 +1,13 @@
+/*
+ * cblas_zrotg.c
+ *
+ * The program is a C interface to zrotg.
+ *
+ */
+#include "cblas.h"
+#include "cblas_f77.h"
+void cblas_zrotg(void *a, void *b, double *c, void *s)
+{
+   F77_zrotg(a,b,c,s);
+}
+

CBLAS/src/dcabs1sub.f

@@ -0,0 +1,13 @@
+c     dcabs1.f
+c
+c     The program is a fortran wrapper for dcabs1.
+c
+      subroutine dcabs1sub(z, cabs1)
+c
+      external dcabs1
+      double complex z
+      double precision dcabs1, cabs1
+c
+      cabs1=dcabs1(z)
+      return
+      end

CBLAS/src/scabs1sub.f

@@ -0,0 +1,13 @@
+c     scabs1.f
+c
+c     The program is a fortran wrapper for scabs1.
+c
+      subroutine scabs1sub(z, cabs1)
+c
+      external scabs1
+      complex z
+      real scabs1, cabs1
+c
+      cabs1=scabs1(z)
+      return
+      end