floraachy
/
OpenBLAS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #851 from rndfax/develop 

allow building tests when CROSS compiling but don't run them
This commit is contained in:
Zhang Xianyi 2016-04-26 10:24:13 -04:00
parent 6abec09eb4 3d50ccdc0d
commit 7e253607c2
4 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -108,8 +108,6 @@ endif
tests : tests :
ifndef NOFORTRAN ifndef NOFORTRAN
ifndef TARGET
ifndef CROSS
touch $(LIBNAME) touch $(LIBNAME)
ifndef NO_FBLAS ifndef NO_FBLAS
$(MAKE) -C test all $(MAKE) -C test all
@ -119,8 +117,6 @@ ifndef NO_CBLAS
$(MAKE) -C ctest all $(MAKE) -C ctest all
endif endif
endif endif
endif
endif
libs : libs :
ifeq ($(CORE), UNKOWN) ifeq ($(CORE), UNKOWN)

6
ctest/Makefile
View File

@ -42,6 +42,7 @@ ztestl3o_3m = c_zblas3_3m.o c_z3chke_3m.o auxiliary.o c_xerbla.o constant.o
all :: all1 all2 all3 all :: all1 all2 all3
all1: xscblat1 xdcblat1 xccblat1 xzcblat1 all1: xscblat1 xdcblat1 xccblat1 xzcblat1
ifndef CROSS
ifeq ($(USE_OPENMP), 1) ifeq ($(USE_OPENMP), 1)
OMP_NUM_THREADS=2 ./xscblat1 OMP_NUM_THREADS=2 ./xscblat1
OMP_NUM_THREADS=2 ./xdcblat1 OMP_NUM_THREADS=2 ./xdcblat1
@ -53,8 +54,10 @@ else
OPENBLAS_NUM_THREADS=2 ./xccblat1 OPENBLAS_NUM_THREADS=2 ./xccblat1
OPENBLAS_NUM_THREADS=2 ./xzcblat1 OPENBLAS_NUM_THREADS=2 ./xzcblat1
endif endif
endif
all2: xscblat2 xdcblat2 xccblat2 xzcblat2 all2: xscblat2 xdcblat2 xccblat2 xzcblat2
ifndef CROSS
ifeq ($(USE_OPENMP), 1) ifeq ($(USE_OPENMP), 1)
OMP_NUM_THREADS=2 ./xscblat2 < sin2 OMP_NUM_THREADS=2 ./xscblat2 < sin2
OMP_NUM_THREADS=2 ./xdcblat2 < din2 OMP_NUM_THREADS=2 ./xdcblat2 < din2
@ -66,8 +69,10 @@ else
OPENBLAS_NUM_THREADS=2 ./xccblat2 < cin2 OPENBLAS_NUM_THREADS=2 ./xccblat2 < cin2
OPENBLAS_NUM_THREADS=2 ./xzcblat2 < zin2 OPENBLAS_NUM_THREADS=2 ./xzcblat2 < zin2
endif endif
endif
all3: xscblat3 xdcblat3 xccblat3 xzcblat3 all3: xscblat3 xdcblat3 xccblat3 xzcblat3
ifndef CROSS
ifeq ($(USE_OPENMP), 1) ifeq ($(USE_OPENMP), 1)
OMP_NUM_THREADS=2 ./xscblat3 < sin3 OMP_NUM_THREADS=2 ./xscblat3 < sin3
OMP_NUM_THREADS=2 ./xdcblat3 < din3 OMP_NUM_THREADS=2 ./xdcblat3 < din3
@ -88,6 +93,7 @@ else
OPENBLAS_NUM_THREADS=2 ./xccblat3_3m < cin3_3m OPENBLAS_NUM_THREADS=2 ./xccblat3_3m < cin3_3m
OPENBLAS_NUM_THREADS=2 ./xzcblat3_3m < zin3_3m OPENBLAS_NUM_THREADS=2 ./xzcblat3_3m < zin3_3m
endif endif
endif

8
test/Makefile
View File

