multiarray 0.14.2 → 0.15.0

data/Rakefile

@@ -6,7 +6,7 @@ require 'rake/packagetask'
 require 'rbconfig'
 
 PKG_NAME = 'multiarray'
-PKG_VERSION = '0.14.2'
+PKG_VERSION = '0.15.0'
 RB_FILES = FileList[ 'lib/**/*.rb' ]
 TC_FILES = FileList[ 'test/tc_*.rb' ]
 TS_FILES = FileList[ 'test/ts_*.rb' ]

data/lib/multiarray/bool.rb

@@ -58,7 +58,7 @@ module Hornetseye
       # @return [Class] Returns +Malloc+.
       #
       # @private
-      def memory
+      def memory_type
         Malloc
       end
 

data/lib/multiarray/composite.rb

@@ -34,11 +34,11 @@ module Hornetseye
 
       # Memory type required to store elements of this type
       #
-      # @return [Class] Returns +element_type.memory+.
+      # @return [Class] Returns +element_type.memory_type+.
       #
       # @private
-      def memory
-        element_type.memory
+      def memory_type
+        element_type.memory_type
       end
 
       # Get storage size to store an element of this type

data/lib/multiarray/elementwise.rb

@@ -227,7 +227,7 @@ module Hornetseye
   # @see ElementWise_.conversion
   #
   # @private
-  def ElementWise( operation, key, conversion = lambda { |t| t.send :contiguous } )
+  def ElementWise( operation, key, conversion = lambda { |t| t.send :identity } )
     retval = Class.new ElementWise_
     retval.operation = operation
     retval.key = key

data/lib/multiarray/float.rb

@@ -34,7 +34,7 @@ module Hornetseye
       # @return [Class] Returns +Malloc+.
       #
       # @private
-      def memory
+      def memory_type
         Malloc
       end
 

data/lib/multiarray/int.rb

@@ -38,7 +38,7 @@ module Hornetseye
       # @return [Class] Returns +Malloc+.
       #
       # @private
-      def memory
+      def memory_type
         Malloc
       end
 

data/lib/multiarray/lambda.rb

@@ -38,6 +38,25 @@ module Hornetseye
       @term.memory
     end
 
+    # Get strides of array
+    #
+    # @return [Array<Integer>,NilClass] Array strides of this type.
+    #
+    # @private
+    def strides
+      other = @term.strides
+      other ? other + [ stride( @index ) ] : nil
+    end
+
+    # Get stride for specific index
+    #
+    # @return [Integer,NilClass] Array stride of this index.
+    #
+    # @private
+    def stride( index )
+      @term.stride index
+    end
+
     # Get unique descriptor of this object
     #
     # @param [Hash] hash Labels for any variables.

data/lib/multiarray/lookup.rb

@@ -33,12 +33,27 @@ module Hornetseye
     #
     # @return [Malloc,List,NilClass] Object storing the data.
     def memory
-      #if array_type.storage_size != @stride.get * typecode.storage_size
-      #  raise 'Memory is not contiguous'
-      #end
       @p.memory
     end
 
+    # Get strides of array
+    #
+    # @return [Array<Integer>,NilClass] Array strides of this type.
+    #
+    # @private
+    def strides
+      @p.strides
+    end
+
+    # Get stride for specific index
+    #
+    # @return [Integer,NilClass] Array stride of this index.
+    #
+    # @private
+    def stride( index )
+      @index == index ? @stride.get : @p.stride( index )
+    end
+
     # Get unique descriptor of this object
     #
     # @param [Hash] hash Labels for any variables.

data/lib/multiarray/methods.rb

@@ -55,7 +55,7 @@ module Hornetseye
     # @return [Proc] The new method.
     #
     # @private
-    def define_unary_method( mod, op, conversion = :contiguous )
+    def define_unary_method( mod, op, conversion = :identity )
       mod.module_eval do
         define_method( "#{op}_with_hornetseye" ) do |a|
           if a.is_a? Node

data/lib/multiarray/multiarray.rb

@@ -33,7 +33,7 @@ module Hornetseye
         count = options[ :count ] || 1
         if shape.empty?
           memory = options[ :memory ] ||
-                   typecode.memory.new( typecode.storage_size * count )
+                   typecode.memory_type.new( typecode.storage_size * count )
           Hornetseye::Pointer( typecode ).new memory
         else
           size = shape.pop

data/lib/multiarray/node.rb

@@ -152,12 +152,12 @@ module Hornetseye
         0
       end
 
-      # Get corresponding contiguous datatype
+      # Get this data type
       #
       # @return [Class] Returns +self+.
       #
       # @private
-      def contiguous
+      def identity
         self
       end
 
@@ -418,6 +418,24 @@ module Hornetseye
       array_type.storage_size
     end
 
+    # Duplicate array expression if it is not in row-major format
+    #
+    # @return [Node] Duplicate of array or +self+.
+    def memorise
+      if memory
+        contiguous_strides = ( 0 ... dimension ).collect do |i|
+          shape[ 0 ... i ].inject( 1 ) { |a,b| a * b }
+        end
+        if strides == contiguous_strides
+          self
+        else
+          dup
+        end
+      else
+        dup
+      end
+    end
+
     # Get memory object
     #
     # @return [Malloc,List,NilClass] This method will return +nil+.
@@ -425,6 +443,24 @@ module Hornetseye
       nil
     end
 
