update for latest

Author: jcupitt

benchmark.sh

@@ -64,10 +64,11 @@ get_time() {
 get_mem() {
 	name=$1
 	cmd=$2
+	user=$(whoami)
 
 	rm -f $tmp/vipsbench.lock
 	(while [ ! -f $tmp/vipsbench.lock ]; do 
-		ps u
+		ps u -u $user 
 		sleep 0.01
 	 done | ./parse-ps.rb "$name" > "$name.csv") &
 	$cmd 
@@ -146,6 +147,9 @@ benchmark pnm "./netpbm.sh $tmp/x_strip.tif $tmp/x2.tif"
 
 benchmark convert "./im.sh $tmp/x.tif $tmp/x2.tif"
 
+echo -n jpg-
+benchmark convert "./im.sh $tmp/x.jpg $tmp/x2.jpg"
+
 gcc -Wall vips.c `pkg-config vips --cflags --libs` -o vips-c
 export VIPS_CONCURRENCY=1
 echo -n 1thread-
@@ -197,8 +201,7 @@ benchmark gegl "./gegl $tmp/x_strip.tif $tmp/x2.tif"
 echo -n jpg-
 benchmark gegl "./gegl $tmp/x.jpg $tmp/x2.jpg"
 
-# octave image load is broken in 15.10
-# benchmark ./octave.m $tmp/x.tif $tmp/x2.tif
+benchmark octave "./octave.m $tmp/x.tif $tmp/x2.tif"
 
 ./combine.rb *.csv > memtrace.csv
 

octave.m

@@ -1,6 +1,7 @@
 #!/usr/bin/octave -qf
 
-% this segvs for me on (amost) any image, strange
+% we see some annoying warnings from GM without this
+warning("off")
 
 pkg load image
 

vips.nip2

@@ -5,6 +5,6 @@ main
   = (sharpen @ shrink @ crop ) (Image_file argv?1)
 {
   crop x = extract_area 100 100 (x.width - 200) (x.height - 200) x;
-  shrink = resize Interpolate_bilinear 0.9 0.9;
+  shrink = resize Kernel_linear 0.9 0.9;
   sharpen = conv (Matrix_con 8 0 [[-1, -1, -1], [-1, 16, -1], [-1, -1, -1]]);
 }

vips8.py

@@ -2,6 +2,8 @@
 
 import sys
 
+import gi
+gi.require_version('Vips', '8.0')
 from gi.repository import Vips 
 
 im = Vips.Image.new_from_file(sys.argv[1])