diff --git a/enable/gcbench/bench.py b/enable/gcbench/bench.py
index 152ba3cd4..f08f71f79 100644
--- a/enable/gcbench/bench.py
+++ b/enable/gcbench/bench.py
@@ -18,6 +18,7 @@
_MAX_DURATION = 1.0
_SIZE = (512, 512)
+_2X_SIZE = (1024, 1024)
_BACKENDS = {
"gui": {
"kiva.agg": "enable.null.image",
@@ -69,12 +70,14 @@ def benchmark_backend(suite, mod_name, module, outdir=None):
""" Benchmark a single backend
"""
GraphicsContext = getattr(module, "GraphicsContext")
- gc = GraphicsContext(_SIZE)
results = {}
for name, symbol in suite.items():
# Result `summary` defaults to "fail"
- results[name] = result = BenchResult()
+ results[name] = result = BenchResult(output_size=_SIZE)
+
+ size = _2X_SIZE if name.endswith("2x") else _SIZE
+ gc = GraphicsContext(size)
print(f"\n\tBenchmark {name}", end="")
try:
@@ -115,7 +118,7 @@ def exercise_backend(suite, mod_name, module, extension, outdir=None):
results = {}
for name, symbol in suite.items():
# Result `summary` defaults to "fail"
- results[name] = result = BenchResult()
+ results[name] = result = BenchResult(output_size=_SIZE)
# Skip 2x versions
if name.endswith("2x"):
diff --git a/enable/gcbench/data.py b/enable/gcbench/data.py
index 44cf4a161..073dcc1b9 100644
--- a/enable/gcbench/data.py
+++ b/enable/gcbench/data.py
@@ -10,7 +10,7 @@
import os
from traits.api import (
- Enum, File, Float, HasStrictTraits, Instance, Int, Property, Str
+ Enum, File, Float, HasStrictTraits, Instance, Int, Property, Str, Tuple
)
@@ -21,9 +21,10 @@ class BenchResult(HasStrictTraits):
# Default to "fail"!
summary = Enum("fail", "skip", "success")
- #: A path to an output file and its format
+ #: A path to an output file with a format and size
output = File()
output_format = Property(Str(), observe="output")
+ output_size = Tuple(Int(), Int())
#: Timing results
timing = Instance("BenchTiming")
diff --git a/enable/gcbench/publish.py b/enable/gcbench/publish.py
index 3e687eb81..6cdb77266 100644
--- a/enable/gcbench/publish.py
+++ b/enable/gcbench/publish.py
@@ -187,7 +187,7 @@ def _format_output(result):
link.
"""
if result.output_format in (".png", ".svg"):
- return _img(result.output)
+ return _img(result.output, *result.output_size)
else:
return _link(result.output, "download")
@@ -201,8 +201,8 @@ def _format_timing(result):
# HTML utils
-def _img(src):
- return f'
'
+def _img(src, width, height):
+ return f''
def _link(target, text):
diff --git a/enable/gcbench/suite.py b/enable/gcbench/suite.py
index e0bcff1b6..e5b1388c2 100644
--- a/enable/gcbench/suite.py
+++ b/enable/gcbench/suite.py
@@ -25,22 +25,22 @@
def gen_image():
- img = np.zeros((256, 256, 4), dtype=np.uint8)
- img[50:150, 50:150, (0, 3)] = 255
- img[5:200, 5:50, (1, 3)] = 255
- img[85:195, 85:195, (2, 3)] = 255
- img[205:250, 205:250, :] = 255
+ img = np.zeros((512, 512, 4), dtype=np.uint8)
+ img[100:300, 100:300, (0, 3)] = 255
+ img[10:400, 10:400, (1, 3)] = 255
+ img[195:400, 195:400, (2, 3)] = 255
+ img[410:500, 410:500, :] = 255
return img
def gen_large_path(obj):
- obj.arc(125, 125, 100, 0.0, 2 * math.pi)
- for x in range(0, 250, 25):
- obj.move_to(x, 10)
- obj.line_to(x, 250)
- for y in range(0, 250, 25):
- obj.move_to(10, y)
- obj.line_to(250, y)
+ obj.arc(250, 250, 240, 0.0, 2 * math.pi)
+ for x in range(50, 500, 50):
+ obj.move_to(x, 0)
+ obj.line_to(x, 500)
+ for y in range(50, 500, 50):
+ obj.move_to(0, y)
+ obj.line_to(500, y)
return obj
@@ -57,16 +57,16 @@ def gen_small_path(obj):
def gen_points(count=100):
- points = (np.random.random(size=count) * 250.0)
+ points = (np.random.random(size=count) * 500.0)
return points.reshape(count // 2, 2)
def gen_moderate_complexity_path(obj):
- obj.arc(150, 100, 50, math.pi, 1.5*math.pi)
- obj.move_to(150, 50)
- obj.line_to(250, 75)
- obj.line_to(150, 100)
- obj.curve_to(115, 75, 135, 125, 100, 100)
+ obj.arc(300, 200, 100, math.pi, 1.5*math.pi)
+ obj.move_to(300, 100)
+ obj.line_to(500, 150)
+ obj.line_to(300, 200)
+ obj.curve_to(230, 150, 270, 250, 200, 200)
return obj
@@ -79,19 +79,20 @@ def __call__(self):
with self.gc:
gen_large_path(self.gc)
self.gc.set_stroke_color((0.33, 0.66, 0.99, 1.0))
+ self.gc.set_line_width(5.0)
self.gc.stroke_path()
class draw_rect:
def __init__(self, gc, module):
- self.points = gen_points()
+ self.points = gen_points(200)
self.gc = gc
def __call__(self):
with self.gc:
self.gc.set_fill_color((0.33, 0.66, 0.99, 1.0))
for pt in self.points:
- self.gc.rect(pt[0], pt[1], 20.0, 20.0)
+ self.gc.rect(pt[0], pt[1], 15.0, 15.0)
self.gc.fill_path()
@@ -127,7 +128,7 @@ def __init__(self, gc, module):
self.gc = gc
def __call__(self):
- self.gc.draw_image(self.img, (0, 0, 256, 256))
+ self.gc.draw_image(self.img, (0, 0, 512, 512))
class show_text:
@@ -138,14 +139,14 @@ def __init__(self, gc, module):
'the lazy dog',
'狐假虎威',
]
- self.font = kiva_api.Font('Times New Roman', size=36)
+ self.font = kiva_api.Font('Times New Roman', size=72)
self.gc = gc
def __call__(self):
with self.gc:
self.gc.set_fill_color((0.5, 0.5, 0.0, 1.0))
self.gc.set_font(self.font)
- y = 256 - self.font.size * 1.4
+ y = 512 - self.font.size * 1.4
for line in self.text:
self.gc.set_text_position(4, y)
self.gc.show_text(line)
@@ -164,7 +165,7 @@ def __call__(self):
with self.gc:
gen_moderate_complexity_path(self.gc)
self.gc.linear_gradient(
- 100, 100, 250, 75,
+ 200, 200, 500, 150,
self.gradient,
'pad',
)
@@ -183,20 +184,20 @@ def __init__(self, gc, module):
'the lazy dog',
'狐假虎威',
]
- self.font = kiva_api.Font('Times New Roman', size=36)
+ self.font = kiva_api.Font('Times New Roman', size=72)
self.gc = gc
def __call__(self):
with self.gc:
self.gc.radial_gradient(
- 128, 128, 150, 128, 128,
+ 256, 256, 300, 256, 256,
self.gradient,
'pad',
)
self.gc.set_text_drawing_mode(kiva_api.TEXT_FILL_STROKE)
self.gc.set_line_width(0.5)
self.gc.set_font(self.font)
- y = 256 - self.font.size * 1.4
+ y = 512 - self.font.size * 1.4
for line in self.text:
self.gc.set_text_position(4, y)
self.gc.show_text(line)