Skip to content

Commit d3ebb85

Browse files
martin-frbgmartin-frbg
authored
more cleanup
1 parent 1db585c commit d3ebb85

6 files changed

Lines changed: 6 additions & 163 deletions

File tree

‎ctest/c_cblat3c.c‎

Lines changed: 1 addition & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1087,9 +1087,6 @@ int /* Main program */ main(void)
10871087
/* Check if error-exit was taken incorrectly. */
10881088

10891089
if (! infoc_1.ok) {
1090-
// io___128.ciunit = *nout;
1091-
// s_wsfe(&io___128);
1092-
// e_wsfe();
10931090
printf(" *** FATAL ERROR - ERROR-CALL MYEXIT TAKEN ON VALID CALL\n");
10941091
*fatal = TRUE_;
10951092
goto L120;
@@ -3973,26 +3970,6 @@ real sdiff_(real *x, real *y)
39733970
static char ich[3] = "NTC";
39743971
static char ishape[2] = "UL";
39753972

3976-
/* Format strings */
3977-
// static char fmt_9994[] = "(\002 ******* FATAL ERROR - ERROR-CALL MYEXIT "
3978-
// "TAKEN ON VALID CALL *******\002)";
3979-
// static char fmt_9998[] = "(\002 ******* FATAL ERROR - PARAMETER NUMBER"
3980-
// " \002,i2,\002 WAS CH\002,\002ANGED INCORRECTLY *******\002)";
3981-
// static char fmt_10000[] = "(\002 \002,a13,\002 PASSED THE COLUMN-MAJOR C"
3982-
// "OMPUTATIONAL TESTS\002,\002 (\002,i6,\002 CALL\002,\002S)\002)";
3983-
// static char fmt_10001[] = "(\002 \002,a13,\002 PASSED THE ROW-MAJOR C"
3984-
// "OMPUTATIONAL TESTS\002,\002 (\002,i6,\002 CALL\002,\002S)\002)";
3985-
// static char fmt_10002[] = "(\002 \002,a13,\002 COMPLETED THE COLUMN-MAJO"
3986-
// "R COMPUTATIONAL \002,\002TESTS (\002,i6,\002 CALLS)\002,/\002 **"
3987-
// "***** BUT WITH MAXIMUM TEST \002,\002RATIO \002,f8.2,\002 - SUSP"
3988-
// "ECT *******\002)";
3989-
// static char fmt_10003[] = "(\002 \002,a13,\002 COMPLETED THE ROW-MAJOR "
3990-
// " COMPUTATIONAL \002,\002TESTS (\002,i6,\002 CALLS)\002,/\002 **"
3991-
// "***** BUT WITH MAXIMUM TEST \002,\002RATIO \002,f8.2,\002 - SUSP"
3992-
// "ECT *******\002)";
3993-
// static char fmt_9996[] = "(\002 ******* \002,a13,\002 FAILED ON CALL NUM"
3994-
// "BER:\002)";
3995-
39963973
/* System generated locals */
39973974
integer a_dim1, a_offset, b_dim1, b_offset, c_dim1, c_offset, i__1, i__2,
39983975
i__3, i__4, i__5, i__6, i__7;
@@ -4349,13 +4326,6 @@ real sdiff_(real *x, real *y)
43494326
k, complex *alpha, integer *lda, integer *ldb, complex *beta, integer
43504327
*ldc)
43514328
{
4352-
/* Format strings */
4353-
static char fmt_9995[] = "(1x,i6,\002: \002,a13,\002(\002,a14,\002,\002,"
4354-
"a14,\002,\002,a14,\002,\002,a14,\002,\002)";
4355-
static char fmt_9994[] = "(10x,2(i3,\002,\002),\002 (\002,f4.1,\002,\002"
4356-
",f4.1,\002) , A,\002,i3,\002, B,\002,i3,\002, (\002,f4.1,\002"
4357-
",\002,f4.1,\002) , C,\002,i3,\002).\002)";
4358-
43594329
/* Local variables */
43604330
char crc[14], cta[14], ctb[14], cuplo[14];
43614331

@@ -4384,7 +4354,7 @@ real sdiff_(real *x, real *y)
43844354
s_copy(crc, " CblasColMajor", (ftnlen)14, (ftnlen)14);
43854355
}
43864356
printf("%6d: %s %s %s %s %s\n",*nc,sname,crc,cuplo,cta,ctb);
4387-
printf("%d %d (%4.1f,%4.1f) A, %d, B, %d, (%4.1f,%4.1f), C, %d.\n",*n,*k,*alpha,*lda,*ldb,*beta,*ldc);
4357+
printf("%d %d (%4.1f,%4.1f) A, %d, B, %d, (%4.1f,%4.1f), C, %d.\n",*n,*k,alpha->r,alpha->i,*lda,*ldb,beta->r,beta->i,*ldc);
43884358
return 0;
43894359
} /* cprcn8_ */
43904360

