updates

- use strip tiff everywhere
- vips progs all use reduce
- pillow uses bilinear

Author: jcupitt

benchmark.sh

@@ -9,10 +9,8 @@ mkdir $tmp
 
 echo building test image ...
 vips colourspace sample2.v $tmp/t1.v srgb
-vips colourspace sample2.v $tmp/t1.v srgb
 vips replicate $tmp/t1.v $tmp/t2.v 20 15
-vips extract_area $tmp/t2.v $tmp/x.tif[tile] 0 0 5000 5000
-vips copy $tmp/x.tif $tmp/x_strip.tif
+vips extract_area $tmp/t2.v $tmp/x.tif 0 0 5000 5000
 vips copy $tmp/x.tif $tmp/x.jpg
 vips copy $tmp/x.tif $tmp/x.ppm
 vipsheader $tmp/x.tif
@@ -28,7 +26,7 @@ real_time() {
 	# get just the "real 0.2" line
 	real=($(cat tmp/x | grep real))
 
-	# just the the number
+	# and just the number
 	return_real_time=${real[1]}
 }
 
@@ -37,7 +35,7 @@ real_time() {
 # sleep for two secs between runs to let the system settle -- after a run
 # there's a short period of disc chatter we want to avoid
 
-# check that services like tracker are not running
+# you should check that services like tracker are not running
 
 get_time() {
 	cmd=$*
@@ -89,12 +87,11 @@ echo "program, time (s), peak memory (MB)"
 
 benchmark tiffcp "tiffcp -s $tmp/x.tif $tmp/x2.tif"
 
+benchmark pillow "./pillow.py $tmp/x.tif $tmp/x2.tif"
+
 gcc -Wall vips.c `pkg-config vips --cflags --libs` -o vips-c
 benchmark vips-c "./vips-c $tmp/x.tif $tmp/x2.tif"
 
-echo -n strip-
-benchmark vips-c "./vips-c $tmp/x_strip.tif $tmp/x2.tif"
-
 gcc -Wall vips.c `pkg-config vips --cflags --libs` -o vips-c
 echo -n ppm-
 benchmark vips-c "./vips-c $tmp/x.ppm $tmp/x2.ppm"
@@ -103,21 +100,23 @@ benchmark vips.lua "./vips.lua $tmp/x.tif $tmp/x2.tif"
 
 benchmark vips.php "./vips.php $tmp/x.tif $tmp/x2.tif"
 
-benchmark vips8-gegl.py "./vips8-gegl.py $tmp/x.tif $tmp/x2.tif"
+benchmark vips-gegl.py "./vips-gegl.py $tmp/x.tif $tmp/x2.tif"
 
-g++ vips8.cc `pkg-config vips-cpp --cflags --libs` -o vips8-cc
-benchmark vips8-cc "./vips8-cc $tmp/x.tif $tmp/x2.tif"
+g++ vips.cc `pkg-config vips-cpp --cflags --libs` -o vips-cc
+benchmark vips-cc "./vips-cc $tmp/x.tif $tmp/x2.tif"
 
 benchmark vips.js "./vips.js $tmp/x.tif $tmp/x2.tif"
 
-benchmark pyvips2.py "./pyvips2.py $tmp/x.tif $tmp/x2.tif"
+benchmark pyvips-bench.py "./pyvips-bench.py $tmp/x.tif $tmp/x2.tif"
 
 benchmark ruby-vips "./ruby-vips.rb $tmp/x.tif $tmp/x2.tif"
 
 gcc -Wall vips.c `pkg-config vips --cflags --libs` -o vips-c
 echo -n jpg-
 benchmark vips-c "./vips-c $tmp/x.jpg $tmp/x2.jpg"
 
+benchmark pillow "./pillow.py $tmp/x.tif $tmp/x2.tif"
+
 benchmark vips "./vips.sh $tmp/x.tif $tmp/x2.tif"
 
 echo -n ppm-
@@ -133,7 +132,7 @@ benchmark nip2 "./vips.nip2 $tmp/x.tif -o $tmp/x2.tif"
 # OS X only
 # benchmark sips "./sips.sh $tmp/x.tif $tmp/x2.tif"
 
-benchmark pnm "./netpbm.sh $tmp/x_strip.tif $tmp/x2.tif"
+benchmark pnm "./netpbm.sh $tmp/x.tif $tmp/x2.tif"
 
 benchmark rmagick "./rmagick.rb $tmp/x.tif $tmp/x2.tif"
 
@@ -143,13 +142,6 @@ echo -n 1thread-
 benchmark vips-c "./vips-c $tmp/x.tif $tmp/x2.tif"
 unset VIPS_CONCURRENCY
 
-# tried pillow-simd with
-# CC="cc -O3 -march=native" pip install --user --force-reinstall \
-#	--ignore-installed --no-binary :all: pillow-simd
-# but no faster ... presumably most time is being spent elsewhere 
-# tried with resize LANCZOS, pillow-simd helps a lot
-benchmark pillow "./pillow.py $tmp/x.tif $tmp/x2.tif"
-
 # this needs careful config, see
 # https://github.com/jcupitt/vips-bench/issues/4
 YMAGINE=/home/john/ymagine
@@ -169,7 +161,7 @@ benchmark opencv "./opencv $tmp/x.tif $tmp/x2.tif"
 
 benchmark convert "./im.sh $tmp/x.tif $tmp/x2.tif"
 
-benchmark econvert "./ei.sh $tmp/x_strip.tif $tmp/x2.tif"
+benchmark econvert "./ei.sh $tmp/x.tif $tmp/x2.tif"
 
 echo -n jpg-
 benchmark convert "./im.sh $tmp/x.jpg $tmp/x2.jpg"
@@ -192,13 +184,12 @@ benchmark gd "./gd $tmp/x.jpg $tmp/x2.jpg"
 
 benchmark oiio "./oiio.sh $tmp/x.tif $tmp/x2.tif"
 
-benchmark imagej "imagej -x 1000 -i tmp/x_strip.tif -b bench.ijm"
+benchmark imagej "imagej -x 1000 -i tmp/x.tif -b bench.ijm"
 
 gcc -Wall gegl.c `pkg-config gegl-0.3 --cflags --libs` -o gegl
-echo -n tiff-
-benchmark gegl "./gegl $tmp/x.tif $tmp/x2.tif"
-echo -n strip-tiff-
-benchmark gegl "./gegl $tmp/x_strip.tif $tmp/x2.tif"
+# gegl-0.3 doesn't have tiff support built in
+# echo -n tiff-
+# benchmark gegl "./gegl $tmp/x.tif $tmp/x2.tif"
 echo -n jpg-
 benchmark gegl "./gegl $tmp/x.jpg $tmp/x2.jpg"
 

pillow.py

@@ -4,25 +4,15 @@
 from PIL import Image, ImageFilter, PILLOW_VERSION
 
 # just to confirm we are getting the right version
-# print("pillow.py: PILLOW_VERSION =", PILLOW_VERSION)
+# print 'pillow.py: PILLOW_VERSION =', PILLOW_VERSION
 
 im = Image.open(sys.argv[1])
 
 # Crop 100 pixels off all edges.
-im = im.crop((100, 100, im.size[0] - 100, im.size[1] - 100))
+im = im.crop((100, 100, im.width - 100, im.height - 100))
 
 # Shrink by 10%
-
-# starting with 2.7, Pillow uses a high-quality convolution-based resize for 
-# BILINEAR ... the other systems in this benchmark are using affine + bilinear,
-# so this is rather unfair. Use NEAREST instead, it gets closest to what
-# everyone else is doing
-
-# pillow-simd reduces the LANCZOS time down to only 10% more than NEAREST
-
-im = im.resize((int (im.size[0] * 0.9), int (im.size[1] * 0.9)), 
-#               Image.LANCZOS)
-               Image.NEAREST)
+im = im.resize((int(im.width * 0.9), int(im.height * 0.9)), Image.BILINEAR)
 
 # sharpen
 filter = ImageFilter.Kernel((3, 3),

pyvips2.py pyvips-bench.pypyvips2.py renamed to pyvips-bench.py

@@ -3,14 +3,14 @@
 import sys
 import pyvips
 
-im = pyvips.Image.new_from_file(sys.argv[1])
+im = pyvips.Image.new_from_file(sys.argv[1], access='sequential')
 
 im = im.crop(100, 100, im.width - 200, im.height - 200)
 im = im.similarity(scale = 0.9, 
-                   interpolate = pyvips.Interpolate.new("bilinear"))
+                   interpolate = pyvips.Interpolate.new('bilinear'))
 mask = pyvips.Image.new_from_array([[-1, -1,  -1], 
                                     [-1,  16, -1], 
-                                    [-1, -1,  -1]], scale = 8)
-im = im.conv(mask, precision = "integer")
+                                    [-1, -1,  -1]], scale=8)
+im = im.conv(mask, precision='integer')
 
 im.write_to_file(sys.argv[2])