+    # Get strides of array
+    #
+    # @return [Array<Integer>,NilClass] Array strides of this type.
+    #
+    # @private
+    def strides
+      nil
+    end
+
+    # Get stride for specific index
+    #
+    # @return [Integer,NilClass] Array stride of this index.
+    #
+    # @private
+    def stride( index )
+      nil
+    end
+
     # Check whether this object is an empty array
     #
     # @return [Boolean] Returns whether this object is an empty array.

data/lib/multiarray/object.rb

@@ -47,7 +47,7 @@ module Hornetseye
       # @see List
       #
       # @private
-      def memory
+      def memory_type
         List
       end
 

data/lib/multiarray/operations.rb

@@ -28,7 +28,7 @@ module Hornetseye
     # @return [Proc] The new method.
     #
     # @private
-    def define_unary_op( op, conversion = :contiguous )
+    def define_unary_op( op, conversion = :identity )
       define_method( op ) do
         if dimension == 0 and variables.empty?
           target = typecode.send conversion
@@ -550,9 +550,9 @@ module Hornetseye
     end
 
     def shift( *offset )
-      if offset.size != shape.size
+      if offset.size != dimension
         raise "#{offset.size} offset(s) were given but array has " +
-              "#{shape.size} dimensions"
+              "#{dimension} dimension(s)"
       end
       retval = array_type.new
       target, source, open, close = [], [], [], []
@@ -584,6 +584,27 @@ module Hornetseye
       retval
     end
 
+    def downsample( *rate )
+      options = rate.last.is_a?( Hash ) ? rate.pop : {}
+      options = { :offset => rate.collect { |r| r - 1 } }.merge options
+      offset = options[ :offset ]
+      if rate.size != dimension
+        raise "#{rate.size} sampling rate(s) given but array has " +
+              "#{dimension} dimension(s)"
+      end
+      if offset.size != dimension
+        raise "#{offset.size} sampling offset(s) given but array has " +
+              "#{dimension} dimension(s)"
+      end
+      ret_shape = ( 0 ... dimension ).collect do |i|
+        ( shape[i] + rate[i] - 1 - offset[i] ).div rate[i]
+      end
+      field = ( 0 ... dimension ).collect do |i|
+        Hornetseye::lazy( *ret_shape ) { |*args| args[i] * rate[i] + offset[i] }
+      end
+      warp *field
+    end
+
   end
 
   class Node

data/lib/multiarray/pointer.rb

@@ -60,7 +60,7 @@ module Hornetseye
       #
       # @return [Memory,List] Memory for storing one object of type +target+.
       def default
-        target.memory.new target.storage_size
+        target.memory_type.new target.storage_size
       end
 
       # Test equality of classes
@@ -150,6 +150,15 @@ module Hornetseye
       @value
     end
 
+    # Get strides of array
+    #
+    # @return [Array<Integer>,NilClass] Array strides of this type.
+    #
+    # @private
+    def strides
+      []
+    end
+
     # Strip of all values
     #
     # Split up into variables, values, and a term where all values have been

data/lib/multiarray/sequence.rb

@@ -253,12 +253,12 @@ module Hornetseye
         element_type.rgb?
       end
 
-      # Get corresponding contiguous type
+      # Get this type
       #
       # @return [Class] Returns +self+.
       #
       # @private
-      def contiguous
+      def identity
         self
       end
 

data/test/tc_multiarray.rb

@@ -497,6 +497,16 @@ class TC_MultiArray < Test::Unit::TestCase
     end
   end
 
+  def test_downsample
+    [ O, I ].each do |t|
+      assert_equal M( t, 1, 2 )[ [ 2 ], [ 6 ] ],
+                   M( t, 3, 2 )[ [ 1, 2, 3 ], [ 5, 6, 7 ] ].downsample( 2, 1 )
+      assert_equal M( t, 2, 2 )[ [ 1, 3 ], [ 5, 7 ] ],
+                   M( t, 3, 2 )[ [ 1, 2, 3 ], [ 5, 6, 7 ] ].
+                   downsample( 2, 1, :offset => [ 0, 0 ] )
+    end
+  end
+
   def test_zero
     assert_equal M[ [ false, true ], [ true, false ] ],
                  M[ [ -1, 0 ], [ 0, 1 ] ].zero?

data/test/tc_sequence.rb

@@ -386,6 +386,23 @@ class TC_Sequence < Test::Unit::TestCase
     end
   end
 
+  def test_shift
+    [ O, I ].each do |t|
+      assert_equal S( t, 3 )[ 1, 2, 3 ], S( t, 3 )[ 1, 2, 3 ].shift( 0 )
+      assert_equal S( t, 3 )[ 3, 1, 2 ], S( t, 3 )[ 1, 2, 3 ].shift( 1 )
+      assert_equal S( t, 3 )[ 2, 3, 1 ], S( t, 3 )[ 1, 2, 3 ].shift( 2 )
+    end
+  end
+
+  def test_downsample
+    [ O, I ].each do |t|
+      assert_equal S( t, 2 )[ 2, 4 ],
+                   S( t, 4 )[ 1, 2, 3, 4 ].downsample( 2 )
+      assert_equal S( t, 2 )[ 1, 3 ],
+                   S( t, 4 )[ 1, 2, 3, 4 ].downsample( 2, :offset => [ 0 ] )
+    end
+  end
+
   def test_zero
     [ S( O, 3 ), S( I, 3 ) ].each do |t|
       assert_equal [ false, true, false ], t[ -1, 0, 1 ].zero?.to_a

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 14
-  - 2
-  version: 0.14.2
+  - 15
+  - 0
+  version: 0.15.0
 platform: ruby
 authors: 
 - Jan Wedekind
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-17 00:00:00 +00:00
+date: 2010-12-20 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency