Gentoo Archives: gentoo-commits

From: Andrea Arteaga <andyspiros@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/auto-numerical-bench:master commit in: samples/
Date: Tue, 28 Aug 2012 14:58:55
Message-Id: 1346165807.25968ccb76ec1979d4228e654262916b43001931.spiros@gentoo
1 commit: 25968ccb76ec1979d4228e654262916b43001931
2 Author: Andrea Arteaga <andyspiros <AT> gmail <DOT> com>
3 AuthorDate: Tue Aug 28 14:56:47 2012 +0000
4 Commit: Andrea Arteaga <andyspiros <AT> gmail <DOT> com>
5 CommitDate: Tue Aug 28 14:56:47 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/auto-numerical-bench.git;a=commit;h=25968ccb
7
8 Updated samples.
9
10 ---
11 samples/blastests.xml | 82 +++++++++++++++++++----------------
12 samples/cblastests.xml | 103 +++++++++++++++++--------------------------
13 samples/fftwtests.xml | 69 ++++++++++++++++-------------
14 samples/lapacketests.xml | 45 +++++++++++---------
15 samples/lapacktests.xml | 5 +-
16 samples/openblas.xml | 34 +++++++-------
17 samples/scalapacktests.xml | 39 +++++++++++------
18 7 files changed, 192 insertions(+), 185 deletions(-)
19
20 diff --git a/samples/blastests.xml b/samples/blastests.xml
21 index 3068ec9..c9f45c2 100644
22 --- a/samples/blastests.xml
23 +++ b/samples/blastests.xml
24 @@ -1,38 +1,44 @@
25 -<tests>
26 -
27 - <test id="reference">
28 - <pkg>sci-libs/blas-reference-20120423</pkg>
29 - <emergeenv>
30 - <var name="FFLAGS">-O3</var>
31 - </emergeenv>
32 - </test>
33 -
34 - <test id="atlas">
35 - <pkg>sci-libs/atlas-3.10.0</pkg>
36 - <emergeenv>
37 - <var name="USE">threads</var>
38 - </emergeenv>
39 - </test>
40 -
41 - <test id="eigen">
42 - <pkg>dev-cpp/eigen-3.1.1-r1</pkg>
43 - <emergeenv>
44 - <var name="CXXFLAGS">-O3</var>
45 - </emergeenv>
46 - </test>
47 -
48 - <test id="openblas">
49 - <pkg>sci-libs/openblas-0.2.2</pkg>
50 - <emergeenv>
51 - <var name="FFLAGS">-O3</var>
52 - <var name="CFLAGS">-O3</var>
53 - <var name="USE">-openmp threads</var>
54 - </emergeenv>
55 - </test>
56 -
57 - <test id="mkl">
58 - <pkg>sci-libs/mkl-10.3.7.256</pkg>
59 - <skip>mkl32*</skip>
60 - </test>
61 -
62 -</tests>
63 +<numbench>
64 +
65 + <operations module="blas">axpy matrix_vector matrix_matrix aat</operations>
66 +
67 + <testcases>
68 +
69 + <case id="reference">
70 + <pkg>sci-libs/blas-reference-20120423</pkg>
71 + <emergeenv>
72 + <var name="FFLAGS">-O3</var>
73 + </emergeenv>
74 + </case>
75 +
76 + <case id="atlas">
77 + <pkg>sci-libs/atlas-3.10.0</pkg>
78 + <emergeenv>
79 + <var name="USE">threads</var>
80 + </emergeenv>
81 + </case>
82 +
83 + <case id="eigen">
84 + <pkg>dev-cpp/eigen-3.1.1-r1</pkg>
85 + <emergeenv>
86 + <var name="CXXFLAGS">-O3</var>
87 + </emergeenv>
88 + </case>
89 +
90 + <case id="openblas">
91 + <pkg>sci-libs/openblas-0.2.3</pkg>
92 + <emergeenv>
93 + <var name="FFLAGS">-O3</var>
94 + <var name="CFLAGS">-O3</var>
95 + <var name="USE">-openmp threads</var>
96 + </emergeenv>
97 + </case>
98 +
99 + <case id="mkl">
100 + <pkg>sci-libs/mkl-10.3.7.256</pkg>
101 + <skip>mkl32*</skip>
102 + </case>
103 +
104 + </testcases>
105 +
106 +</numbench>
107
108 diff --git a/samples/cblastests.xml b/samples/cblastests.xml
109 index 1b9bc2d..9a08eef 100644
110 --- a/samples/cblastests.xml
111 +++ b/samples/cblastests.xml
112 @@ -1,62 +1,41 @@
113 -<tests>
114 -
115 - <test id="reference">
116 - <pkg>sci-libs/cblas-reference-20110218</pkg>
117 - <emergeenv>
118 - <var name="FFLAGS">-O3</var>
119 - </emergeenv>
120 - </test>
121 -
122 - <test id="atlas">
123 - <pkg>sci-libs/atlas-3.9.68</pkg>
124 - <emergeenv>
125 - <var name="USE">threads</var>
126 - </emergeenv>
127 - </test>
128 -
129 - <test id="openblas1">
130 - <pkg>sci-libs/openblas-9999</pkg>
131 - <emergeenv>
132 - <var name="TARGET">NEHALEM</var>
133 - <var name="FFLAGS">-O3</var>
134 - <var name="CFLAGS">-O3</var>
135 - <var name="USE">incblas</var>
136 - </emergeenv>
137 - <runenv>
138 - <var name="OPENBLAS_NUM_THREADS">1</var>
139 - </runenv>
140 - </test>
141 -
142 - <test id="openblas2">
143 - <pkg>sci-libs/openblas-9999</pkg>
144 - <emergeenv>
145 - <var name="TARGET">NEHALEM</var>
146 - <var name="FFLAGS">-O3</var>
147 - <var name="CFLAGS">-O3</var>
148 - <var name="USE">incblas</var>
149 - </emergeenv>
150 - <runenv>
151 - <var name="OPENBLAS_NUM_THREADS">2</var>
152 - </runenv>
153 - </test>
154 -
155 - <test id="openblas4">
156 - <pkg>sci-libs/openblas-9999</pkg>
157 - <emergeenv>
158 - <var name="TARGET">NEHALEM</var>
159 - <var name="FFLAGS">-O3</var>
160 - <var name="CFLAGS">-O3</var>
161 - <var name="USE">incblas</var>
162 - </emergeenv>
163 - <runenv>
164 - <var name="OPENBLAS_NUM_THREADS">4</var>
165 - </runenv>
166 - </test>
167 -
168 - <test id="mkl">
169 - <pkg>sci-libs/mkl-10.3.7.256</pkg>
170 - <skip>mkl32*</skip>
171 - <skip>*int64*</skip>
172 - </test>
173 -
174 -</tests>
175 +<numbench>
176 +
177 + <operations module="cblas">axpy matrix_vector matrix_matrix aat</operations>
178 +
179 + <testcases>
180 +
181 + <case id="reference">
182 + <pkg>sci-libs/cblas-reference-20110218</pkg>
183 + <emergeenv>
184 + <var name="FFLAGS">-O3</var>
185 + </emergeenv>
186 + </case>
187 +
188 + <case id="atlas">
189 + <pkg>sci-libs/atlas-3.10.0</pkg>
190 + <emergeenv>
191 + <var name="USE">threads</var>
192 + </emergeenv>
193 + </case>
194 +
195 + <case id="openblas1">
196 + <pkg>sci-libs/openblas-0.2.3</pkg>
197 + <emergeenv>
198 + <var name="FFLAGS">-O3</var>
199 + <var name="CFLAGS">-O3</var>
200 + <var name="USE">incblas</var>
201 + </emergeenv>
202 + <runenv>
203 + <var name="OPENBLAS_NUM_THREADS">1</var>
204 + </runenv>
205 + </case>
206 +
207 + <case id="mkl">
208 + <pkg>sci-libs/mkl-10.3.7.256</pkg>
209 + <skip>mkl32*</skip>
210 + <skip>*int64*</skip>
211 + </case>
212 +
213 + </testcases>
214 +
215 +</numbench>
216
217 diff --git a/samples/fftwtests.xml b/samples/fftwtests.xml
218 index 7791931..e4a489d 100644
219 --- a/samples/fftwtests.xml
220 +++ b/samples/fftwtests.xml
221 @@ -1,31 +1,38 @@
222 -<tests>
223 -
224 - <test id="fftw-O0">
225 - <pkg>sci-libs/fftw-3.3-r2</pkg>
226 - <emergeenv>
227 - <var name="CFLAGS">-O0</var>
228 - </emergeenv>
229 - </test>
230 -
231 - <test id="fftw-O1">
232 - <pkg>sci-libs/fftw-3.3-r2</pkg>
233 - <emergeenv>
234 - <var name="CFLAGS">-O1</var>
235 - </emergeenv>
236 - </test>
237 -
238 - <test id="fftw-O2">
239 - <pkg>sci-libs/fftw-3.3-r2</pkg>
240 - <emergeenv>
241 - <var name="CFLAGS">-O2</var>
242 - </emergeenv>
243 - </test>
244 -
245 - <test id="fftw-O3">
246 - <pkg>sci-libs/fftw-3.3-r2</pkg>
247 - <emergeenv>
248 - <var name="CFLAGS">-O3</var>
249 - </emergeenv>
250 - </test>
251 -
252 -</tests>
253 +<numbench>
254 +
255 + <operations module="fftw"></operations>
256 +
257 +
258 + <testcases>
259 +
260 + <case id="fftw-O0">
261 + <pkg>sci-libs/fftw-3.3.2</pkg>
262 + <emergeenv>
263 + <var name="CFLAGS">-O0</var>
264 + </emergeenv>
265 + </case>
266 +
267 + <case id="fftw-O1">
268 + <pkg>sci-libs/fftw-3.3.2</pkg>
269 + <emergeenv>
270 + <var name="CFLAGS">-O1</var>
271 + </emergeenv>
272 + </case>
273 +
274 + <case id="fftw-O2">
275 + <pkg>sci-libs/fftw-3.3.2</pkg>
276 + <emergeenv>
277 + <var name="CFLAGS">-O2</var>
278 + </emergeenv>
279 + </case>
280 +
281 + <case id="fftw-O3">
282 + <pkg>sci-libs/fftw-3.3.2</pkg>
283 + <emergeenv>
284 + <var name="CFLAGS">-O3</var>
285 + </emergeenv>
286 + </case>
287 +
288 + </testcases>
289 +
290 +</numbench>
291
292 diff --git a/samples/lapacketests.xml b/samples/lapacketests.xml
293 index 9a536a0..796829e 100644
294 --- a/samples/lapacketests.xml
295 +++ b/samples/lapacketests.xml
296 @@ -1,23 +1,28 @@
297 -<tests>
298 +<numbench>
299
300 - <test id="reference-openblas">
301 - <pkg>sci-libs/lapacke-reference-3.4.1</pkg>
302 - <emergeenv>
303 - <var name="FFLAGS">-O3</var>
304 - <var name="ACCEPT_KEYWORDS">**</var>
305 - </emergeenv>
306 - <required name="blas">openblas-threads</required>
307 - <runenv>
308 - <var name="LD_DEBUG">all</var>
309 - </runenv>
310 - </test>
311 + <operations module="lapacke">lu_decomp svd_decomp qr_decomp</operations>
312
313 - <test id="mkl">
314 - <pkg>sci-libs/mkl-10.3.7.256</pkg>
315 - <skip>mkl32*</skip>
316 - <skip>*int64*</skip>
317 - <skip>*openmp</skip>
318 - <skip>*dynamic*</skip>
319 - </test>
320 + <testcases>
321
322 -</tests>
323 + <case id="reference-openblas">
324 + <pkg>sci-libs/lapacke-reference-3.4.1</pkg>
325 + <emergeenv>
326 + <var name="FFLAGS">-O3</var>
327 + <var name="ACCEPT_KEYWORDS">**</var>
328 + </emergeenv>
329 + <runenv>
330 + <var name="LD_DEBUG">all</var>
331 + </runenv>
332 + </case>
333 +
334 + <case id="mkl">
335 + <pkg>sci-libs/mkl-10.3.7.256</pkg>
336 + <skip>mkl32*</skip>
337 + <skip>*int64*</skip>
338 + <skip>*openmp</skip>
339 + <skip>*dynamic*</skip>
340 + </case>
341 +
342 + </testcases>
343 +
344 +</numbench>
345
346 diff --git a/samples/lapacktests.xml b/samples/lapacktests.xml
347 index 91194eb..2c7741b 100644
348 --- a/samples/lapacktests.xml
349 +++ b/samples/lapacktests.xml
350 @@ -14,12 +14,11 @@
351
352 <testcases>
353
354 - <case id="reference-openblas">
355 + <case id="reference">
356 <pkg>sci-libs/lapack-reference-3.4.1</pkg>
357 <emergeenv>
358 <var name="FFLAGS">-O3</var>
359 </emergeenv>
360 - <required name="blas">openblas</required>
361 </case>
362
363 <case id="atlas">
364 @@ -39,7 +38,7 @@
365 <case id="acml">
366 <pkg>sci-libs/acml-5.1.0</pkg>
367 </case>
368 -
369 +
370 </testcases>
371
372 </numbench>
373
374 diff --git a/samples/openblas.xml b/samples/openblas.xml
375 index 8eef44e..39c0e81 100644
376 --- a/samples/openblas.xml
377 +++ b/samples/openblas.xml
378 @@ -4,7 +4,7 @@
379
380 <testcases>
381 <case id="openblas-gcc-threads">
382 - <pkg>sci-libs/openblas-0.2.2</pkg>
383 + <pkg>sci-libs/openblas-0.2.3</pkg>
384 <emergeenv>
385 <var name="FC">gfortran</var>
386 <var name="CC">gcc</var>
387 @@ -15,7 +15,7 @@
388 </case>
389
390 <case id="openblas-gcc-openmp">
391 - <pkg>sci-libs/openblas-0.2.2</pkg>
392 + <pkg>sci-libs/openblas-0.2.3</pkg>
393 <emergeenv>
394 <var name="FC">gfortran</var>
395 <var name="CC">gcc</var>
396 @@ -24,10 +24,10 @@
397 <var name="USE">openmp -threads</var>
398 </emergeenv>
399 </case>
400 -
401 -
402 +
403 +
404 <case id="openblas-icc-threads">
405 - <pkg>sci-libs/openblas-0.2.2</pkg>
406 + <pkg>sci-libs/openblas-0.2.3</pkg>
407 <emergeenv>
408 <var name="FC">ifort</var>
409 <var name="CC">icc</var>
410 @@ -36,9 +36,9 @@
411 <var name="USE">-openmp threads</var>
412 </emergeenv>
413 </case>
414 -
415 +
416 <case id="openblas-icc-openmp">
417 - <pkg>sci-libs/openblas-0.2.2</pkg>
418 + <pkg>sci-libs/openblas-0.2.3</pkg>
419 <emergeenv>
420 <var name="FC">ifort</var>
421 <var name="CC">icc</var>
422 @@ -47,10 +47,10 @@
423 <var name="USE">openmp -threads</var>
424 </emergeenv>
425 </case>
426 -
427 -
428 +
429 +
430 <case id="openblas-clang-threads">
431 - <pkg>sci-libs/openblas-0.2.2</pkg>
432 + <pkg>sci-libs/openblas-0.2.3</pkg>
433 <emergeenv>
434 <var name="FC">clang</var>
435 <var name="CC">clang</var>
436 @@ -59,9 +59,9 @@
437 <var name="USE">-openmp threads</var>
438 </emergeenv>
439 </case>
440 -
441 +
442 <case id="openblas-clang-openmp">
443 - <pkg>sci-libs/openblas-0.2.2</pkg>
444 + <pkg>sci-libs/openblas-0.2.3</pkg>
445 <emergeenv>
446 <var name="FC">clang</var>
447 <var name="CC">clang</var>
448 @@ -70,10 +70,10 @@
449 <var name="USE">openmp -threads</var>
450 </emergeenv>
451 </case>
452 -
453 -
454 +
455 +
456 <case id="openblas-ekopath-threads">
457 - <pkg>sci-libs/openblas-0.2.2</pkg>
458 + <pkg>sci-libs/openblas-0.2.3</pkg>
459 <emergeenv>
460 <var name="FC">pathf90</var>
461 <var name="CC">pathcc</var>
462 @@ -82,9 +82,9 @@
463 <var name="USE">-openmp threads</var>
464 </emergeenv>
465 </case>
466 -
467 +
468 <case id="openblas-ekopath-openmp">
469 - <pkg>sci-libs/openblas-0.2.2</pkg>
470 + <pkg>sci-libs/openblas-0.2.3</pkg>
471 <emergeenv>
472 <var name="FC">pathf90</var>
473 <var name="CC">pathcc</var>
474
475 diff --git a/samples/scalapacktests.xml b/samples/scalapacktests.xml
476 index cadf14b..fda1bcb 100644
477 --- a/samples/scalapacktests.xml
478 +++ b/samples/scalapacktests.xml
479 @@ -1,17 +1,28 @@
480 -<tests>
481 +<numbench>
482
483 - <test id="reference-O3">
484 - <pkg>sci-libs/scalapack-2.0.1</pkg>
485 - <emergeenv>
486 - <var name="FFLAGS">-O3</var>
487 - </emergeenv>
488 - </test>
489 + <operations module="scalapack">
490 + axpy
491 + matrix_vector
492 + cholesky
493 + svd_decomp
494 + </operations>
495
496 - <test id="reference-O1">
497 - <pkg>sci-libs/scalapack-2.0.1</pkg>
498 - <emergeenv>
499 - <var name="FFLAGS">-O1</var>
500 - </emergeenv>
501 - </test>
502 + <testcases>
503
504 -</tests>
505 + <case id="reference-O3">
506 + <pkg>sci-libs/scalapack-2.0.2</pkg>
507 + <emergeenv>
508 + <var name="FFLAGS">-O3</var>
509 + </emergeenv>
510 + </case>
511 +
512 + <case id="reference-O1">
513 + <pkg>sci-libs/scalapack-2.0.2</pkg>
514 + <emergeenv>
515 + <var name="FFLAGS">-O1</var>
516 + </emergeenv>
517 + </case>
518 +
519 + </testcases>
520 +
521 +</numbench>