vips-gegl.py

@@ -1,39 +1,21 @@
 #!/usr/bin/python
 
 import sys
-from vipsCC import *
+import pyvips
 
-im = VImage.VImage (sys.argv[1])
+im = pyvips.Image.new_from_file(sys.argv[1], access='sequential')
 
-# add an all-255 alpha
-alpha = VImage.VImage.black (1, 1, 1).lin (1, 255)
-alpha = alpha.clip2fmt (VImage.VImage.FMTUCHAR)
-alpha = alpha.embed (1, 0, 0, im.Xsize (), im.Ysize ())
-im = im.bandjoin (alpha)
+im = im.bandjoin(255)
+im = im.colourspace('scrgb')
 
-# turn to linear float 0 - 1
-gamma = 2.4
-lut = VImage.VImage.identity (1)
-lut = lut.pow (1.0 / gamma)
-lut = lut.lin (1.0 / pow (255, 1.0 / 2.4), 0)
-im = im.maplut (lut)
+im = im.crop(100, 100, im.width - 200, im.height - 200)
+im = im.reduce(1.0 / 0.9, 1.0 / 0.9, kernel='linear')
+mask = pyvips.Image.new_from_array([[-1, -1,  -1], 
+                                    [-1,  16, -1], 
+                                    [-1, -1,  -1]], scale=8)
+im = im.conv(mask, precision='integer')
 
