summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrea Arteaga <andyspiros@gmail.com>2012-08-04 21:38:51 +0200
committerAndrea Arteaga <andyspiros@gmail.com>2012-08-04 21:38:51 +0200
commitfaa616ad8e9335d350e1e9ae06efa842bfb1ce19 (patch)
tree52f49c1802af03d8ce95bc5c2cfb99329bdd3438
parentIncluded LAPACKe functions prototypes without header. (diff)
downloadauto-numerical-bench-faa616ad8e9335d350e1e9ae06efa842bfb1ce19.tar.gz
auto-numerical-bench-faa616ad8e9335d350e1e9ae06efa842bfb1ce19.tar.bz2
auto-numerical-bench-faa616ad8e9335d350e1e9ae06efa842bfb1ce19.zip
Added "all" operation in blas. Updated blastests sample. Added openblas sample)
-rw-r--r--numbench/modules/internal/blasBase.py3
-rw-r--r--samples/blastests.xml40
-rw-r--r--samples/openblas.xml71
3 files changed, 85 insertions, 29 deletions
diff --git a/numbench/modules/internal/blasBase.py b/numbench/modules/internal/blasBase.py
index cf8ba07..75e1f0e 100644
--- a/numbench/modules/internal/blasBase.py
+++ b/numbench/modules/internal/blasBase.py
@@ -33,6 +33,9 @@ def init(self, args):
tests = []
for i in args:
+ if i == 'all':
+ tests += availableTests
+ continue
if i == '1':
tests += avail1
continue
diff --git a/samples/blastests.xml b/samples/blastests.xml
index 321e724..3068ec9 100644
--- a/samples/blastests.xml
+++ b/samples/blastests.xml
@@ -1,56 +1,38 @@
<tests>
-<!--
<test id="reference">
- <pkg>sci-libs/blas-reference-20120215-r1</pkg>
+ <pkg>sci-libs/blas-reference-20120423</pkg>
<emergeenv>
<var name="FFLAGS">-O3</var>
</emergeenv>
</test>
--->
<test id="atlas">
- <pkg>sci-libs/atlas-3.9.68</pkg>
+ <pkg>sci-libs/atlas-3.10.0</pkg>
<emergeenv>
<var name="USE">threads</var>
</emergeenv>
</test>
<test id="eigen">
- <pkg>dev-cpp/eigen-3.0.5</pkg>
+ <pkg>dev-cpp/eigen-3.1.1-r1</pkg>
<emergeenv>
<var name="CXXFLAGS">-O3</var>
</emergeenv>
</test>
<test id="openblas">
- <pkg>sci-libs/openblas-9999</pkg>
- <emergeenv>
- <var name="TARGET">NEHALEM</var>
- <var name="FFLAGS">-O3</var>
- <var name="CFLAGS">-O3</var>
- <var name="USE">-openmp -threads</var>
- </emergeenv>
- </test>
-
- <test id="openblas-8threads">
- <pkg>sci-libs/openblas-9999</pkg>
- <emergeenv>
- <var name="TARGET">NEHALEM</var>
- <var name="FFLAGS">-O3</var>
- <var name="CFLAGS">-O3</var>
- <var name="USE">threads</var>
- </emergeenv>
- <runenv>
- <var name="OPENBLAS_NUM_THREADS">8</var>
- </runenv>
+ <pkg>sci-libs/openblas-0.2.2</pkg>
+ <emergeenv>
+ <var name="FFLAGS">-O3</var>
+ <var name="CFLAGS">-O3</var>
+ <var name="USE">-openmp threads</var>
+ </emergeenv>
</test>
<test id="mkl">
- <pkg>sci-libs/mkl-10.3.7.256</pkg>
- <skip>mkl32*</skip>
- <skip>*int64*</skip>
- <skip>*openmp</skip>
+ <pkg>sci-libs/mkl-10.3.7.256</pkg>
+ <skip>mkl32*</skip>
</test>
</tests>
diff --git a/samples/openblas.xml b/samples/openblas.xml
new file mode 100644
index 0000000..7c7c739
--- /dev/null
+++ b/samples/openblas.xml
@@ -0,0 +1,71 @@
+<tests>
+
+ <test id="openblas-gcc-threads">
+ <pkg>sci-libs/openblas-0.2.2</pkg>
+ <emergeenv>
+ <var name="FC">gfortran</var>
+ <var name="CC">gcc</var>
+ <var name="FFLAGS">-O3</var>
+ <var name="CFLAGS">-O3</var>
+ <var name="USE">-openmp threads</var>
+ </emergeenv>
+ </test>
+
+ <test id="openblas-gcc-openmp">
+ <pkg>sci-libs/openblas-0.2.2</pkg>
+ <emergeenv>
+ <var name="FC">gfortran</var>
+ <var name="CC">gcc</var>
+ <var name="FFLAGS">-O3</var>
+ <var name="CFLAGS">-O3</var>
+ <var name="USE">openmp -threads</var>
+ </emergeenv>
+ </test>
+
+
+ <test id="openblas-icc-threads">
+ <pkg>sci-libs/openblas-0.2.2</pkg>
+ <emergeenv>
+ <var name="FC">ifort</var>
+ <var name="CC">icc</var>
+ <var name="FFLAGS">-O3</var>
+ <var name="CFLAGS">-O3</var>
+ <var name="USE">-openmp threads</var>
+ </emergeenv>
+ </test>
+
+ <test id="openblas-icc-openmp">
+ <pkg>sci-libs/openblas-0.2.2</pkg>
+ <emergeenv>
+ <var name="FC">ifort</var>
+ <var name="CC">icc</var>
+ <var name="FFLAGS">-O3</var>
+ <var name="CFLAGS">-O3</var>
+ <var name="USE">openmp -threads</var>
+ </emergeenv>
+ </test>
+
+
+ <test id="openblas-clan-threads">
+ <pkg>sci-libs/openblas-0.2.2</pkg>
+ <emergeenv>
+ <var name="FC">clang</var>
+ <var name="CC">clang</var>
+ <var name="FFLAGS">-O3</var>
+ <var name="CFLAGS">-O3</var>
+ <var name="USE">-openmp threads</var>
+ </emergeenv>
+ </test>
+
+ <test id="openblas-clang-openmp">
+ <pkg>sci-libs/openblas-0.2.2</pkg>
+ <emergeenv>
+ <var name="FC">clang</var>
+ <var name="CC">clang</var>
+ <var name="FFLAGS">-O3</var>
+ <var name="CFLAGS">-O3</var>
+ <var name="USE">openmp -threads</var>
+ </emergeenv>
+ </test>
+
+</tests> \ No newline at end of file