| 1 |
commit: 07410451faf82fbb764d8889436919f99c03fa64 |
| 2 |
Author: Andrea Arteaga <andyspiros <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Fri Feb 24 18:20:53 2012 +0000 |
| 4 |
Commit: Andrea Arteaga <andyspiros <AT> gmail <DOT> com> |
| 5 |
CommitDate: Fri Feb 24 18:20:53 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/auto-numerical-bench.git;a=commit;h=07410451 |
| 7 |
|
| 8 |
Merge remote branch 'origin/master' into HEAD |
| 9 |
|
| 10 |
Conflicts: |
| 11 |
numbench/report.py |
| 12 |
|
| 13 |
|
| 14 |
blastests.xml | 48 ++++++++++++++++++++++++++++-------------------- |
| 15 |
numbench/htmlreport.py | 9 ++++++--- |
| 16 |
numbench/main.py | 3 +++ |
| 17 |
numbench/report.py | 2 +- |
| 18 |
numbench/utils/btl.py | 2 +- |
| 19 |
5 files changed, 39 insertions(+), 25 deletions(-) |
| 20 |
|
| 21 |
diff --cc blastests.xml |
| 22 |
index d01615b,c8f4379..b1cc327 |
| 23 |
--- a/blastests.xml |
| 24 |
+++ b/blastests.xml |
| 25 |
@@@ -7,9 -5,7 +7,8 @@@ |
| 26 |
<var name="FFLAGS">-O3</var> |
| 27 |
</emergeenv> |
| 28 |
</test> |
| 29 |
+--> |
| 30 |
|
| 31 |
- <!-- |
| 32 |
<test id="atlas"> |
| 33 |
<pkg>sci-libs/atlas-3.9.67</pkg> |
| 34 |
<emergeenv> |
| 35 |
diff --cc numbench/report.py |
| 36 |
index 75be5c4,e3b4f73..2d8d384 |
| 37 |
--- a/numbench/report.py |
| 38 |
+++ b/numbench/report.py |
| 39 |
@@@ -16,8 -16,8 +16,8 @@@ |
| 40 |
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
| 41 |
# |
| 42 |
from os.path import join as pjoin, basename |
| 43 |
-from shutil import copy as fcopy, copytree |
| 44 |
-import numpy as np |
| 45 |
+import sys, numpy as np |
| 46 |
- from shutil import rmtree |
| 47 |
++from shutil import copy as fcopy, copytree, rmtree |
| 48 |
|
| 49 |
import benchconfig as cfg |
| 50 |
import benchutils as bu |
Archives