* [gentoo-commits] proj/auto-numerical-bench:master commit in: app-benchmarks/autobench/, app-benchmarks/autobench/files/python/btl/libs/FFTW/, ...
@ 2011-07-13 0:01 Andrea Arteaga
0 siblings, 0 replies; only message in thread
From: Andrea Arteaga @ 2011-07-13 0:01 UTC (permalink / raw
To: gentoo-commits
commit: 38ac75315d6673d12e50c976b18a6dd17059add6
Author: spiros <andyspiros <AT> gmail <DOT> com>
AuthorDate: Tue Jul 12 23:56:40 2011 +0000
Commit: Andrea Arteaga <andyspiros <AT> gmail <DOT> com>
CommitDate: Tue Jul 12 23:56:40 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/auto-numerical-bench.git;a=commit;h=38ac7531
Better reports (now contain logs and user's input file). Improved exampe
input files. Solved bug with FFTW. Updated package.
---
app-benchmarks/autobench/Manifest | 30 ++++++-------------
.../autobench/files/python/basemodule.py | 8 ++++-
app-benchmarks/autobench/files/python/blasbase.py | 2 +-
app-benchmarks/autobench/files/python/blastests.in | 13 +++++---
.../autobench/files/python/btl/libs/FFTW/main.cpp | 8 ++--
.../autobench/files/python/cblastests.in | 16 ++++++++--
app-benchmarks/autobench/files/python/fftwtests.in | 5 +++
.../autobench/files/python/htmlreport.py | 21 +++++++++++++-
.../autobench/files/python/lapacktests.in | 13 ++++++--
app-benchmarks/autobench/files/python/main.py | 8 ++++-
10 files changed, 82 insertions(+), 42 deletions(-)
diff --git a/app-benchmarks/autobench/Manifest b/app-benchmarks/autobench/Manifest
index b5cd345..b3aef1a 100644
--- a/app-benchmarks/autobench/Manifest
+++ b/app-benchmarks/autobench/Manifest
@@ -1,22 +1,14 @@
AUX python/PortageUtils.py 2662 RMD160 b2332db4308149ffb289c5f62c9b03ed8fda6a79 SHA1 f4782cf26b565bf4d884f7137a05c75250b02a99 SHA256 b148ba988b9484cadaa5477c19673ca8a1acf301ff474d49ca6e5412fd521be2
-AUX python/PortageUtils.pyc 3574 RMD160 e1ee2cc133b647d7d3382f4912bdcc329ae403d8 SHA1 1956096e3b1218b50904de6c98868e7a65ee4db0 SHA256 edd51eba427935210dfe9ae432da42261accc9abcee4fbb6942221b2a80ce6ff
AUX python/accuracy/main_blas.cpp 6320 RMD160 1daba1007b13b427e76730a6c44f97e4a1e1cb92 SHA1 142c9129c4105b148508f769da0175b7b7d2f3d0 SHA256 456fd6061c16aafeb6970a9800a57af96e50a3ee436990657440fa76c01c81c1
-AUX python/basemodule.py 7551 RMD160 8d599c18a9d5ea64addeaca9d7a4653d4c46e639 SHA1 35ad5ebffd129f91fa12d37ff5efe399d8901f4b SHA256 8257f444a7aad615bac0bd0632c1f1547a4b0408109ef964fc16353d84f52cf7
-AUX python/basemodule.pyc 7939 RMD160 df4ef9e7499fb1234b27f7e7b695cee18bbd168f SHA1 e10357828845262342e179e81623b16777f3f70b SHA256 7a3f1af6fe117c2a25f405bc791b83a91c43dd99e3864e6ff16df7ac3565a96d
+AUX python/basemodule.py 8233 RMD160 d9cd599d83721b9fb79056e42d8db8bafe059e4c SHA1 3886bfc960685d339df53c4c875b5be8ff50e903 SHA256 eb3e749f1b44a309e93095c5e89c2bf1acf17cc3af07fc05fe7fcb383722871b
AUX python/benchconfig.py 2063 RMD160 1acf57d6d355c1d17a45d5dd90daca3dbf776bab SHA1 873c14303a17530d5bc0dc513b1898b0d7fe5860 SHA256 c8c9e23a2b7dc03e38954ac09bef84b9d1bb7ecd5252a8d20b15643398105384
-AUX python/benchconfig.pyc 2040 RMD160 c0c0253e57b3bed92377c3f0cc17d77b241c737e SHA1 7aefb1799f810f59c1a9e123c990de57ba24202a SHA256 163c99910a4862313a4fb0b0686b8338f8ee93f57d6ae40e6af9457b643a8d0b
AUX python/benchpkgconfig.py 1572 RMD160 1b5776aa1024e6b54ee746fab7138d23ab50bd6f SHA1 32641f1d46b1a30cd70bffb59b2506e3556aaae4 SHA256 adf7676bb4ba8258e925acf8b26d9394399a1c06cf7d140ac3360fc2c3f9f498
-AUX python/benchpkgconfig.pyc 2331 RMD160 b55a5a5721472d3d984c36d573f00e1531f9e7a9 SHA1 3b2bcf8bf0db123216677f010b9d8dba26447464 SHA256 4a4e659357d734c6a3ca3de64498812c3249d72e3dcbd38482604b17387d4fad
AUX python/benchprint.py 717 RMD160 8746dede0097c60a3ff6063dee4d1f4654d20860 SHA1 33681abcbfaef546f038aaeebf23e2125c52c311 SHA256 1c97d3fd1d8bf9cb71e52956c8b5baee182724164668d371edb23ec30e35933b
-AUX python/benchprint.pyc 1640 RMD160 d330d00eefee87e92d82b9700c6c4c6b820b4df8 SHA1 02e92d8316c2c3591722022049d018e9c37b8768 SHA256 4b21752be4bb32b8c2c5e762678ffecd255d0ae9017524cab4467aa5290ce255
AUX python/benchutils.py 870 RMD160 d790e10310d1e6cb00e7a86fc5d6a088a8ba11e6 SHA1 f64bfa655c6d06ce4eb878c2f7483f1c19146e84 SHA256 c224321a244250ebdba2f3f5471feb675700c163197d384ad442e7038fa6e849
-AUX python/benchutils.pyc 1563 RMD160 8ed8c74f3bb848952052fb0daf12c7d99f0cedd5 SHA1 f223bb828560596bda55f4115e282d0760ef9d7f SHA256 20162653c3aff59cafb83e8dbdfb6603b01e9f7ea89e73a461fd4ebb67d6df2c
AUX python/blas.py 150 RMD160 f7b4b1841d4bbb0323da73c09a61695914b979a0 SHA1 e6004e5fa796bb15ed9993eac49d03de167e0b2b SHA256 9e41015016cd01f4b5d405715c5caf3838a458dd2a9dfea4513a986f9b97c834
-AUX python/blas.pyc 696 RMD160 89c300787923fa2f2bfb8c6e414ebfac8b180510 SHA1 863b915b6a6487125ce05f9c1d6748ac26e2804b SHA256 13cb9549ce86bf491a6fcff2cf584d9dc80beeffd53f946da08d7c9ddb1768d1
AUX python/blas_accuracy.py 4709 RMD160 f2e6b2eaf66ef01832f0f8547ab45233d3823b68 SHA1 77e2adc2d6d965ecb0bea6826ab9fe858010f058 SHA256 f74b1fa60723febe511d131d83be1eebcc2d365becf9d8cd5b91f9006d88df80
-AUX python/blasbase.py 1665 RMD160 4f5ab46554b64a5e4926eef35fff37d979e3193f SHA1 1739dc51b56d42d8411cd132de88274f5019b68f SHA256 bdab116c6bd5b95eee850fb210b905fd9fc93363b0346e9cfafc0c406dd85eca
-AUX python/blasbase.pyc 2881 RMD160 d357dcaafe7b49be6100a74ec51fe1ac0998ae14 SHA1 1f1daf8ebc21e7bdf36fa7ee8d186a793fde404c SHA256 d6bacb88626ee117bd65cae82da04523ef2535254754767853f7e31771628440
-AUX python/blastests.in 285 RMD160 f09213aa86c4e7b5b8d4ac0e85dbbc360d25b3cb SHA1 4096fd5df7f50d71e341f24a16967c01a6b91d0c SHA256 5a3921f859639311b9d9bdee3ff12a065b8bc58517eedeb97f59b59e56b0e1d9
+AUX python/blasbase.py 1682 RMD160 ea7b89c111f54218951d61f5f41752ee0afba8c0 SHA1 450fdc8e1109aba1b1973690814e9e1d2e4627b2 SHA256 d97ec84619a297fa03cdf549db7cee924c5212bce5a32a10a7051b0c4d79b8b3
+AUX python/blastests.in 781 RMD160 349bdff1b82206c0daa97ca243b7572eb533697f SHA1 1a8fe8ac4a3d4d857a3fdd91241d0b097966bda3 SHA256 cea5fc40b6b465e3c58baa9f40564c8d381396d8dfe080e4384264e18aae06ee
AUX python/btl/COPYING 18109 RMD160 94065c2e29bf3e9ff7ed4ee64c5d4c9ebdf7256f SHA1 0adba118df234d6b733bf662d159b55846231417 SHA256 b8d0e2bcbf36f6af3cdbf94055ad2ea675d5a19fc623eb0ec82febb2b08e719b
AUX python/btl/README 6447 RMD160 47ee7206070df913742fc53f6ed78b4b8972e906 SHA1 98260ea2996de2ed203be00916a675c5bf151631 SHA256 f6e8ede422a6c148ebb8d56fd40c471ac69fc57dbc6011e9fd0b400faefae458
AUX python/btl/actions/action_aat_product.hh 3374 RMD160 ede341ecdcb5d44733f7ca9306b5f319e485bcc5 SHA1 d1cf9276cb09569bb20844772d92f7e25cc9515f SHA256 873853a24a2e80800f44a04758fe9faa3cba8a3eb0dbc844f8f214a94585154b
@@ -88,7 +80,7 @@ AUX python/btl/libs/BLAS/c_interface_base.h 1625 RMD160 37fabd205f08a7fc2ea94a3a
AUX python/btl/libs/BLAS/cblas_interface_impl.hh 2990 RMD160 ec2b0bdae39d2e8d7f559083579cdf027617ba89 SHA1 95021a81e3262fcdc9fca9d982297b5c7d4eb64f SHA256 6581d93d7a0d527af1c420f8f70a63f357e40e20efa1b492383daafe68821a3c
AUX python/btl/libs/BLAS/main.cpp 3776 RMD160 b35b523d88c418ac5a9db06832b6950a8503d8f0 SHA1 34ef8864d56198e54eb450e0546d67521f9a5d85 SHA256 79d7cc6e6f6ab5a8d1d8c1903599fb7634bbafe700b48be65ff18d7a5d3d6e72
AUX python/btl/libs/FFTW/fftw_interface.hh 1456 RMD160 11006bf46bcb56cf57d434f59c31035a4e66d7b2 SHA1 c9a4b669c60820da2702b2fa67e35b21c4ca4e82 SHA256 c69e9cc1b4a3acc2a287814edd00321a295c3b23833cda8e6753ec5405b260a7
-AUX python/btl/libs/FFTW/main.cpp 1241 RMD160 cb985a776c8090ecb3d486bec26d1c22ead60e2c SHA1 f3140899ca6c98fd247bc6eb1e3d02c471ff15bf SHA256 108f6bf79dca2fcc6a8d1788a496e4a8726d194e1307c0bf8fde3f2697a6b3fa
+AUX python/btl/libs/FFTW/main.cpp 1241 RMD160 1bddfbcdc328d852655a59cce038e138986f6e78 SHA1 3b0b8e6351396fb9f3f90c13be6eccfc129a15f5 SHA256 74b362d09d48e9d5623537195908af9f08597ebc3480bc79440aed64b9cf1c4e
AUX python/btl/libs/LAPACK/lapack_interface.hh 1407 RMD160 b8149422c8cf8922a9b7b95913a637f3151fb2fe SHA1 78c7973c4f148ddad3b7ebe183ef10efd2f5cdf7 SHA256 887afeacc02476159f59a399c85d57c7bfb8737c9bd808a4c26c247616d7909c
AUX python/btl/libs/LAPACK/lapack_interface_impl.hh 1786 RMD160 2abb56707b0ad7a61e8b3425fa4148cf2f679b34 SHA1 fb4374f7a74f073c36f0251e58e02e4c3e4f22a0 SHA256 19938175e629c85883e7f1afc0a288871bc6dbdc64f0bb742f125b1497c3c22d
AUX python/btl/libs/LAPACK/main.cpp 1227 RMD160 df94d258c2a49be19a204fe925e02416882ed3cf SHA1 740f92decfba92c737dc71893612dba39f3eb0ac SHA256 2826b888d7923fb538d6efaf1438318ef9ff55750d682a4aefa8b4782ee0b0ce
@@ -103,16 +95,14 @@ AUX python/btl/libs/eigen3/main_linear.cpp 1285 RMD160 0954efc2852fceae77cbcdae1
AUX python/btl/libs/eigen3/main_matmat.cpp 1381 RMD160 1506df762579ff31f3e8baf4c9a7a4cdb3e90ae8 SHA1 6f697bdad6641e7905fcc3e3db26b969a22c1578 SHA256 321404115b60d6fece922d692fcc9810de6a468d812baa46cd1e653cd9fa9e9b
AUX python/btl/libs/eigen3/main_vecmat.cpp 1447 RMD160 f4d3f38dfb50dd37d9c0c6e204a20ab3d0f7bfb7 SHA1 5f30bbcbca5df9cdc375021794505ce03a0345c7 SHA256 916d6d83e2a10c115903a5022117ab3036da2dbf9ae4344f852d6ab37efc0fd1
AUX python/btlbase.py 4688 RMD160 804a83b5dd21a40eb0cbdb234475b84f383b07c3 SHA1 a949f967fddc5e7feac725631e59acb0f18bbcee SHA256 ecade4b285496f4b0a2a03a10d065ba0ebe9209b4ef6ed38b92e1246efd3ed4e
-AUX python/btlbase.pyc 4989 RMD160 92e020cf4e39cfe336331f96dd8e8bdc13b595b1 SHA1 315889a6b5ab535ba2b0daa5f76dea72384dfb5e SHA256 22549914730bfa0853f054fd13dc88418870c92b4017facaffc1f8b4bbe9a39d
AUX python/cblas.py 151 RMD160 d278827cedba1dcacfd324d6d50705fa4b3aa7e1 SHA1 2b7bdf4eda098578ff01226678288b6a5cacc0bf SHA256 e81cd969f16e92687d45c1e058b95180362ca6f2eab9cbdc2d62c4c6f1d26766
-AUX python/cblastests.in 199 RMD160 68f3771f176d383f12bae59453e637f6cd0bbfaf SHA1 f0b451c8707fa72eca37275638cbb9b50fab9033 SHA256 2a6370718564ff2b0be2c837a5a25f78e1cae2dd617ab77ecc48fd363b5f9009
+AUX python/cblastests.in 774 RMD160 cba2fa7263fe899c40cf23cc46586ad946a19304 SHA1 735d1bd4af4641d90cd72007ebd3c6fc28321b66 SHA256 21fc3608d2a6642a3be9b20914e72830ff8feb7c09d194a226b1da06493fbb86
AUX python/fftw.py 1443 RMD160 1db1750cac388bd032773870b8ed292c0c0f9623 SHA1 307010ad9105ca996478c8c5f532f56eedf512cd SHA256 80fcdf701157cbdee7d1a8b0b4d2141ec1f650b8a282061fd2ec99bd86fa9d1e
-AUX python/htmlreport.py 1451 RMD160 c2e4ff58e4a11507da953b074287ef45d25063b7 SHA1 50465127847d35d93cf65f285a13e07017959bb3 SHA256 a2451fd7b2649638126fcb2e3af282bbfec59317aedb1fa33ba88b2864390ae4
-AUX python/htmlreport.pyc 2291 RMD160 e6b3755fad5496768a0859aba779414b896ac3f2 SHA1 afa15457ffb96915d534c5bda276fb33f2588209 SHA256 359bef10b0c784bcb8a4de7515eac83a5f4fbef049c164d56417016a9948a7e1
+AUX python/fftwtests.in 409 RMD160 b1e96f6caf4a76390d95f6960b7e8e81088acafb SHA1 371cfa5c1819fa37bd3c35c7185ea03054391e70 SHA256 430235ceb61971580b4d4570768b3726d86ceaa9b3a2bcecddd6eba794c42eb0
+AUX python/htmlreport.py 2559 RMD160 ca6aea1c688af9d2114134e2a65252a3a1c1e5f7 SHA1 58cba02fdf4a71d8e70cec1a64efc007e909b8a6 SHA256 7bb9a5a6009310e7281353185c7305dc60c1b7827d2915e818520b502a5e3bfb
AUX python/lapack.py 1166 RMD160 b48e6278979f69d98ad6cfbc3eb06c8e7d8bca66 SHA1 55dc87ba33aadde40703ae9a7640ce98b05428f3 SHA256 a311de47c119dacbc8bd5b45e74b735a4d68305484de819cc47b9a3a6db5f895
-AUX python/lapack.pyc 2465 RMD160 db5c425122e0ec8d729d7d4cb98768096c0f9c83 SHA1 6510a8040fb7dca0aa2609fc00d77429a752fd6d SHA256 797f3020a925ccef595806f32dff63999ca9127846df6e48dd176fbcb261b6ba
-AUX python/lapacktests.in 452 RMD160 9cae950ab68b2b708b1b4958c5946bdb7e541289 SHA1 3439a0c0bd431a3f7ee96711326842c25df5dd69 SHA256 fbc39dd76d549abbc6cbfe4c5ab98e39f540f20091339df006891e5700448800
-AUX python/lapacktests.in~ 453 RMD160 c29aac5a697e5d29d65ce4decc0571a646ce46f2 SHA1 aac2f29c9608f1b77803f61f66c77726191ae8f0 SHA256 2ceed06567af509c527eda753d22055131c1765b70041159fecf3f2b843bce80
-AUX python/main.py 7134 RMD160 b2daff74b3b2698e9af94d73c63407784a0bf027 SHA1 cd7e18dfb516dfb14658981ba750d9c86110ff27 SHA256 06d27c334d141efd443af52ae903223dce3554e4fea129f7a023b01ea6f31930
+AUX python/lapacktests.in 482 RMD160 b72394edaf298d082660b4f8dcbaae5b1edffc3c SHA1 4063520399b858be4a41b5d159c269db56566e93 SHA256 b6d070996f3dd31f3a88456214ad6b0a3c13a60fd3a5bf5b7a2a390a2fadd0db
+AUX python/main.py 7330 RMD160 6307211c683aa29d38e5a995c9106192f5648566 SHA1 4157efc57af77cac988022bd1154a2de9d47b557 SHA256 795a7a21710f0853731dc57fcf44714ce552baa601dc002550fb64a981cd4b8f
+AUX python/testdescr.py 1052 RMD160 c8a3d05fe57f7bb513f1913213fc9a6289ff3a9d SHA1 d93a157b5ce800f6e74842b75495050b31d8e288 SHA256 e66f89af8b3c4fe33759785a94ce7e1353a09e6ecfc09ce8e5b0fd7849d62bad
EBUILD autobench-9999.ebuild 736 RMD160 6d4f0b881fe5fcec46ae3b0c3cdd7f46a671a569 SHA1 7e526a936058985f14ea5b9149ec4cae12231c3a SHA256 c20f422c7743380627b950a2c59e09150eebfaa3e17e4147532a274dfd366d3f
MISC metadata.xml 493 RMD160 482127e8607d58b7e57869578846c26f2d843efb SHA1 d95ffad9aff3462b178e7150986072f06d8bff88 SHA256 9fc6250feadab4adb51a03b80a473ba36417e2d6ac1ee1ffaf3995b04214bf7b
diff --git a/app-benchmarks/autobench/files/python/basemodule.py b/app-benchmarks/autobench/files/python/basemodule.py
index 77ce1ab..c1a4d70 100644
--- a/app-benchmarks/autobench/files/python/basemodule.py
+++ b/app-benchmarks/autobench/files/python/basemodule.py
@@ -1,6 +1,7 @@
-from os.path import join as pjoin
+from os.path import join as pjoin, basename, dirname
import subprocess as sp
import shlex, os
+import shutil as shu
import benchconfig as cfg
from htmlreport import HTMLreport
@@ -72,6 +73,11 @@ class BaseModule:
Print("Please make sure that X is running and $DISPLAY is set")
return
+ # Copy inputfile and logs
+ shu.copytree(cfg.logdir, pjoin(cfg.reportdir, 'log'))
+ baseinfile = basename(cfg.inputfile)
+ shu.copy2(cfg.inputfile, pjoin(cfg.reportdir, baseinfile))
+
if plottype == 'plot': plotf = plt.plot
elif plottype == 'semilogx': plotf = plt.semilogx
elif plottype == 'semilogy': plotf = plt.semilogy
diff --git a/app-benchmarks/autobench/files/python/blasbase.py b/app-benchmarks/autobench/files/python/blasbase.py
index e2c14ff..b5d899c 100644
--- a/app-benchmarks/autobench/files/python/blasbase.py
+++ b/app-benchmarks/autobench/files/python/blasbase.py
@@ -6,7 +6,7 @@ from os.path import join as pjoin
class BLASBase(btlbase.BTLBase):
def _initialize(self):
self.avail1 = ['axpy', 'axpby', 'rot']
- self.avail2 = ['matrix_vector','atv','symv','syr2','ger',
+ self.avail2 = ['matrix_vector','atv','symv', 'ger', 'syr2',
'trisolve_vector']
self.avail3 = ['matrix_matrix', 'aat', 'trisolve_matrix', 'trmm']
self.avail = self.avail1 + self.avail2 + self.avail3
diff --git a/app-benchmarks/autobench/files/python/blastests.in b/app-benchmarks/autobench/files/python/blastests.in
index 0f24bcb..d7b1a41 100644
--- a/app-benchmarks/autobench/files/python/blastests.in
+++ b/app-benchmarks/autobench/files/python/blastests.in
@@ -1,5 +1,8 @@
-#blas-reference sci-libs/blas-reference-3.3.1-r1 FFLAGS=-O3
-acml sci-libs/acml-4.4.0-r1 -acml32-gfortran -acml32-gfortran-openmp
-#goto sci-libs/gotoblas2-1.13 CFLAGS=-O3 USE='incblas'
-#atlas sci-libs/atlas-3.8.4 CFLAGS=-O3 FFLAGS=-O3
-#openblas sci-libs/openblas CFLAGS=-O3 USE=incblas
+# Testing almost all implementations using gcc-4.6.1 and enabling vectorization
+
+blas-reference sci-libs/blas-reference-3.3.1-r1 FC=gfortran-4.6.1 FFLAGS="-O3 -pipe -march=native -msse3 -msse4.1 -msse4.2"
+acml sci-libs/acml-4.4.0-r1 -acml32-gfortran -acml32-gfortran-openmp -acml64-gfortran-openmp
+goto sci-libs/gotoblas2-1.13 CFLAGS="-O3 -march=native" USE='incblas' TARGET=NEHALEM
+atlas sci-libs/atlas-3.9.41 CC=gcc-4.6.1 CFLAGS="-O3 -pipe -march=native -msse3 -msse4.1 -msse4.2"
+openblas sci-libs/openblas CC=gcc-4.6.1 CFLAGS="-O3 -pipe -march=native -msse3 -msse4.1 -msse4.2" USE=incblas TARGET=NEHALEM
+eigen dev-cpp/eigen-3.0.1-r1 CC=gcc-4.6.1 CXX=g++-4.6.1 CFLAGS="-O3 -pipe -march=native -msse3 -msse4.1 -msse4.2" CXXFLAGS="-O3 -pipe -march=native -msse3 -msse4.1 -msse4.2"
diff --git a/app-benchmarks/autobench/files/python/btl/libs/FFTW/main.cpp b/app-benchmarks/autobench/files/python/btl/libs/FFTW/main.cpp
index 8f667d1..3f2f0c4 100644
--- a/app-benchmarks/autobench/files/python/btl/libs/FFTW/main.cpp
+++ b/app-benchmarks/autobench/files/python/btl/libs/FFTW/main.cpp
@@ -19,10 +19,10 @@ int main(int argv, char **argc)
for (int i = 1; i < argv; ++i) {
std::string arg = argc[i];
- if (arg == "fftw_1d_forward_measure" || arg == "all") fftw_1d_forward_measure = true;
- if (arg == "fftw_1d_forward_estimate" || arg == "all") fftw_1d_forward_estimate = true;
- if (arg == "fftw_1d_backward_measure" || arg == "all") fftw_1d_backward_measure = true;
- if (arg == "fftw_1d_backward_estimate" || arg == "all") fftw_1d_backward_estimate = true;
+ if (arg == "FFTW_1D_Forward_Measure" || arg == "all") fftw_1d_forward_measure = true;
+ if (arg == "FFTW_1D_Forward_Estimate" || arg == "all") fftw_1d_forward_estimate = true;
+ if (arg == "FFTW_1D_Backward_Measure" || arg == "all") fftw_1d_backward_measure = true;
+ if (arg == "FFTW_1D_Backward_Estimate" || arg == "all") fftw_1d_backward_estimate = true;
}
diff --git a/app-benchmarks/autobench/files/python/cblastests.in b/app-benchmarks/autobench/files/python/cblastests.in
index b96a6f5..670ddc4 100644
--- a/app-benchmarks/autobench/files/python/cblastests.in
+++ b/app-benchmarks/autobench/files/python/cblastests.in
@@ -1,4 +1,12 @@
-cblas-reference sci-libs/cblas-reference-20110218 CFLAGS=-O3
-gsl gsl-1.15-r1 CC=gcc CFLAGS=-O3
-goto sci-libs/gotoblas2-1.13 CFLAGS=-O3 USE='incblas'
-openblas sci-libs/openblas CFLAGS=-O3 USE=incblas
+# Testing different implementations of CBLAS
+
+# cblas-reference is a wrapper for blas: test this with different blas implementations
+reference-eigen sci-libs/cblas-reference-20110218 blas:eigen
+reference-openblas sci-libs/cblas-reference-20110218 blas:openblas-threads
+reference-acml sci-libs/cblas-reference-20110218 blas:acml64-gfortran
+
+# Other implementations are not wrappers
+# Test them using gcc-4.6.1 and enabling vectorization
+gsl gsl-1.15-r1 CC=gcc-4.6.1 CFLAGS="-O3 -pipe -march=native -msse3 -msse4.1 -msse4.2"
+goto sci-libs/gotoblas2-1.13 CC=gcc-4.6.1 CFLAGS="-O3 -pipe -march=native -msse3 -msse4.1 -msse4.2" USE=incblas TARGET=NEHALEM
+openblas sci-libs/openblas CC=gcc-4.6.1 CFLAGS="-O3 -pipe -march=native -msse3 -msse4.1 -msse4.2" USE=incblas TARGET=NEHALEM
\ No newline at end of file
diff --git a/app-benchmarks/autobench/files/python/fftwtests.in b/app-benchmarks/autobench/files/python/fftwtests.in
new file mode 100644
index 0000000..04a905d
--- /dev/null
+++ b/app-benchmarks/autobench/files/python/fftwtests.in
@@ -0,0 +1,5 @@
+# Testing FFTW with different gcc versions and enabling vectorization
+
+gcc-4.6.1 sci-libs/fftw-3.2.2-r1 CC=gcc-4.6.1 CFLAGS="-O3 -march=native -msse2 -msse3 -mssse3 -msse4.1 -msse4.2"
+gcc-4.5.2 sci-libs/fftw-3.2.2-r1 CC=gcc-4.5.2 CFLAGS="-O3 -march=native -msse2 -msse3 -mssse3 -msse4.1 -msse4.2"
+gcc-4.3.6 sci-libs/fftw-3.2.2-r1 CC=gcc-4.3.6 CFLAGS="-O3 -march=native -msse2 -msse3 -mssse3 -msse4.1 -msse4.2"
\ No newline at end of file
diff --git a/app-benchmarks/autobench/files/python/htmlreport.py b/app-benchmarks/autobench/files/python/htmlreport.py
index 5e563fe..212b88b 100644
--- a/app-benchmarks/autobench/files/python/htmlreport.py
+++ b/app-benchmarks/autobench/files/python/htmlreport.py
@@ -1,7 +1,11 @@
import time
+from os.path import join as pjoin, basename
+
+import benchconfig as cfg
class HTMLreport:
- def __init__(self, fname, title="Benchmarks report"):
+ def __init__(self, fname, title="Benchmarks report", \
+ inputfile=pjoin(cfg.reportdir, basename(cfg.inputfile))):
self.fname = fname
self.content = """
<html>
@@ -16,10 +20,18 @@ img {
height:80%;
}
+pre {
+ background-color: #EEE;
+}
+
h1, h2, .plot, .descr, .info {
text-align: center;
}
+.inputfile {
+ margin-bottom: 40px;
+}
+
.fig {
margin-bottom: 50px;
padding-top: 20px;
@@ -50,6 +62,13 @@ h1, h2, .plot, .descr, .info {
if mem:
self.content += '<p class="info">Total memory: ' + mem + '</p>'
+ self.content += '<div class="inputfile">Input file: ' + \
+ '<a href="%s">%s</a>' % (basename(inputfile), cfg.inputfile) + \
+ '<pre>%s</pre></div>' % file(cfg.inputfile, 'r').read()
+
+ self.content += '<div class="log">Logs: <a href="log">%s</a></div>' \
+ % cfg.logdir
+
def addFig(self, title, image, descr='', alt='', width=None):
self.content += '<div class="fig">'
diff --git a/app-benchmarks/autobench/files/python/lapacktests.in b/app-benchmarks/autobench/files/python/lapacktests.in
index 8710589..f427ebb 100644
--- a/app-benchmarks/autobench/files/python/lapacktests.in
+++ b/app-benchmarks/autobench/files/python/lapacktests.in
@@ -1,4 +1,9 @@
-lapack-reference sci-libs/lapack-reference-3.3.1-r1 FFLAGS=-O3 CFLAGS=-O3 blas:atlas descr|"lapack-reference with atlas as BLAS implementation"
-lapack-reference sci-libs/lapack-reference-3.3.1-r1 FFLAGS=-O3 CFLAGS=-O3 blas:atlas-threads descr|"lapack-reference with threaded atlas as BLAS implementation"
-atlas sci-libs/atlas-3.8.4 CFLAGS=-O3 FFLAGS=-O3
-acml sci-libs/acml-4.4.0-r1 -acml32-gfortran -acml32-gfortran-openmp descr|"AMD numerical library"
\ No newline at end of file
+# Testing different implementations of LAPACK
+
+# lapack-reference relies on blas: test this with different blas implementations
+reference_eigen sci-libs/lapack-reference-3.3.1-r1 blas:eigen
+reference_openblas sci-libs/lapack-reference-3.3.1-r1 blas:openblas-threads
+
+# Testing other full LAPACK implementations enabling vectorization
+atlas sci-libs/atlas-3.9.41 CFLAGS="-O3 -march=native -msse3 -msse4.1 -msse4.2"
+acml sci-libs/acml-4.4.0-r1 -acml32-gfortran -acml32-gfortran-openmp
\ No newline at end of file
diff --git a/app-benchmarks/autobench/files/python/main.py b/app-benchmarks/autobench/files/python/main.py
index 8994168..10a2091 100644
--- a/app-benchmarks/autobench/files/python/main.py
+++ b/app-benchmarks/autobench/files/python/main.py
@@ -18,7 +18,7 @@ from benchprint import Print
# Import the desired module or print help and exit
try:
- testsfname = os.path.abspath(sys.argv[2])
+ cfg.inputfile = os.path.abspath(sys.argv[2])
os.chdir(cfg.scriptdir)
tmp = __import__(sys.argv[1], fromlist = ['Module'])
mod = tmp.Module(sys.argv[3:])
@@ -116,7 +116,11 @@ dictionary; the line has to contain:
- a package description, which can, but does not must to, contain a version
- a list of environment variables separated by means of spaces
"""
-input = file(testsfname).read()
+if not os.path.exists(cfg.inputfile):
+ sys.stderr.write("File not found: " + cfg.inputfile)
+ print_usage()
+ exit(1)
+input = file(cfg.inputfile).read()
tests = tests_from_input(input)
# Write summary
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2011-07-13 0:02 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-13 0:01 [gentoo-commits] proj/auto-numerical-bench:master commit in: app-benchmarks/autobench/, app-benchmarks/autobench/files/python/btl/libs/FFTW/, Andrea Arteaga
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox