Skip to content

Commit 01492de

Browse files
martin-frbgmartin-frbg
authored
Merge pull request #2895 from martin-frbg/sb-tests
Fix remaining build errors related to bfloat16 and cmake
2 parents bd07524 + c1f4f5d commit 01492de

3 files changed

Lines changed: 41 additions & 99 deletions

File tree

‎ctest/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/test_cblas_helper.sh
1212
foreach(float_type ${FLOAT_TYPES})
1313
string(SUBSTRING ${float_type} 0 1 float_char_upper)
1414
string(TOLOWER ${float_char_upper} float_char)
15-
if (${float_char} STREQUAL "h")
15+
if (${float_char} STREQUAL "b")
1616
continue()
1717
endif()
1818
#level1

‎lapack/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
include_directories(${PROJECT_SOURCE_DIR})
33
include_directories(${PROJECT_BINARY_DIR})
44

5-
list (REMOVE_ITEM FLOAT_TYPES "HALF")
5+
list (REMOVE_ITEM FLOAT_TYPES "BFLOAT16")
66

77
set(LAPACK_SOURCES
88
potrf/potrf_U_single.c

‎test/Makefile‎

Lines changed: 39 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -7,40 +7,22 @@ all ::
77
else
88
all :: level1 level2 level3
99
endif
10-
ifeq ($(BUILD_SINGLE)x$(BUILD_DOUBLE)x$(BUILD_COMPLEX)x$(BUILD_COMPLEX16),1x1x1x1)
11-
level1: sblat1 dblat1 cblat1 zblat1
12-
endif
13-
ifeq ($(BUILD_SINGLE)x$(BUILD_DOUBLE)x$(BUILD_COMPLEX)x$(BUILD_COMPLEX16),x1x1x1)
14-
level1: dblat1 cblat1 zblat1
15-
endif
16-
ifeq ($(BUILD_SINGLE)x$(BUILD_DOUBLE)x$(BUILD_COMPLEX)x$(BUILD_COMPLEX16),1xx1x1)
17-
level1: sblat1 cblat1 zblat1
18-
endif
19-
ifeq ($(BUILD_SINGLE)x$(BUILD_DOUBLE)x$(BUILD_COMPLEX)x$(BUILD_COMPLEX16),xx1x1)
20-
level1: cblat1 zblat1
21-
endif
22-
ifeq ($(BUILD_SINGLE)x$(BUILD_DOUBLE)x$(BUILD_COMPLEX)x$(BUILD_COMPLEX16),xx1x)
23-
level1: cblat1
24-
endif
25-
ifeq ($(BUILD_SINGLE)x$(BUILD_DOUBLE)x$(BUILD_COMPLEX)x$(BUILD_COMPLEX16),xxx1)
26-
level1: zblat1
27-
endif
28-
ifeq ($(BUILD_SINGLE)x$(BUILD_DOUBLE)x$(BUILD_COMPLEX)x$(BUILD_COMPLEX16),1xxx1)
29-
level1: sblat1 zblat1
30-
endif
31-
ifeq ($(BUILD_SINGLE)x$(BUILD_DOUBLE)x$(BUILD_COMPLEX)x$(BUILD_COMPLEX16),1x1xx1)
32-
level1: sblat1 dblat1 zblat1
10+
11+
ifeq ($(BUILD_SINGLE),1)
12+
S1=sblat1
3313
endif
34-
ifeq ($(BUILD_SINGLE)x$(BUILD_DOUBLE)x$(BUILD_COMPLEX)x$(BUILD_COMPLEX16),1x1xx)
35-
level1: sblat1 dblat1
14+
ifeq ($(BUILD_DOUBLE),1)
15+
D1=dblat1
3616
endif
37-
ifeq ($(BUILD_SINGLE)x$(BUILD_DOUBLE)x$(BUILD_COMPLEX)x$(BUILD_COMPLEX16),1xxx)
38-
level1: sblat1
17+
ifeq ($(BUILD_COMPLEX),1)
18+
C1=cblat1
3919
endif
40-
ifeq ($(BUILD_SINGLE)x$(BUILD_DOUBLE)x$(BUILD_COMPLEX)x$(BUILD_COMPLEX16),x1xx)
41-
level1: dblat1
20+
ifeq ($(BUILD_COMPLEX16),1)
21+
Z1=zblat1
4222
endif
4323

24+
level1: $(S1) $(D1) $(C1) $(Z1)
25+
4426
ifndef CROSS
4527
ifeq ($(BUILD_SINGLE),1)
4628
OPENBLAS_NUM_THREADS=1 OMP_NUM_THREADS=1 ./sblat1
@@ -85,41 +67,22 @@ endif
8567
endif
8668
endif
8769

88-
#level2: sblat2 dblat2 cblat2 zblat2
89-
ifeq ($(BUILD_SINGLE)x$(BUILD_DOUBLE)x$(BUILD_COMPLEX)x$(BUILD_COMPLEX16),1x1x1x1)
90-
level2: sblat2 dblat2 cblat2 zblat2
91-
endif
92-
ifeq ($(BUILD_SINGLE)x$(BUILD_DOUBLE)x$(BUILD_COMPLEX)x$(BUILD_COMPLEX16),x1x1x1)
93-
level2: dblat2 cblat2 zblat2
94-
endif
95-
ifeq ($(BUILD_SINGLE)x$(BUILD_DOUBLE)x$(BUILD_COMPLEX)x$(BUILD_COMPLEX16),1xx1x1)
96-
level2: sblat2 cblat2 zblat2
97-
endif
98-
ifeq ($(BUILD_SINGLE)x$(BUILD_DOUBLE)x$(BUILD_COMPLEX)x$(BUILD_COMPLEX16),xx1x1)
99-
level2: cblat2 zblat2
100-
endif
101-
ifeq ($(BUILD_SINGLE)x$(BUILD_DOUBLE)x$(BUILD_COMPLEX)x$(BUILD_COMPLEX16),xx1x)
102-
level2: cblat2
103-
endif
104-
ifeq ($(BUILD_SINGLE)x$(BUILD_DOUBLE)x$(BUILD_COMPLEX)x$(BUILD_COMPLEX16),xxx1)
105-
level2: zblat2
106-
endif
107-
ifeq ($(BUILD_SINGLE)x$(BUILD_DOUBLE)x$(BUILD_COMPLEX)x$(BUILD_COMPLEX16),1xxx1)
108-
level2: sblat2 zblat2
109-
endif
110-
ifeq ($(BUILD_SINGLE)x$(BUILD_DOUBLE)x$(BUILD_COMPLEX)x$(BUILD_COMPLEX16),1x1xx1)
111-
level2: sblat2 dblat2 zblat2
70+
ifeq ($(BUILD_SINGLE),1)
71+
S2=sblat2
11272
endif
113-
ifeq ($(BUILD_SINGLE)x$(BUILD_DOUBLE)x$(BUILD_COMPLEX)x$(BUILD_COMPLEX16),1x1xx)
114-
level2: sblat2 dblat2
73+
ifeq ($(BUILD_DOUBLE),1)
74+
D2=dblat2
11575
endif
116-
ifeq ($(BUILD_SINGLE)x$(BUILD_DOUBLE)x$(BUILD_COMPLEX)x$(BUILD_COMPLEX16),1xxx)
117-
level2: sblat2
76+
ifeq ($(BUILD_COMPLEX),1)
77+
C2=cblat2
11878
endif
119-
ifeq ($(BUILD_SINGLE)x$(BUILD_DOUBLE)x$(BUILD_COMPLEX)x$(BUILD_COMPLEX16),x1xx)
120-
level2: dblat2
79+
ifeq ($(BUILD_COMPLEX16),1)
80+
Z2=zblat2
12181
endif
12282

83+
level2: $(S2) $(D2) $(C2) $(Z2)
84+
85+
12386
ifndef CROSS
12487
rm -f ?BLAT2.SUMM
12588
ifeq ($(BUILD_SINGLE),1)
@@ -178,51 +141,30 @@ endif
178141
endif
179142
endif
180143

181-
ifeq ($(BUILD_SINGLE)x$(BUILD_DOUBLE)x$(BUILD_COMPLEX)x$(BUILD_COMPLEX16),1x1x1x1)
182-
level3: sblat3 dblat3 cblat3 zblat3
183-
endif
184-
ifeq ($(BUILD_SINGLE)x$(BUILD_DOUBLE)x$(BUILD_COMPLEX)x$(BUILD_COMPLEX16),x1x1x1)
185-
level3: dblat3 cblat3 zblat3
186-
endif
187-
ifeq ($(BUILD_SINGLE)x$(BUILD_DOUBLE)x$(BUILD_COMPLEX)x$(BUILD_COMPLEX16),1xx1x1)
188-
level3: sblat3 cblat3 zblat3
189-
endif
190-
ifeq ($(BUILD_SINGLE)x$(BUILD_DOUBLE)x$(BUILD_COMPLEX)x$(BUILD_COMPLEX16),xx1x1)
191-
level3: cblat3 zblat3
192-
endif
193-
ifeq ($(BUILD_SINGLE)x$(BUILD_DOUBLE)x$(BUILD_COMPLEX)x$(BUILD_COMPLEX16),xx1x)
194-
level3: cblat3
195-
endif
196-
ifeq ($(BUILD_SINGLE)x$(BUILD_DOUBLE)x$(BUILD_COMPLEX)x$(BUILD_COMPLEX16),xxx1)
197-
level3: zblat3
198-
endif
199-
ifeq ($(BUILD_SINGLE)x$(BUILD_DOUBLE)x$(BUILD_COMPLEX)x$(BUILD_COMPLEX16),1xxx1)
200-
level3: sblat3 zblat3
144+
ifeq ($(BUILD_BFLOAT16),1)
145+
B3= test_sbgemm
201146
endif
202-
ifeq ($(BUILD_SINGLE)x$(BUILD_DOUBLE)x$(BUILD_COMPLEX)x$(BUILD_COMPLEX16),1x1xx1)
203-
level3: sblat3 dblat3 zblat3
147+
ifeq ($(BUILD_SINGLE),1)
148+
S3=sblat3
204149
endif
205-
ifeq ($(BUILD_SINGLE)x$(BUILD_DOUBLE)x$(BUILD_COMPLEX)x$(BUILD_COMPLEX16),1x1xx)
206-
level3: sblat3 dblat3
150+
ifeq ($(BUILD_DOUBLE),1)
151+
D3=dblat3
207152
endif
208-
ifeq ($(BUILD_SINGLE)x$(BUILD_DOUBLE)x$(BUILD_COMPLEX)x$(BUILD_COMPLEX16),1xxx)
209-
level3: sblat3
153+
ifeq ($(BUILD_COMPLEX),1)
154+
C3=cblat3
210155
endif
211-
ifeq ($(BUILD_SINGLE)x$(BUILD_DOUBLE)x$(BUILD_COMPLEX)x$(BUILD_COMPLEX16),x1xx)
212-
level3: dblat3
156+
ifeq ($(BUILD_COMPLEX16),1)
157+
Z3=zblat3
213158
endif
214159

160+
level3: $(B3) $(S3) $(D3) $(C3) $(Z3)
215161

216162

217-
ifeq ($(BUILD_BFLOAT16),1)
218-
level3 : test_sbgemm
219-
endif
220-
221163
ifndef CROSS
222164
rm -f ?BLAT3.SUMM
223165
ifeq ($(BUILD_BFLOAT16),1)
224-
OPENBLAS_NUM_THREADS=1 OMP_NUM_THREADS=1 ./test_sbgemm > SHBLAT3.SUMM
225-
@$(GREP) -q FATAL SHBLAT3.SUMM && cat SHBLAT3.SUMM || exit 0
166+
OPENBLAS_NUM_THREADS=1 OMP_NUM_THREADS=1 ./test_sbgemm > SBBLAT3.SUMM
167+
@$(GREP) -q FATAL SBBLAT3.SUMM && cat SBBLAT3.SUMM || exit 0
226168
endif
227169
ifeq ($(BUILD_SINGLE),1)
228170
OPENBLAS_NUM_THREADS=1 OMP_NUM_THREADS=1 ./sblat3 < ./sblat3.dat
@@ -244,8 +186,8 @@ ifdef SMP
244186
rm -f ?BLAT3.SUMM
245187
ifeq ($(USE_OPENMP), 1)
246188
ifeq ($(BUILD_BFLOAT16),1)
247-
OMP_NUM_THREADS=2 ./test_sbgemm > SHBLAT3.SUMM
248-
@$(GREP) -q FATAL SHBLAT3.SUMM && cat SHBLAT3.SUMM || exit 0
189+
OMP_NUM_THREADS=2 ./test_sbgemm > SBBLAT3.SUMM
190+
@$(GREP) -q FATAL SBBLAT3.SUMM && cat SBBLAT3.SUMM || exit 0
249191
endif
250192
ifeq ($(BUILD_SINGLE),1)
251193
OMP_NUM_THREADS=2 ./sblat3 < ./sblat3.dat
@@ -265,8 +207,8 @@ ifeq ($(BUILD_COMPLEX16),1)
265207
endif
266208
else
267209
ifeq ($(BUILD_BFLOAT16),1)
268-
OPENBLAS_NUM_THREADS=2 ./test_sbgemm > SHBLAT3.SUMM
269-
@$(GREP) -q FATAL SHBLAT3.SUMM && cat SHBLAT3.SUMM || exit 0
210+
OPENBLAS_NUM_THREADS=2 ./test_sbgemm > SBBLAT3.SUMM
211+
@$(GREP) -q FATAL SBBLAT3.SUMM && cat SBBLAT3.SUMM || exit 0
270212
endif
271213
ifeq ($(BUILD_SINGLE),1)
272214
OPENBLAS_NUM_THREADS=2 ./sblat3 < ./sblat3.dat

0 commit comments

Comments
 (0)