@ -4,6 +4,7 @@ include ../Makefile.system
all :: level1 level2 level3 all :: level1 level2 level3
level1 : sblat1 dblat1 cblat1 zblat1 level1 : sblat1 dblat1 cblat1 zblat1
ifndef CROSS
OPENBLAS_NUM_THREADS=1 OMP_NUM_THREADS=1 ./sblat1 OPENBLAS_NUM_THREADS=1 OMP_NUM_THREADS=1 ./sblat1
OPENBLAS_NUM_THREADS=1 OMP_NUM_THREADS=1 ./dblat1 OPENBLAS_NUM_THREADS=1 OMP_NUM_THREADS=1 ./dblat1
OPENBLAS_NUM_THREADS=1 OMP_NUM_THREADS=1 ./cblat1 OPENBLAS_NUM_THREADS=1 OMP_NUM_THREADS=1 ./cblat1
@ -21,8 +22,10 @@ else
OPENBLAS_NUM_THREADS=2 ./zblat1 OPENBLAS_NUM_THREADS=2 ./zblat1
endif endif
endif endif
endif
level2 : sblat2 dblat2 cblat2 zblat2 level2 : sblat2 dblat2 cblat2 zblat2
ifndef CROSS
rm -f ?BLAT2.SUMM rm -f ?BLAT2.SUMM
OPENBLAS_NUM_THREADS=1 OMP_NUM_THREADS=1 ./sblat2 < ./sblat2.dat OPENBLAS_NUM_THREADS=1 OMP_NUM_THREADS=1 ./sblat2 < ./sblat2.dat
@$(GREP) -q FATAL SBLAT2.SUMM && cat SBLAT2.SUMM || exit 0 @$(GREP) -q FATAL SBLAT2.SUMM && cat SBLAT2.SUMM || exit 0
@ -54,8 +57,10 @@ else
@$(GREP) -q FATAL ZBLAT2.SUMM && cat ZBLAT2.SUMM || exit 0 @$(GREP) -q FATAL ZBLAT2.SUMM && cat ZBLAT2.SUMM || exit 0
endif endif
endif endif
endif
level3 : sblat3 dblat3 cblat3 zblat3 level3 : sblat3 dblat3 cblat3 zblat3
ifndef CROSS
rm -f ?BLAT3.SUMM rm -f ?BLAT3.SUMM
OPENBLAS_NUM_THREADS=1 OMP_NUM_THREADS=1 ./sblat3 < ./sblat3.dat OPENBLAS_NUM_THREADS=1 OMP_NUM_THREADS=1 ./sblat3 < ./sblat3.dat
@$(GREP) -q FATAL SBLAT3.SUMM && cat SBLAT3.SUMM || exit 0 @$(GREP) -q FATAL SBLAT3.SUMM && cat SBLAT3.SUMM || exit 0
@ -87,9 +92,11 @@ else
@$(GREP) -q FATAL ZBLAT3.SUMM && cat ZBLAT3.SUMM || exit 0 @$(GREP) -q FATAL ZBLAT3.SUMM && cat ZBLAT3.SUMM || exit 0
endif endif
endif endif
endif
level3_3m : zblat3_3m cblat3_3m level3_3m : zblat3_3m cblat3_3m
ifndef CROSS
rm -f ?BLAT3_3M.SUMM rm -f ?BLAT3_3M.SUMM
OPENBLAS_NUM_THREADS=1 OMP_NUM_THREADS=1 ./cblat3_3m < ./cblat3_3m.dat OPENBLAS_NUM_THREADS=1 OMP_NUM_THREADS=1 ./cblat3_3m < ./cblat3_3m.dat
@$(GREP) -q FATAL CBLAT3_3M.SUMM && cat CBLAT3_3M.SUMM || exit 0 @$(GREP) -q FATAL CBLAT3_3M.SUMM && cat CBLAT3_3M.SUMM || exit 0
@ -109,6 +116,7 @@ else
@$(GREP) -q FATAL ZBLAT3_3M.SUMM && cat ZBLAT3_3M.SUMM || exit 0 @$(GREP) -q FATAL ZBLAT3_3M.SUMM && cat ZBLAT3_3M.SUMM || exit 0
endif endif
endif endif
endif

2
utest/Makefile
View File

@ -21,7 +21,9 @@ $(UTESTBIN): $(OBJS)
$(CC) $(CFLAGS) -o $@ $^ ../$(LIBNAME) $(EXTRALIB) $(FEXTRALIB) $(CC) $(CFLAGS) -o $@ $^ ../$(LIBNAME) $(EXTRALIB) $(FEXTRALIB)
run_test: $(UTESTBIN) run_test: $(UTESTBIN)
ifndef CROSS
./$(UTESTBIN) ./$(UTESTBIN)
endif
clean: clean:
-rm -f *.o $(UTESTBIN) -rm -f *.o $(UTESTBIN)