convolver 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88d7660efc3504ac86b924689050754185e69f8c
-  data.tar.gz: 69786c83e478d75db709e00d46346ec6f0bbef8f
+  metadata.gz: a0f2badf8733818f128a1c6f1456ae37e114f549
+  data.tar.gz: 81889f084e50d4789ec202082422dd9b24304210
 SHA512:
-  metadata.gz: 58bf4eb7b7b44fae9f46b79e33e62b2a8148cb9f9d8f40525c74e152b1d3b3ffabfdbb106cce09af350e30bd923fe40d62f38b24f19ef8ee169bc0c5696315f6
-  data.tar.gz: 4cbafca71dc5399d05950c6ebda268f5533541069bd71130388634edd4530101dc16e689abdd9393493de2e299cf89e7d189a3a510c0deecc491bf9314a0dc4a
+  metadata.gz: 557d6b5738041165a5a22f4ede39d4d0cc7333aa6bfd2937cf3334e16e8daa7c12672ed6377be31003974b90b4a8a942f93fdf812d886202894d46088a2c30a5
+  data.tar.gz: d598375b28278a5ac14619280068cfaeab82fe2d1c4aac9aeae817bb4b4958c913c1fb6674af1b9f4af901f7844621863e2ffd9d4991dc7ca31e7c8e32818c48

data/.gitignore

@@ -16,3 +16,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+benchmarks

data/lib/convolver.rb

@@ -28,8 +28,51 @@ module Convolver
     (FFTW3.ifft( cfreqs ).real * (1.0/mod_a.size))[*ranges]
   end
 
+  # A rough estimate of time that #convolve_fftw3 will take, based on complexity
+  # of its operations, and some rough benchmarking. A value of 1.0 corresponds to results
+  # varying between 1 and 12 milliseconds on the test computer.
+  # @param [NArray] signal must be same size or larger than kernel in each dimension
+  # @param [NArray] kernel must be same size or smaller than signal in each dimension
+  # @return [Float] rough estimate of time for convolution compared to baseline
+  def self.predict_convolve_fft_time signal, kernel
+    16 * 4.55e-08 * combined_shape(signal.shape,kernel.shape).inject(1) { |t,x| t * x * Math.log(x) }
+  end
+
+  # A rough estimate of time that #convolve will take, based on complexity
+  # of its operations, and some rough benchmarking. A value of 1.0 corresponds to results
+  # varying bewteen 2 and 8 milliseconds on the test computer.
+  # @param [NArray] signal must be same size or larger than kernel in each dimension
+  # @param [NArray] kernel must be same size or smaller than signal in each dimension
+  # @return [Float] rough estimate of time for convolution compared to baseline
+  def self.predict_convolve_basic_time signal, kernel
+    outputs = shape_to_size( result_shape( signal.shape, kernel.shape ) )
+    4.54e-12 * (outputs * shape_to_size( signal.shape ) * shape_to_size( kernel.shape ))
+  end
+
   private
 
+  def self.shape_to_size shape
+    shape.inject(1) { |t,x| t * x }
+  end
+
+  def self.combined_shape signal_shape, kernel_shape
+    combined_shape = [  ]
+    signal_shape.each_with_index do |signal_size, i|
+      kernel_size = kernel_shape[i]
+      combined_shape[i] = signal_size + kernel_size - 1
+    end
+    combined_shape
+  end
+
+  def self.result_shape signal_shape, kernel_shape
+    result_shape = [  ]
+    signal_shape.each_with_index do |signal_size, i|
+      kernel_size = kernel_shape[i]
+      result_shape[i] = signal_size - kernel_size + 1
+    end
+    result_shape
+  end
+
   def self.fft_offsets signal_shape, kernel_shape
     combined_shape = []
     shift_by = []

data/lib/convolver/version.rb

@@ -1,3 +1,3 @@
 module Convolver
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: convolver
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Neil Slater
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-26 00:00:00.000000000 Z
+date: 2013-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: narray
@@ -123,7 +123,6 @@ files:
 - README.md
 - Rakefile
 - benchmarks/convolve_benchmark.rb
-- benchmarks/convolver_vs_fftw3.rb
 - benchmarks/nn_layer_benchmark.rb
 - convolver.gemspec
 - ext/convolver/cnn_components.c

data/benchmarks/convolver_vs_fftw3.rb

@@ -1,46 +0,0 @@
-require 'convolver'
-require 'benchmark'
-
-class Convolver2DBenchmark
-  attr_reader :image, :kernel
-
-  def initialize
-    # These show Convolver.convolve as 3x faster than FFTW3
-    @image = NArray.sfloat(256 * 256).random
-    @kernel = NArray.sfloat(16 * 16).random
-
-    # These are roughly even (10% advantage to FFTW3)
-    #  @image = NArray.sfloat(256 * 256).random
-    #  @kernel = NArray.sfloat(32 * 32).random
-
-    # These show FFTW3 as 4x faster than Convolver.convolve
-    #  @image = NArray.sfloat(256 * 256).random
-    #  @kernel = NArray.sfloat(64 * 64).random
-
-    # These show Convolver.convolve as 200x faster than FFTW3
-    # @image = NArray.sfloat(50 * 64 * 64).random
-    # @kernel = NArray.sfloat(50 * 64 * 64).random
-
-    # These show FFTW3 as 2x faster than Convolver.convolve
-    # @image = NArray.sfloat(128 * 128).random
-    # @kernel = NArray.sfloat(64 * 64).random
-
-    # These show FFTW3 and Convolver.convolve roughly equal
-    # @image = NArray.sfloat(80 * 80).random
-    # @kernel = NArray.sfloat(64 * 64).random
-
-    # These show FFTW3 as 2x faster than Convolver.convolve
-    # @image = NArray.sfloat(2 * 80 * 80).random
-    # @kernel = NArray.sfloat(2 * 64 * 64).random
-
-    # These are roughly even - increasing size of image favours FFTW3
-    #@image = NArray.sfloat(2000 + 80 * 80).random
-    #@kernel = NArray.sfloat(80 * 80).random
-  end
-end
-
-Benchmark.bm do |x|
-  source = Convolver2DBenchmark.new
-  x.report('convolver') { 100.times { Convolver.convolve( source.image, source.kernel ) } }
-  x.report('fftw3') { 100.times { Convolver.convolve_fftw3( source.image, source.kernel ) } }
-end