Skip to content

Commit bf5dbb7

Browse files
xianyixianyi
committed
Refs#509. Merge branch 'grisuthedragon-develop' into develop
2 parents 771b18a + 39cc6b2 commit bf5dbb7

17 files changed

Lines changed: 553 additions & 14 deletions

‎cblas.h‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -347,6 +347,16 @@ void cblas_cimatcopy(OPENBLAS_CONST enum CBLAS_ORDER CORDER, OPENBLAS_CONST enum
347347
void cblas_zimatcopy(OPENBLAS_CONST enum CBLAS_ORDER CORDER, OPENBLAS_CONST enum CBLAS_TRANSPOSE CTRANS, OPENBLAS_CONST blasint crows, OPENBLAS_CONST blasint ccols, OPENBLAS_CONST double* calpha, double* a,
348348
OPENBLAS_CONST blasint clda, OPENBLAS_CONST blasint cldb);
349349

350+
void cblas_sgeadd(OPENBLAS_CONST enum CBLAS_ORDER CORDER,OPENBLAS_CONST blasint crows, OPENBLAS_CONST blasint ccols, OPENBLAS_CONST float calpha, float *a, OPENBLAS_CONST blasint clda, OPENBLAS_CONST float cbeta,
351+
float *c, OPENBLAS_CONST blasint cldc);
352+
void cblas_dgeadd(OPENBLAS_CONST enum CBLAS_ORDER CORDER,OPENBLAS_CONST blasint crows, OPENBLAS_CONST blasint ccols, OPENBLAS_CONST double calpha, double *a, OPENBLAS_CONST blasint clda, OPENBLAS_CONST double cbeta,
353+
double *c, OPENBLAS_CONST blasint cldc);
354+
void cblas_cgeadd(OPENBLAS_CONST enum CBLAS_ORDER CORDER,OPENBLAS_CONST blasint crows, OPENBLAS_CONST blasint ccols, OPENBLAS_CONST float *calpha, float *a, OPENBLAS_CONST blasint clda, OPENBLAS_CONST float *cbeta,
355+
float *c, OPENBLAS_CONST blasint cldc);
356+
void cblas_zgeadd(OPENBLAS_CONST enum CBLAS_ORDER CORDER,OPENBLAS_CONST blasint crows, OPENBLAS_CONST blasint ccols, OPENBLAS_CONST double *calpha, double *a, OPENBLAS_CONST blasint clda, OPENBLAS_CONST double *cbeta,
357+
double *c, OPENBLAS_CONST blasint cldc);
358+
359+
350360
#ifdef __cplusplus
351361
}
352362
#endif /* __cplusplus */

‎cblas_noconst.h‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -333,6 +333,16 @@ void cblas_cimatcopy( enum CBLAS_ORDER CORDER, enum CBLAS_TRANSPOSE CTRANS, bl
333333
blasint clda, blasint cldb);
334334
void cblas_zimatcopy( enum CBLAS_ORDER CORDER, enum CBLAS_TRANSPOSE CTRANS, blasint crows, blasint ccols, double* calpha, double* a,
335335
blasint clda, blasint cldb);
336+
337+
void cblas_sgeadd( enum CBLAS_ORDER CORDER, blasint crows, blasint ccols, float calpha, float *a, blasint clda, float cbeta,
338+
float *c, blasint cldc);
339+
void cblas_dgeadd( enum CBLAS_ORDER CORDER, blasint crows, blasint ccols, double calpha, double *a, blasint clda, double cbeta,
340+
double *c, blasint cldc);
341+
void cblas_cgeadd( enum CBLAS_ORDER CORDER, blasint crows, blasint ccols, float *calpha, float *a, blasint clda, float *cbeta,
342+
float *c, blasint cldc);
343+
void cblas_zgeadd( enum CBLAS_ORDER CORDER, blasint crows, blasint ccols, double *calpha, double *a, blasint clda, double *cbeta,
344+
double *c, blasint cldc);
345+
336346
#ifdef __cplusplus
337347
}
338348
#endif /* __cplusplus */

‎common_c.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,7 @@
220220
#define COMATCOPY_K_CTC comatcopy_k_ctc
221221
#define COMATCOPY_K_RTC comatcopy_k_rtc
222222

223+
#define CGEADD_K cgeadd_k
223224

224225
#else
225226

@@ -402,6 +403,7 @@
402403
#define COMATCOPY_K_RNC gotoblas -> comatcopy_k_rnc
403404
#define COMATCOPY_K_CTC gotoblas -> comatcopy_k_ctc
404405
#define COMATCOPY_K_RTC gotoblas -> comatcopy_k_rtc
406+
#define CGEADD_K gotoblas -> cgeadd_k
405407

406408
#endif
407409

‎common_d.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@
149149
#define DOMATCOPY_K_RN domatcopy_k_rn
150150
#define DOMATCOPY_K_CT domatcopy_k_ct
151151
#define DOMATCOPY_K_RT domatcopy_k_rt
152+
#define DGEADD_K dgeadd_k
152153

153154
#else
154155

@@ -267,6 +268,8 @@
267268
#define DOMATCOPY_K_CT gotoblas -> domatcopy_k_ct
268269
#define DOMATCOPY_K_RT gotoblas -> domatcopy_k_rt
269270

271+
#define DGEADD_K gotoblas -> dgeadd_k
272+
270273
#endif
271274

272275
#define DGEMM_NN dgemm_nn

