Author: Hakan Ardo <ha...@debian.org>
Branch: extradoc
Changeset: r3958:6dbe2306c60f
Date: 2011-11-02 08:24 +0100
http://bitbucket.org/pypy/extradoc/changeset/6dbe2306c60f/
Log: minor fixes
diff --git a/talk/iwtc11/benchmarks/iter/generator.py
b/talk/iwtc11/benchmarks/iter/generator.py
--- a/talk/iwtc11/benchmarks/iter/generator.py
+++ b/talk/iwtc11/benchmarks/iter/generator.py
@@ -152,4 +152,7 @@
f(a, 10000, 10000)
return "sum1d"
+if __name__ == '__main__':
+ import sys
+ eval(sys.argv[1])(sys.argv[2:])
diff --git a/talk/iwtc11/benchmarks/iter/generator2.py
b/talk/iwtc11/benchmarks/iter/generator2.py
--- a/talk/iwtc11/benchmarks/iter/generator2.py
+++ b/talk/iwtc11/benchmarks/iter/generator2.py
@@ -152,4 +152,6 @@
f(a, 10000, 10000)
return "sum1d"
-
+if __name__ == '__main__':
+ import sys
+ eval(sys.argv[1])(sys.argv[2:])
diff --git a/talk/iwtc11/benchmarks/iter/iterator.py
b/talk/iwtc11/benchmarks/iter/iterator.py
--- a/talk/iwtc11/benchmarks/iter/iterator.py
+++ b/talk/iwtc11/benchmarks/iter/iterator.py
@@ -180,3 +180,6 @@
f(a, 10000, 10000)
return "sum1d"
+if __name__ == '__main__':
+ import sys
+ eval(sys.argv[1])(sys.argv[2:])
diff --git a/talk/iwtc11/benchmarks/iter/range.py
b/talk/iwtc11/benchmarks/iter/range.py
--- a/talk/iwtc11/benchmarks/iter/range.py
+++ b/talk/iwtc11/benchmarks/iter/range.py
@@ -143,3 +143,6 @@
f(a, 10000, 10000)
return "sum1d"
+if __name__ == '__main__':
+ import sys
+ eval(sys.argv[1])(sys.argv[2:])
diff --git a/talk/iwtc11/benchmarks/iter/result.txt
b/talk/iwtc11/benchmarks/iter/result.txt
--- a/talk/iwtc11/benchmarks/iter/result.txt
+++ b/talk/iwtc11/benchmarks/iter/result.txt
@@ -10,7 +10,7 @@
mean1d: 12.246 +- 0.0955510334847
median1d: 8.712 +- 0.0383405790254
ripple1d: 2.534 +- 0.0167332005307
-ripple2d: 1.294 +- 0.00547722557505
+ripple2d: 2.644 +- 0.0219089023002
pypy iter/generator2.py
sum1d: 23.9832116127 +- 0.614888065755
diff --git a/talk/iwtc11/benchmarks/iter/ripple2d.c
b/talk/iwtc11/benchmarks/iter/ripple2d.c
--- a/talk/iwtc11/benchmarks/iter/ripple2d.c
+++ b/talk/iwtc11/benchmarks/iter/ripple2d.c
@@ -23,6 +23,8 @@
int main(int ac, char **av) {
double *a = malloc(W*H*sizeof(double));
int i, n = atoi(av[1]);
+ double data[] = {-1.0, 1.0};
+ for (i=0; i<W*H; i++) a[i] = data[i&1];
for (i=0; i<n; i++) result=sum(a, W, H);
fprintf(stderr, "ripple2d: ");
return 0;
diff --git a/talk/iwtc11/benchmarks/iter/while.py
b/talk/iwtc11/benchmarks/iter/while.py
--- a/talk/iwtc11/benchmarks/iter/while.py
+++ b/talk/iwtc11/benchmarks/iter/while.py
@@ -170,3 +170,7 @@
f(a, 10000, 10000)
return "sum1d"
+if __name__ == '__main__':
+ import sys
+ eval(sys.argv[1])(sys.argv[2:])
+
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
