1 files changed, 41 insertions, 62 deletions
diff --git a/samples/cblastests.xml b/samples/cblastests.xml
index 1b9bc2d..9a08eef 100644
--- a/samples/cblastests.xml
+++ b/samples/cblastests.xml
@@ -1,62 +1,41 @@
-<tests>
-
-    <test id="reference">
-        <pkg>sci-libs/cblas-reference-20110218</pkg>
-        <emergeenv>
-            <var name="FFLAGS">-O3</var>
-        </emergeenv>
-    </test>
-
-    <test id="atlas">
-        <pkg>sci-libs/atlas-3.9.68</pkg>
-        <emergeenv>
-            <var name="USE">threads</var>
-        </emergeenv>
-    </test>
-
-    <test id="openblas1">
-        <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">incblas</var>
-        </emergeenv>
-        <runenv>
-            <var name="OPENBLAS_NUM_THREADS">1</var>
-        </runenv>
-    </test>
-
-    <test id="openblas2">
-        <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">incblas</var>
-        </emergeenv>
-        <runenv>
-            <var name="OPENBLAS_NUM_THREADS">2</var>
-        </runenv>
-    </test>
-
-    <test id="openblas4">
-        <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">incblas</var>
-        </emergeenv>
-        <runenv>
-            <var name="OPENBLAS_NUM_THREADS">4</var>
-        </runenv>
-    </test>
-
-    <test id="mkl">
-        <pkg>sci-libs/mkl-10.3.7.256</pkg>
-        <skip>mkl32*</skip>
-        <skip>*int64*</skip>
-    </test>
-
-</tests>
+<numbench>
+
+    <operations module="cblas">axpy matrix_vector matrix_matrix aat</operations>
+
+    <testcases>
+
+        <case id="reference">
+            <pkg>sci-libs/cblas-reference-20110218</pkg>
+            <emergeenv>
+                <var name="FFLAGS">-O3</var>
+            </emergeenv>
+        </case>
+
+        <case id="atlas">
+            <pkg>sci-libs/atlas-3.10.0</pkg>
+            <emergeenv>
+                <var name="USE">threads</var>
+            </emergeenv>
+        </case>
+
+        <case id="openblas1">
+            <pkg>sci-libs/openblas-0.2.3</pkg>
+            <emergeenv>
+                <var name="FFLAGS">-O3</var>
+                <var name="CFLAGS">-O3</var>
+                <var name="USE">incblas</var>
+            </emergeenv>
+            <runenv>
+                <var name="OPENBLAS_NUM_THREADS">1</var>
+            </runenv>
+        </case>
+
+        <case id="mkl">
+            <pkg>sci-libs/mkl-10.3.7.256</pkg>
+            <skip>mkl32*</skip>
+            <skip>*int64*</skip>
+        </case>
+
+    </testcases>
+
+</numbench>