‎common_interface.h‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -754,6 +754,12 @@ void BLASFUNC(dimatcopy) (char *, char *, blasint *, blasint *, double *, do
754754
void BLASFUNC(cimatcopy) (char *, char *, blasint *, blasint *, float *, float *, blasint *, blasint *);
755755
void BLASFUNC(zimatcopy) (char *, char *, blasint *, blasint *, double *, double *, blasint *, blasint *);
756756

757+
void BLASFUNC(sgeadd) (blasint *, blasint *, float *, float *, blasint *, float *, float *, blasint*);
758+
void BLASFUNC(dgeadd) (blasint *, blasint *, double *, double *, blasint *, double *, double *, blasint*);
759+
void BLASFUNC(cgeadd) (blasint *, blasint *, float *, float *, blasint *, float *, float *, blasint*);
760+
void BLASFUNC(zgeadd) (blasint *, blasint *, double *, double *, blasint *, double *, double *, blasint*);
761+
762+
757763
#ifdef __cplusplus
758764
}
759765

‎common_level3.h‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1762,6 +1762,11 @@ int zomatcopy_k_rnc(BLASLONG, BLASLONG, double, double, double *, BLASLONG, dou
17621762
int zomatcopy_k_ctc(BLASLONG, BLASLONG, double, double, double *, BLASLONG, double *, BLASLONG);
17631763
int zomatcopy_k_rtc(BLASLONG, BLASLONG, double, double, double *, BLASLONG, double *, BLASLONG);
17641764

1765+
int sgeadd_k(BLASLONG, BLASLONG, float, float*, BLASLONG, float, float *, BLASLONG);
1766+
int dgeadd_k(BLASLONG, BLASLONG, double, double*, BLASLONG, double, double *, BLASLONG);
1767+
int cgeadd_k(BLASLONG, BLASLONG, float, float, float*, BLASLONG, float, float, float *, BLASLONG);
1768+
int zgeadd_k(BLASLONG, BLASLONG, double,double, double*, BLASLONG, double, double, double *, BLASLONG);
1769+
17651770

17661771
#ifdef __CUDACC__
17671772
}

‎common_macro.h‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -634,7 +634,7 @@
634634
#define OMATCOPY_K_RN DOMATCOPY_K_RN
635635
#define OMATCOPY_K_CT DOMATCOPY_K_CT
636636
#define OMATCOPY_K_RT DOMATCOPY_K_RT
637-
637+
#define GEADD_K DGEADD_K
638638
#else
639639

640640
#define AMAX_K SAMAX_K
@@ -932,6 +932,7 @@
932932
#define OMATCOPY_K_CT SOMATCOPY_K_CT
933933
#define OMATCOPY_K_RT SOMATCOPY_K_RT
934934

935+
#define GEADD_K SGEADD_K
935936
#endif
936937
#else
937938
#ifdef XDOUBLE
@@ -1746,6 +1747,7 @@
17461747
#define OMATCOPY_K_RNC ZOMATCOPY_K_RNC
17471748
#define OMATCOPY_K_CTC ZOMATCOPY_K_CTC
17481749
#define OMATCOPY_K_RTC ZOMATCOPY_K_RTC
1750+
#define GEADD_K ZGEADD_K
17491751

17501752
#else
17511753

@@ -2159,6 +2161,8 @@
21592161
#define OMATCOPY_K_CTC COMATCOPY_K_CTC
21602162
#define OMATCOPY_K_RTC COMATCOPY_K_RTC
21612163

2164+
#define GEADD_K CGEADD_K
2165+
21622166
#endif
21632167
#endif
21642168

‎common_param.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -855,6 +855,10 @@ BLASLONG (*ixamin_k)(BLASLONG, xdouble *, BLASLONG);
855855
int (*zomatcopy_k_rnc) (BLASLONG, BLASLONG, double, double, double*, BLASLONG, double*, BLASLONG);
856856
int (*zomatcopy_k_rtc) (BLASLONG, BLASLONG, double, double, double*, BLASLONG, double*, BLASLONG);
857857

858+
int (*sgeadd_k) (BLASLONG, BLASLONG, float, float *, BLASLONG, float, float *, BLASLONG);
859+
int (*dgeadd_k) (BLASLONG, BLASLONG, double, double *, BLASLONG, double, double *, BLASLONG);
860+
int (*cgeadd_k) (BLASLONG, BLASLONG, float, float, float *, BLASLONG, float, float, float *, BLASLONG);
861+
int (*zgeadd_k) (BLASLONG, BLASLONG, float, double, double *, BLASLONG, double, double, double *, BLASLONG);
858862

859863
} gotoblas_t;
860864

‎common_s.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@
153153
#define SOMATCOPY_K_CT somatcopy_k_ct
154154
#define SOMATCOPY_K_RT somatcopy_k_rt
155155

156+
#define SGEADD_K sgeadd_k
156157

157158
#else
158159

@@ -274,6 +275,7 @@
274275
#define SOMATCOPY_K_CT gotoblas -> somatcopy_k_ct
275276
#define SOMATCOPY_K_RT gotoblas -> somatcopy_k_rt
276277

278+
#define SGEADD_K gotoblas -> sgeadd_k
277279

278280
#endif
279281

‎common_z.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,7 @@
220220
#define ZOMATCOPY_K_CTC zomatcopy_k_ctc
221221
#define ZOMATCOPY_K_RTC zomatcopy_k_rtc
222222

223+
#define ZGEADD_K zgeadd_k
223224

224225
#else
225226

@@ -403,6 +404,8 @@
403404
#define ZOMATCOPY_K_CTC gotoblas -> zomatcopy_k_ctc
404405
#define ZOMATCOPY_K_RTC gotoblas -> zomatcopy_k_rtc
405406

407+
#define ZGEADD_K zgeadd_k
408+
406409
#endif
407410

408411
#define ZGEMM_NN zgemm_nn

0 commit comments

Comments
 (0)