[Math-atlas-commits] CVS: AtlasBase/Clint atlas-make.base, 1.243, 1.244 atlas-tlp.base, 1.63, 1.64
Brought to you by:
rwhaley,
tonyc040457
Menu
▾
▴
[Math-atlas-commits] CVS: AtlasBase/Clint atlas-make.base, 1.243, 1.244 atlas-tlp.base, 1.63, 1.64
|
From: R. C. W. <rw...@us...> - 2009-11-20 17:58:22
|
Update of /cvsroot/math-atlas/AtlasBase/Clint In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv28752/Clint Modified Files: atlas-make.base atlas-tlp.base Log Message: Index: atlas-make.base =================================================================== RCS file: /cvsroot/math-atlas/AtlasBase/Clint/atlas-make.base,v retrieving revision 1.243 retrieving revision 1.244 diff -C2 -d -r1.243 -r1.244 *** atlas-make.base 19 Nov 2009 00:26:31 -0000 1.243 --- atlas-make.base 20 Nov 2009 17:58:09 -0000 1.244 *************** *** 2934,2944 **** $(ATLRUN) $(BINdir) x@(pre)uumtst@(suf) -n 167 -O 2 c r -U 2 u l \ >> $(BINdir)/@low@(pt)sanity.out ! @whiledef rt lanbsrch ! x@(pre)@(rt)@(suf) : @(pre)@(rt)@(suf).o @(pre)lapack @(pre)tstlib@(suf) @(pre)l3lib@(suf) \ @(pre)l2lib@(suf) @(pre)l1lib@(suf) @(pre)cblas@(suf) ! $(FLINKER) $(FCLINKFLAGS) -o $@ @(pre)@(rt)@(suf).o \ $(TESTlib) $(LAPACKlib) $(@(pt)CBLASlib) $(@(pt)F77BLASlib) \ $(ATLASlib) $(LIBS) - @endwhile @whiledef rt lu llt slv uum trtri inv lanb qr x@(pre)@(rt)_all@(suf) : x@(pre)@(rt)tst@(suf) x@(pre)@(rt)tstF@(suf) \ --- 2934,2942 ---- $(ATLRUN) $(BINdir) x@(pre)uumtst@(suf) -n 167 -O 2 c r -U 2 u l \ >> $(BINdir)/@low@(pt)sanity.out ! x@(pre)lanbtime@(suf) : @(pre)lanbtime@(suf).o @(pre)lapack @(pre)tstlib@(suf) @(pre)l3lib@(suf) \ @(pre)l2lib@(suf) @(pre)l1lib@(suf) @(pre)cblas@(suf) ! $(FLINKER) $(FCLINKFLAGS) -o $@ @(pre)lanbtime@(suf).o \ $(TESTlib) $(LAPACKlib) $(@(pt)CBLASlib) $(@(pt)F77BLASlib) \ $(ATLASlib) $(LIBS) @whiledef rt lu llt slv uum trtri inv lanb qr x@(pre)@(rt)_all@(suf) : x@(pre)@(rt)tst@(suf) x@(pre)@(rt)tstF@(suf) \ *************** *** 3107,3121 **** $(INCAdir)/@(pre)mm.h $(INCSdir)/atlas_lvl3.h $(ICC) -o $@ -c $(ICCFLAGS) -DATLCINT @(df) -D@(typ) $(mySRCdir)/l3blastst.c ! @whiledef rt lanbsrch ! @(pre)@(rt)@(pt).o : $(mySRCdir)/@(rt).c $(INCSdir)/atlas_misc.h \ $(INCAdir)/@(pre)mm.h $(INCSdir)/atlas_lvl3.h ! $(ICC) -o $@ -c $(ICCFLAGS) -DATLCINT $(intf) @(df) -D@(typ) $(mySRCdir)/@(rt).c ! @(pre)@(rt)C@(pt).o : $(mySRCdir)/@(rt).c $(INCSdir)/atlas_misc.h \ $(INCAdir)/@(pre)mm.h $(INCSdir)/atlas_lvl3.h ! $(ICC) -o $@ -c $(ICCFLAGS) -DATLCINT -DTimeC @(df) -D@(typ) $(mySRCdir)/@(rt).c ! @(pre)@(rt)F@(pt).o : $(mySRCdir)/@(rt).c $(INCSdir)/atlas_misc.h \ $(INCAdir)/@(pre)mm.h $(INCSdir)/atlas_lvl3.h ! $(ICC) -o $@ -c $(ICCFLAGS) -DATLCINT -DTimeF77 @(df) -D@(typ) $(mySRCdir)/@(rt).c ! @endwhile @whiledef rt uum llt lu slv trtri inv lanb qr @(pre)@(rt)tst@(pt).o : $(mySRCdir)/@(rt)tst.c $(INCSdir)/atlas_misc.h \ --- 3105,3118 ---- $(INCAdir)/@(pre)mm.h $(INCSdir)/atlas_lvl3.h $(ICC) -o $@ -c $(ICCFLAGS) -DATLCINT @(df) -D@(typ) $(mySRCdir)/l3blastst.c ! @(pre)lanbtime@(pt).o : $(mySRCdir)/lanbtst.c $(INCSdir)/atlas_misc.h \ $(INCAdir)/@(pre)mm.h $(INCSdir)/atlas_lvl3.h ! $(ICC) -o $@ -c $(ICCFLAGS) -DATLCINT $(intf) @(df) -D@(typ) \ ! -DATL_USE_ATL_ILAENV $(mySRCdir)/lanbtst.c ! @(pre)lanbtimeC@(pt).o : $(mySRCdir)/lanbtst.c $(INCSdir)/atlas_misc.h \ $(INCAdir)/@(pre)mm.h $(INCSdir)/atlas_lvl3.h ! $(ICC) -o $@ -c $(ICCFLAGS) -DATLCINT -DTimeC @(df) -D@(typ) $(mySRCdir)/lanbtst.c ! @(pre)lanbtimeF@(pt).o : $(mySRCdir)/lanbtst.c $(INCSdir)/atlas_misc.h \ $(INCAdir)/@(pre)mm.h $(INCSdir)/atlas_lvl3.h ! $(ICC) -o $@ -c $(ICCFLAGS) -DATLCINT -DTimeF77 @(df) -D@(typ) $(mySRCdir)/lanbtst.c @whiledef rt uum llt lu slv trtri inv lanb qr @(pre)@(rt)tst@(pt).o : $(mySRCdir)/@(rt)tst.c $(INCSdir)/atlas_misc.h \ *************** *** 5579,5586 **** @multidef typ DCPLX SCPLX DREAL SREAL @whiledef pre z c d s ! res/ATL_@(pre)GetNB_geqrf : x@(pre)lanbsrch ! ./x@(pre)lanbsrch -oc $@ ! res/ATL_@(pre)tGetNB_geqrf : x@(pre)lanbsrch_pt ! ./x@(pre)lanbsrch_pt -oc $@ @define df @@ @define df @-DATL_USEPTHREADS@ --- 5576,5583 ---- @multidef typ DCPLX SCPLX DREAL SREAL @whiledef pre z c d s ! res/ATL_@(pre)GetNB_geqrf.h : x@(pre)lanbsrch ! ./x@(pre)lanbsrch -oc res/ATL_@(pre)GetNB_geqrf ! res/ATL_@(pre)tGetNB_geqrf.h : x@(pre)lanbsrch_pt ! ./x@(pre)lanbsrch_pt -oc res/ATL_@(pre)tGetNB_geqrf @define df @@ @define df @-DATL_USEPTHREADS@ Index: atlas-tlp.base =================================================================== RCS file: /cvsroot/math-atlas/AtlasBase/Clint/atlas-tlp.base,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -d -r1.63 -r1.64 *** atlas-tlp.base 19 Nov 2009 17:14:10 -0000 1.63 --- atlas-tlp.base 20 Nov 2009 17:58:11 -0000 1.64 *************** *** 5385,5389 **** */ { ! int i, nbB, n, mul1, mul2, nbL, nbR; double time, timeL, timeR, mintime, lasttime; --- 5385,5389 ---- */ { ! int i, nbB, n, mul1, mul2, nbL, nbR, TINYCASE; double time, timeL, timeR, mintime, lasttime; *************** *** 5393,5396 **** --- 5393,5397 ---- * Try all multiples of NB between min & max NB */ + TINYCASE = Mmin(M,N) < 2*NB; i = (minNB/NB)*NB; /* smallest mul of NB >= floor(min,NB) */ if (i < 1) *************** *** 5458,5461 **** --- 5459,5469 ---- printf(" *** i=%d, nbB=%d, NB=%d, mul1=%d, mul2=%d ***\n", i, nbB, NB, mul1, mul2); + if (TINYCASE) + { + i = 1; + n = Mmin(M,N)/2; + mul1 = 1; + mul2 = 0; + } for (; i <= n; i++) { *************** *** 5485,5494 **** { printf(" nb=%d: ", minNB); ! time = GetMultSampleTimes(1, 0, nreps, nsecs, flshszKB, mflopF, rout, ! uplo, side, M, N, lda, minNB); ! printf(" --> %.2f MFLOP.\n", Time2Flops(rout, uplo, M, N, time)); ! if (time < mintime) { ! mintime = time; nbB = minNB; } --- 5493,5502 ---- { printf(" nb=%d: ", minNB); ! timeL = GetMultSampleTimes(1, 0, nreps, nsecs, flshszKB, mflopF, rout, ! uplo, side, M, N, lda, minNB); ! printf(" --> %.2f MFLOP.\n", Time2Flops(rout, uplo, M, N, timeL)); ! if (timeL < mintime) { ! mintime = timeL; nbB = minNB; } *************** *** 5497,5506 **** { printf(" nb=%d: ", maxNB); ! time = GetMultSampleTimes(1, 0, nreps, nsecs, flshszKB, mflopF, rout, ! uplo, side, M, N, lda, maxNB); ! printf(" --> %.2f MFLOP.\n", Time2Flops(rout, uplo, M, N, time)); ! if (time < mintime) { ! mintime = time; nbB = maxNB; } --- 5505,5514 ---- { printf(" nb=%d: ", maxNB); ! timeR = GetMultSampleTimes(1, 0, nreps, nsecs, flshszKB, mflopF, rout, ! uplo, side, M, N, lda, maxNB); ! printf(" --> %.2f MFLOP.\n", Time2Flops(rout, uplo, M, N, timeR)); ! if (timeR < mintime) { ! mintime = timeR; nbB = maxNB; } *************** *** 5612,5621 **** */ nnb = malloc(sizeof(int)*4000); ! nnb[2] = NB; ! m = (restM) ? restM : NB; ! n = (restN) ? restN : NB; lda = m + ldagap; nnb[3] = findNB(rout, nreps, nsecs, flshszKB, mflopF, uplo, side, ! m, n, lda, 1, NB/2, &percL, &percR); /* * Find best NB for maximum size problem --- 5620,5629 ---- */ nnb = malloc(sizeof(int)*4000); ! nnb[2] = 25; ! m = (restM) ? restM : 25; ! n = (restN) ? restN : 25; lda = m + ldagap; nnb[3] = findNB(rout, nreps, nsecs, flshszKB, mflopF, uplo, side, ! m, n, lda, 1, 12, &percL, &percR); /* * Find best NB for maximum size problem |