Skip to content

Commit 88aa204

Browse files
langoulangou
authored
Revert "Add Index-64 API as extended API with _64 suffix for CBLAS"
1 parent a9a4288 commit 88aa204

File tree

207 files changed

+865
-1771
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

207 files changed

+865
-1771
lines changed

‎BLAS/SRC/CMakeLists.txt‎

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -109,35 +109,7 @@ if(BUILD_COMPLEX16)
109109
endif()
110110
list(REMOVE_DUPLICATES SOURCES)
111111

112-
add_library(${BLASLIB}_obj OBJECT ${SOURCES})
113-
target_compile_options(${BLASLIB}_obj PRIVATE -fPIC)
114-
115-
if(BUILD_INDEX64_EXT_API)
116-
#Add _64 suffix to all Fortran functions via macros
117-
set(COPT_64_F)
118-
list(APPEND COPT_64_F -cpp)
119-
foreach(F IN LISTS SOURCES)
120-
file(STRINGS ${F} ${F}.lst)
121-
list(FILTER ${F}.lst INCLUDE REGEX "subroutine|SUBROUTINE|external|EXTERNAL|function|FUNCTION")
122-
list(FILTER ${F}.lst EXCLUDE REGEX "^!.*")
123-
list(FILTER ${F}.lst EXCLUDE REGEX "^[*].*")
124-
list(FILTER ${F}.lst EXCLUDE REGEX "end|END")
125-
foreach(FUNC IN LISTS ${F}.lst)
126-
string(REGEX REPLACE "^[a-zA-Z0-9_ *]*(subroutine|SUBROUTINE|external|EXTERNAL|function|FUNCTION)[ ]*[*]?" "" FUNC ${FUNC})
127-
string(REGEX REPLACE "[(][a-zA-Z0-9_, )]*$" "" FUNC ${FUNC})
128-
string(STRIP ${FUNC} FUNC)
129-
list(APPEND COPT_64_F "-D${FUNC}=${FUNC}_64")
130-
endforeach()
131-
endforeach()
132-
list(REMOVE_DUPLICATES COPT_64_F)
133-
add_library(${BLASLIB}_64_obj OBJECT ${SOURCES})
134-
target_compile_options(${BLASLIB}_64_obj PRIVATE -fPIC ${FOPT_ILP64} ${COPT_64_F})
135-
endif()
136-
137-
add_library(${BLASLIB}
138-
$<TARGET_OBJECTS:${BLASLIB}_obj>
139-
$<$<BOOL:${BUILD_INDEX64_EXT_API}>: $<TARGET_OBJECTS:${BLASLIB}_64_obj>>)
140-
112+
add_library(${BLASLIB} ${SOURCES})
141113
set_target_properties(
142114
${BLASLIB} PROPERTIES
143115
VERSION ${LAPACK_VERSION}

‎BLAS/SRC/cgbmv.f‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,7 @@
183183
*> \endverbatim
184184
*>
185185
* =====================================================================
186-
SUBROUTINE CGBMV(TRANS,M,N,KL,KU,ALPHA,A,LDA,X,INCX,
187-
+ BETA,Y,INCY)
186+
SUBROUTINE CGBMV(TRANS,M,N,KL,KU,ALPHA,A,LDA,X,INCX,BETA,Y,INCY)
188187
*
189188
* -- Reference BLAS level2 routine --
190189
* -- Reference BLAS is a software package provided by Univ. of Tennessee, --

‎BLAS/SRC/cgemm.f‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,7 @@
183183
*> \endverbatim
184184
*>
185185
* =====================================================================
186-
SUBROUTINE CGEMM(TRANSA,TRANSB,M,N,K,ALPHA,A,LDA,B,LDB,
187-
+ BETA,C,LDC)
186+
SUBROUTINE CGEMM(TRANSA,TRANSB,M,N,K,ALPHA,A,LDA,B,LDB,BETA,C,LDC)
188187
*
189188
* -- Reference BLAS level3 routine --
190189
* -- Reference BLAS is a software package provided by Univ. of Tennessee, --

‎BLAS/SRC/chemm.f‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -238,11 +238,9 @@ SUBROUTINE CHEMM(SIDE,UPLO,M,N,ALPHA,A,LDA,B,LDB,BETA,C,LDC)
238238
* Test the input parameters.
239239
*
240240
INFO = 0
241-
IF ((.NOT.LSAME(SIDE,'L')) .AND.
242-
+ (.NOT.LSAME(SIDE,'R'))) THEN
241+
IF ((.NOT.LSAME(SIDE,'L')) .AND. (.NOT.LSAME(SIDE,'R'))) THEN
243242
INFO = 1
244-
ELSE IF ((.NOT.UPPER) .AND.
245-
+ (.NOT.LSAME(UPLO,'L'))) THEN
243+
ELSE IF ((.NOT.UPPER) .AND. (.NOT.LSAME(UPLO,'L'))) THEN
246244
INFO = 2
247245
ELSE IF (M.LT.0) THEN
248246
INFO = 3

‎BLAS/SRC/csymm.f‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -236,11 +236,9 @@ SUBROUTINE CSYMM(SIDE,UPLO,M,N,ALPHA,A,LDA,B,LDB,BETA,C,LDC)
236236
* Test the input parameters.
237237
*
238238
INFO = 0
239-
IF ((.NOT.LSAME(SIDE,'L')) .AND.
240-
+ (.NOT.LSAME(SIDE,'R'))) THEN
239+
IF ((.NOT.LSAME(SIDE,'L')) .AND. (.NOT.LSAME(SIDE,'R'))) THEN
241240
INFO = 1
242-
ELSE IF ((.NOT.UPPER) .AND.
243-
+ (.NOT.LSAME(UPLO,'L'))) THEN
241+
ELSE IF ((.NOT.UPPER) .AND. (.NOT.LSAME(UPLO,'L'))) THEN
244242
INFO = 2
245243
ELSE IF (M.LT.0) THEN
246244
INFO = 3

‎BLAS/SRC/ctbmv.f‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -223,12 +223,10 @@ SUBROUTINE CTBMV(UPLO,TRANS,DIAG,N,K,A,LDA,X,INCX)
223223
INFO = 0
224224
IF (.NOT.LSAME(UPLO,'U') .AND. .NOT.LSAME(UPLO,'L')) THEN
225225
INFO = 1
226-
ELSE IF (.NOT.LSAME(TRANS,'N') .AND.
227-
+ .NOT.LSAME(TRANS,'T') .AND.
226+
ELSE IF (.NOT.LSAME(TRANS,'N') .AND. .NOT.LSAME(TRANS,'T') .AND.
228227
+ .NOT.LSAME(TRANS,'C')) THEN
229228
INFO = 2
230-
ELSE IF (.NOT.LSAME(DIAG,'U') .AND.
231-
+ .NOT.LSAME(DIAG,'N')) THEN
229+
ELSE IF (.NOT.LSAME(DIAG,'U') .AND. .NOT.LSAME(DIAG,'N')) THEN
232230
INFO = 3
233231
ELSE IF (N.LT.0) THEN
234232
INFO = 4

‎BLAS/SRC/ctbsv.f‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -226,12 +226,10 @@ SUBROUTINE CTBSV(UPLO,TRANS,DIAG,N,K,A,LDA,X,INCX)
226226
INFO = 0
227227
IF (.NOT.LSAME(UPLO,'U') .AND. .NOT.LSAME(UPLO,'L')) THEN
228228
INFO = 1
229-
ELSE IF (.NOT.LSAME(TRANS,'N') .AND.
230-
+ .NOT.LSAME(TRANS,'T') .AND.
229+
ELSE IF (.NOT.LSAME(TRANS,'N') .AND. .NOT.LSAME(TRANS,'T') .AND.
231230
+ .NOT.LSAME(TRANS,'C')) THEN
232231
INFO = 2
233-
ELSE IF (.NOT.LSAME(DIAG,'U') .AND.
234-
+ .NOT.LSAME(DIAG,'N')) THEN
232+
ELSE IF (.NOT.LSAME(DIAG,'U') .AND. .NOT.LSAME(DIAG,'N')) THEN
235233
INFO = 3
236234
ELSE IF (N.LT.0) THEN
237235
INFO = 4

‎BLAS/SRC/ctpmv.f‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -179,12 +179,10 @@ SUBROUTINE CTPMV(UPLO,TRANS,DIAG,N,AP,X,INCX)
179179
INFO = 0
180180
IF (.NOT.LSAME(UPLO,'U') .AND. .NOT.LSAME(UPLO,'L')) THEN
181181
INFO = 1
182-
ELSE IF (.NOT.LSAME(TRANS,'N') .AND.
183-
+ .NOT.LSAME(TRANS,'T') .AND.
182+
ELSE IF (.NOT.LSAME(TRANS,'N') .AND. .NOT.LSAME(TRANS,'T') .AND.
184183
+ .NOT.LSAME(TRANS,'C')) THEN
185184
INFO = 2
186-
ELSE IF (.NOT.LSAME(DIAG,'U') .AND.
187-
+ .NOT.LSAME(DIAG,'N')) THEN
185+
ELSE IF (.NOT.LSAME(DIAG,'U') .AND. .NOT.LSAME(DIAG,'N')) THEN
188186
INFO = 3
189187
ELSE IF (N.LT.0) THEN
190188
INFO = 4

‎BLAS/SRC/ctpsv.f‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -181,12 +181,10 @@ SUBROUTINE CTPSV(UPLO,TRANS,DIAG,N,AP,X,INCX)
181181
INFO = 0
182182
IF (.NOT.LSAME(UPLO,'U') .AND. .NOT.LSAME(UPLO,'L')) THEN
183183
INFO = 1
184-
ELSE IF (.NOT.LSAME(TRANS,'N') .AND.
185-
+ .NOT.LSAME(TRANS,'T') .AND.
184+
ELSE IF (.NOT.LSAME(TRANS,'N') .AND. .NOT.LSAME(TRANS,'T') .AND.
186185
+ .NOT.LSAME(TRANS,'C')) THEN
187186
INFO = 2
188-
ELSE IF (.NOT.LSAME(DIAG,'U') .AND.
189-
+ .NOT.LSAME(DIAG,'N')) THEN
187+
ELSE IF (.NOT.LSAME(DIAG,'U') .AND. .NOT.LSAME(DIAG,'N')) THEN
190188
INFO = 3
191189
ELSE IF (N.LT.0) THEN
192190
INFO = 4

‎BLAS/SRC/ctrmm.f‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,8 +233,7 @@ SUBROUTINE CTRMM(SIDE,UPLO,TRANSA,DIAG,M,N,ALPHA,A,LDA,B,LDB)
233233
+ (.NOT.LSAME(TRANSA,'T')) .AND.
234234
+ (.NOT.LSAME(TRANSA,'C'))) THEN
235235
INFO = 3
236-
ELSE IF ((.NOT.LSAME(DIAG,'U')) .AND.
237-
+ (.NOT.LSAME(DIAG,'N'))) THEN
236+
ELSE IF ((.NOT.LSAME(DIAG,'U')) .AND. (.NOT.LSAME(DIAG,'N'))) THEN
238237
INFO = 4
239238
ELSE IF (M.LT.0) THEN
240239
INFO = 5

0 commit comments

Comments
 (0)