@@ -4394,16 +4364,6 @@ real sdiff_(real *x, real *y)
43944364
real *g, complex *cc, integer *ldcc, real *eps, real *err, logical *
43954365
fatal, integer *nout, logical *mv)
43964366
{
4397-
/* Format strings */
4398-
static char fmt_9999[] = "(\002 ******* FATAL ERROR - COMPUTED RESULT IS"
4399-
" LESS THAN HAL\002,\002F ACCURATE *******\002,/\002 "
4400-
" EXPECTED RE\002,\002SULT COMPUTED R"
4401-
"ESULT\002)";
4402-
static char fmt_9998[] = "(1x,i7,2(\002 (\002,g15.6,\002,\002,g15.6,"
4403-
"\002)\002))";
4404-
static char fmt_9997[] = "(\002 THESE ARE THE RESULTS FOR COLUMN"
4405-
" \002,i3)";
4406-
44074367
/* System generated locals */
44084368
integer a_dim1, a_offset, b_dim1, b_offset, c_dim1, c_offset, cc_dim1,
44094369
cc_offset, i__1, i__2, i__3, i__4, i__5, i__6, i__7;

‎ctest/c_cblat3c_3m.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ int /* Main program */ main(void)
275275
{
276276
/* Initialized data */
277277

278-
static char snames[9][13] = {"cblas_cgemm3m ", "cblas_chemm ", "cblas_csymm ",
278+
static char snames[9][13] = {"cblas_cgemm3m", "cblas_chemm ", "cblas_csymm ",
279279
"cblas_ctrmm ", "cblas_ctrsm ", "cblas_cherk ", "cblas_csyrk ",
280280
"cblas_cher2k", "cblas_csyr2k"};
281281

‎ctest/c_dblat3c.c‎

Lines changed: 3 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -3280,30 +3280,9 @@ doublereal ddiff_(doublereal* x, doublereal* y)
32803280
static char ich[3] = "NTC";
32813281
static char ishape[2] = "UL";
32823282

3283-
/* Format strings */
3284-
static char fmt_9994[] = "(\002 ******* FATAL ERROR - ERROR-CALL MYEXIT "
3285-
"TAKEN ON VALID CALL *******\002)";
3286-
static char fmt_9998[] = "(\002 ******* FATAL ERROR - PARAMETER NUMBER"
3287-
" \002,i2,\002 WAS CH\002,\002ANGED INCORRECTLY *******\002)";
3288-
static char fmt_10000[] = "(\002 \002,a13,\002 PASSED THE COLUMN-MAJOR C"
3289-
"OMPUTATIONAL TESTS\002,\002 (\002,i6,\002 CALL\002,\002S)\002)";
3290-
static char fmt_10001[] = "(\002 \002,a13,\002 PASSED THE ROW-MAJOR C"
3291-
"OMPUTATIONAL TESTS\002,\002 (\002,i6,\002 CALL\002,\002S)\002)";
3292-
static char fmt_10002[] = "(\002 \002,a13,\002 COMPLETED THE COLUMN-MAJO"
3293-
"R COMPUTATIONAL \002,\002TESTS (\002,i6,\002 CALLS)\002,/\002 **"
3294-
"***** BUT WITH MAXIMUM TEST \002,\002RATIO \002,f8.2,\002 - SUSP"
3295-
"ECT *******\002)";
3296-
static char fmt_10003[] = "(\002 \002,a13,\002 COMPLETED THE ROW-MAJOR "
3297-
" COMPUTATIONAL \002,\002TESTS (\002,i6,\002 CALLS)\002,/\002 **"
3298-
"***** BUT WITH MAXIMUM TEST \002,\002RATIO \002,f8.2,\002 - SUSP"
3299-
"ECT *******\002)";
3300-
static char fmt_9996[] = "(\002 ******* \002,a13,\002 FAILED ON CALL NUM"
3301-
"BER:\002)";
3302-
33033283
/* System generated locals */
33043284
integer a_dim1, a_offset, b_dim1, b_offset, c_dim1, c_offset, i__1, i__2,
33053285
i__3, i__4, i__5;
3306-
alist al__1;
33073286

33083287
/* Local variables */
33093288
extern /* Subroutine */ int cdgemmtr_(integer *, char *, char *, char *,
@@ -3326,7 +3305,8 @@ doublereal ddiff_(doublereal* x, doublereal* y)
33263305
char uplos[1];
33273306
extern /* Subroutine */ void dprcn8_(integer *, integer *, char *, integer
33283307
*, char *, char *, char *, integer *, integer *, doublereal *,
3329-
integer *, integer *, doublereal *, integer *), dmmtch_(char *, char *, char *, integer *,
3308+
integer *, integer *, doublereal *, integer *);
3309+
extern int dmmtch_(char *, char *, char *, integer *,
33303310
integer *, doublereal *, doublereal *, integer *, doublereal *,
33313311
integer *, doublereal *, doublereal *, integer *, doublereal *,
33323312
doublereal *, doublereal *, integer *, doublereal *, doublereal *,
@@ -3643,19 +3623,9 @@ doublereal ddiff_(doublereal* x, doublereal* y)
36433623
k, doublereal *alpha, integer *lda, integer *ldb, doublereal *beta,
36443624
integer *ldc)
36453625
{
3646-
/* Format strings */
3647-
static char fmt_9995[] = "(1x,i6,\002: \002,a13,\002(\002,a14,\002,\002,"
3648-
"a14,\002,\002,a14,\002,\002,a14,\002,\002)";
3649-
static char fmt_9994[] = "(10x,2(i3,\002,\002),\002 \002,f4.1,\002 , A"
3650-
",\002,i3,\002, B,\002,i3,\002, \002,f4.1,\002 , C,\002,i3,\002)"
3651-
".\002)";
3652-
36533626
/* Local variables */
36543627
char crc[14], cta[14], ctb[14], cuplo[14];
36553628

3656-
/* Fortran I/O blocks */
3657-
static cilist io___455 = { 0, 0, 0, fmt_9995, 0 };
3658-
static cilist io___456 = { 0, 0, 0, fmt_9994, 0 };
36593629

36603630

36613631
if (*(unsigned char *)uplo == 'U') {
@@ -3686,7 +3656,7 @@ doublereal ddiff_(doublereal* x, doublereal* y)
36863656
printf("%d %d %4.1f A, %d, B, %d, %4.1f, C, %d.\n",*n,*k,*alpha,*lda,*ldb,*beta,*ldc);
36873657
} /* dprcn8_ */
36883658

3689-
/* Subroutine */ void dmmtch_(char *uplo, char *transa, char *transb, integer *
3659+
/* Subroutine */ int dmmtch_(char *uplo, char *transa, char *transb, integer *
36903660
n, integer *kk, doublereal *alpha, doublereal *a, integer *lda,
36913661
doublereal *b, integer *ldb, doublereal *beta, doublereal *c__,
36923662
integer *ldc, doublereal *ct, doublereal *g, doublereal *cc, integer *

‎ctest/c_sblat3c.c‎

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -3252,30 +3252,9 @@ real sdiff_(real *x, real *y)
32523252
static char ich[3] = "NTC";
32533253
static char ishape[2] = "UL";
32543254

3255-
/* Format strings */
3256-
static char fmt_9994[] = "(\002 ******* FATAL ERROR - ERROR-CALL MYEXIT "
3257-
"TAKEN ON VALID CALL *******\002)";
3258-
static char fmt_9998[] = "(\002 ******* FATAL ERROR - PARAMETER NUMBER"
3259-
" \002,i2,\002 WAS CH\002,\002ANGED INCORRECTLY *******\002)";
3260-
static char fmt_10000[] = "(\002 \002,a13,\002 PASSED THE COLUMN-MAJOR C"
3261-
"OMPUTATIONAL TESTS\002,\002 (\002,i6,\002 CALL\002,\002S)\002)";
3262-
static char fmt_10001[] = "(\002 \002,a13,\002 PASSED THE ROW-MAJOR C"
3263-
"OMPUTATIONAL TESTS\002,\002 (\002,i6,\002 CALL\002,\002S)\002)";
3264-
static char fmt_10002[] = "(\002 \002,a13,\002 COMPLETED THE COLUMN-MAJO"
3265-
"R COMPUTATIONAL \002,\002TESTS (\002,i6,\002 CALLS)\002,/\002 **"
3266-
"***** BUT WITH MAXIMUM TEST \002,\002RATIO \002,f8.2,\002 - SUSP"
3267-
"ECT *******\002)";
3268-
static char fmt_10003[] = "(\002 \002,a13,\002 COMPLETED THE ROW-MAJOR "
3269-
" COMPUTATIONAL \002,\002TESTS (\002,i6,\002 CALLS)\002,/\002 **"
3270-
"***** BUT WITH MAXIMUM TEST \002,\002RATIO \002,f8.2,\002 - SUSP"
3271-
"ECT *******\002)";
3272-
static char fmt_9996[] = "(\002 ******* \002,a13,\002 FAILED ON CALL NUM"
3273-
"BER:\002)";
3274-
32753255
/* System generated locals */
32763256
integer a_dim1, a_offset, b_dim1, b_offset, c_dim1, c_offset, i__1, i__2,
32773257
i__3, i__4, i__5;
3278-
alist al__1;
32793258

32803259
/* Local variables */
32813260
extern /* Subroutine */ int csgemmtr_(integer *, char *, char *, char *,
@@ -3618,13 +3597,6 @@ real sdiff_(real *x, real *y)
36183597
*iorder, char *uplo, char *transa, char *transb, integer *n, integer *
36193598
k, real *alpha, integer *lda, integer *ldb, real *beta, integer *ldc)
36203599
{
3621-
/* Format strings */
3622-
static char fmt_9995[] = "(1x,i6,\002: \002,a13,\002(\002,a14,\002,\002,"
3623-
"a14,\002,\002,a14,\002,\002,a14,\002,\002)";
3624-
static char fmt_9994[] = "(10x,2(i3,\002,\002),\002 \002,f4.1,\002 , A"
3625-
",\002,i3,\002, B,\002,i3,\002, \002,f4.1,\002 , C,\002,i3,\002)"
3626-
".\002)";
3627-
36283600
/* Local variables */
36293601
char crc[14], cta[14], ctb[14], cuplo[14];
36303602

@@ -3662,11 +3634,6 @@ real sdiff_(real *x, real *y)
36623634
integer *ldcc, real *eps, real *err, logical *fatal, integer *nout,
36633635
logical *mv)
36643636
{
3665-
/* Format strings */
3666-
static char fmt_9998[] = "(1x,i7,2g18.6)";
3667-
static char fmt_9997[] = "(\002 THESE ARE THE RESULTS FOR COLUMN"
3668-
" \002,i3)";
3669-
36703637
/* System generated locals */
36713638
integer a_dim1, a_offset, b_dim1, b_offset, c_dim1, c_offset, cc_dim1,
36723639
cc_offset, i__1, i__2, i__3;

‎ctest/c_zblat3c.c‎

Lines changed: 0 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -3853,30 +3853,9 @@ doublereal ddiff_(doublereal* x, doublereal* y)
38533853
static char ich[3] = "NTC";
38543854
static char ishape[2] = "UL";
38553855

3856-
/* Format strings */
3857-
static char fmt_9994[] = "(\002 ******* FATAL ERROR - ERROR-CALL MYEXIT "
3858-
"TAKEN ON VALID CALL *******\002)";
3859-
static char fmt_9998[] = "(\002 ******* FATAL ERROR - PARAMETER NUMBER"
3860-
" \002,i2,\002 WAS CH\002,\002ANGED INCORRECTLY *******\002)";
3861-
static char fmt_10000[] = "(\002 \002,a13,\002 PASSED THE COLUMN-MAJOR C"
3862-
"OMPUTATIONAL TESTS\002,\002 (\002,i6,\002 CALL\002,\002S)\002)";
3863-
static char fmt_10001[] = "(\002 \002,a13,\002 PASSED THE ROW-MAJOR C"
3864-
"OMPUTATIONAL TESTS\002,\002 (\002,i6,\002 CALL\002,\002S)\002)";
3865-
static char fmt_10002[] = "(\002 \002,a13,\002 COMPLETED THE COLUMN-MAJO"
3866-
"R COMPUTATIONAL \002,\002TESTS (\002,i6,\002 CALLS)\002,/\002 **"
3867-
"***** BUT WITH MAXIMUM TEST \002,\002RATIO \002,f8.2,\002 - SUSP"
3868-
"ECT *******\002)";
3869-
static char fmt_10003[] = "(\002 \002,a13,\002 COMPLETED THE ROW-MAJOR "
3870-
" COMPUTATIONAL \002,\002TESTS (\002,i6,\002 CALLS)\002,/\002 **"
3871-
"***** BUT WITH MAXIMUM TEST \002,\002RATIO \002,f8.2,\002 - SUSP"
3872-
"ECT *******\002)";
3873-
static char fmt_9996[] = "(\002 ******* \002,a13,\002 FAILED ON CALL NUM"
3874-
"BER:\002)";
3875-
38763856
/* System generated locals */
38773857
integer a_dim1, a_offset, b_dim1, b_offset, c_dim1, c_offset, i__1, i__2,
38783858
i__3, i__4, i__5, i__6, i__7;
3879-
alist al__1;
38803859

38813860
/* Local variables */
38823861
extern /* Subroutine */ int czgemmtr_(integer *, char *, char *, char *,
@@ -3914,17 +3893,6 @@ doublereal ddiff_(doublereal* x, doublereal* y)
39143893
extern logical lzeres_(char *, char *, integer *, integer *,
39153894
doublecomplex *, doublecomplex *, integer *);
39163895

3917-
/* Fortran I/O blocks */
3918-
static cilist io___468 = { 0, 0, 0, fmt_9994, 0 };
3919-
static cilist io___471 = { 0, 0, 0, fmt_9998, 0 };
3920-
static cilist io___473 = { 0, 0, 0, fmt_10000, 0 };
3921-
static cilist io___474 = { 0, 0, 0, fmt_10001, 0 };
3922-
static cilist io___475 = { 0, 0, 0, fmt_10002, 0 };
3923-
static cilist io___476 = { 0, 0, 0, fmt_10003, 0 };
3924-
static cilist io___477 = { 0, 0, 0, fmt_9996, 0 };
3925-
3926-
3927-
39283896
/* Tests CGEMMTR. */
39293897

39303898
/* Auxiliary routine for test program for Level 3 Blas. */
@@ -4249,21 +4217,9 @@ doublereal ddiff_(doublereal* x, doublereal* y)
42494217
k, doublecomplex *alpha, integer *lda, integer *ldb, doublecomplex *
42504218
beta, integer *ldc)
42514219
{
4252-
/* Format strings */
4253-
static char fmt_9995[] = "(1x,i6,\002: \002,a13,\002(\002,a14,\002,\002,"
4254-
"a14,\002,\002,a14,\002,\002,a14,\002,\002)";
4255-
static char fmt_9994[] = "(10x,2(i3,\002,\002),\002 (\002,f4.1,\002,\002"
4256-
",f4.1,\002) , A,\002,i3,\002, B,\002,i3,\002, (\002,f4.1,\002"
4257-
",\002,f4.1,\002) , C,\002,i3,\002).\002)";
4258-
42594220
/* Local variables */
42604221
char crc[14], cta[14], ctb[14], cuplo[14];
42614222

4262-
/* Fortran I/O blocks */
4263-
static cilist io___482 = { 0, 0, 0, fmt_9995, 0 };
4264-
static cilist io___483 = { 0, 0, 0, fmt_9994, 0 };
4265-
4266-
42674223
if (*(unsigned char *)uplo == 'U') {
42684224
s_copy(cuplo, "CblasUpper", (ftnlen)14, (ftnlen)10);
42694225
} else {
@@ -4300,16 +4256,6 @@ doublereal ddiff_(doublereal* x, doublereal* y)
43004256
cc, integer *ldcc, doublereal *eps, doublereal *err, logical *fatal,
43014257
integer *nout, logical *mv)
43024258
{
4303-
/* Format strings */
4304-
static char fmt_9999[] = "(\002 ******* FATAL ERROR - COMPUTED RESULT IS"
4305-
" LESS THAN HAL\002,\002F ACCURATE *******\002,/\002 "
4306-
" EXPECTED RE\002,\002SULT COMPUTED R"
4307-
"ESULT\002)";
4308-
static char fmt_9998[] = "(1x,i7,2(\002 (\002,g15.6,\002,\002,g15.6,"
4309-
"\002)\002))";
4310-
static char fmt_9997[] = "(\002 THESE ARE THE RESULTS FOR COLUMN"
4311-
" \002,i3)";
4312-
43134259
/* System generated locals */
43144260
integer a_dim1, a_offset, b_dim1, b_offset, c_dim1, c_offset, cc_dim1,
43154261
cc_offset, i__1, i__2, i__3, i__4, i__5, i__6, i__7;

‎ctest/c_zblat3c_3m.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ static logical c_false = FALSE_;
272272
{
273273
/* Initialized data */
274274

275-
static char snames[9][13] = { "cblas_zgemm3m ", "cblas_zhemm ", "cblas_zsymm ", "cblas_ztrmm ",
275+
static char snames[9][13] = { "cblas_zgemm3m", "cblas_zhemm ", "cblas_zsymm ", "cblas_ztrmm ",
276276
"cblas_ztrsm ", "cblas_zherk ", "cblas_zsyrk ", "cblas_zher2k", "cblas_zsyr2k"};
277277

278278
/* System generated locals */

0 commit comments

Comments
 (0)