-im = im.extract_area (100, 100, im.Xsize () - 200, im.Ysize () - 200)
+im = im.colourspace('srgb')
+im = im.extract_band(0, n=3)
 
-im = im.affine (0.9, 0, 0, 0.9, 0, 0, 0, 0,
-        int (im.Xsize() * 0.9), int (im.Ysize() * 0.9))
-
-mask = VMask.VIMask (3, 3, 8, 0, 
-		  [-1, -1, -1, 
-		   -1,  16, -1, 
-		   -1, -1, -1])
-im = im.conv (mask)
-
-# back to non-linear 0 - 65535
-im = im.lin (65535, 0)
-# im = im.pow (2.4)
-
-# back to uint16
-im = im.clip2fmt (VImage.VImage.FMTUSHORT)
-
-im.write (sys.argv[2])
+im.write_to_file(sys.argv[2])

vips.c

@@ -15,9 +15,8 @@ main( int argc, char **argv )
         global = vips_image_new();
         t = (VipsImage **) vips_object_local_array( VIPS_OBJECT( global ), 5 );
 
-	VipsInterpolate *interp = vips_interpolate_new( "bilinear" );
-
-        if( !(t[0] = vips_image_new_from_file( argv[1], NULL )) )
+        if( !(t[0] = vips_image_new_from_file( argv[1], 
+		"access", VIPS_ACCESS_SEQUENTIAL, NULL )) )
                 vips_error_exit( NULL );
 
         t[1] = vips_image_new_matrixv( 3, 3, 
@@ -26,18 +25,15 @@ main( int argc, char **argv )
                 -1.0, -1.0, -1.0 );
         vips_image_set_double( t[1], "scale", 8 );
 
-        if( vips_extract_area( t[0], &t[2], 
+        if( vips_crop( t[0], &t[2], 
                 100, 100, t[0]->Xsize - 200, t[0]->Ysize - 200, NULL ) ||
 			/* lanczos2 version, handy for testing against pillow
 		vips_reduce( t[2], &t[3], 1.0 / 0.9, 1.0 / 0.9, 
 			"kernel", VIPS_KERNEL_LANCZOS2,
 			NULL ) ||
 			 */
-			/* bilinear, matching the other progs here
-			 */
-                vips_similarity( t[2], &t[3], 
-			"scale", 0.9, 
-			"interpolate", interp, 
+		vips_reduce( t[2], &t[3], 1.0 / 0.9, 1.0 / 0.9, 
+			"kernel", VIPS_KERNEL_LINEAR,
 			NULL ) ||
                 vips_conv( t[3], &t[4], t[1], 
 			"precision", VIPS_PRECISION_INTEGER,
@@ -46,7 +42,6 @@ main( int argc, char **argv )
                 vips_error_exit( NULL ); 
 
         g_object_unref( global );
-        g_object_unref( interp );
 
         return( 0 );
 }

vips8.cc vips.ccvips8.cc renamed to vips.cc

@@ -1,5 +1,5 @@
 // compile with
-// g++ vips8.cc `pkg-config vips-cpp --cflags --libs`
+// g++ vips.cc `pkg-config vips-cpp --cflags --libs`
 
 #include <vips/vips8>
 
@@ -28,19 +28,17 @@ main( int argc, char **argv )
 	}
 	g_option_context_free( context );
 
-        VImage in = VImage::new_from_file( argv[1] );
+        VImage in = VImage::new_from_file( argv[1], 
+		VImage::option()-> set( "access", VIPS_ACCESS_SEQUENTIAL ));
 
         VImage mask = VImage::new_matrixv( 3, 3, 
                 -1, -1, -1, -1, 16, -1, -1, -1, -1 );
 	mask.set( "scale", 8 ); 
 
-	VInterpolate inter = VInterpolate::new_from_name( "bilinear" ); 
-
         in.
                 extract_area( 100, 100, in.width() - 200, in.height() - 200 ).
-                similarity( VImage::option()->
-			set( "scale", 0.9 )->
-			set( "interpolate", inter ) ).
+		reduce( 1.0 / 0.9, 1.0 / 0.9, VImage::option()->
+			set( "kernel", VIPS_KERNEL_LINEAR ) ).
                 conv( mask, VImage::option()->
 			set( "precision", VIPS_PRECISION_INTEGER )). 
                 write_to_file( argv[2] );

vips.js

@@ -2,7 +2,8 @@
 
 var vips = require('../node-vips');
 
-image = vips.Image.newFromFile(process.argv[2]);
+image = vips.Image.newFromFile(process.argv[2], {access: 'sequential'});
+
 image = image.crop(100, 100, image.width - 200, image.height - 200);
 
 image = image.reduce(1.0 / 0.9, 1.0 / 0.9, {kernel: 'linear'});

vips.lua

@@ -2,7 +2,7 @@
 
 local vips = require("vips")
 
-image = vips.Image.new_from_file(arg[1])
+image = vips.Image.new_from_file(arg[1], {access = "sequential"})
 
 image = image:crop(100, 100, image:width() - 200, image:height() - 200)
 

vips.php

@@ -5,7 +5,7 @@
 
 use Jcupitt\Vips;
 
-$im = Vips\Image::newFromFile($argv[1]);
+$im = Vips\Image::newFromFile($argv[1], ["access" => "sequential"]);
 
 $im = $im->crop(100, 100, $im->width - 200, $im->height - 200);
 

vips.sh

@@ -9,7 +9,7 @@ height=$((height - 200))
 # set -x
 
 vips crop $1 t1.v 100 100 $width $height
-vips similarity t1.v t2.v --scale 0.9 --interpolate bilinear
+vips reduce t1.v t2.v 1.111 1.111 --kernel linear
 
 cat > mask.con <<EOF
 3 3 8 0