multiarray 0.22.0 → 0.23.1

data/lib/multiarray/float.rb

@@ -1,5 +1,5 @@
 # multiarray - Lazy multi-dimensional arrays for Ruby
-# Copyright (C) 2010 Jan Wedekind
+# Copyright (C) 2010, 2011 Jan Wedekind
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -29,6 +29,12 @@ module Hornetseye
       # @private
       attr_accessor :double
 
+      def inherit(double)
+        retval = Class.new self
+        retval.double = double
+        retval
+      end
+
       # Memory type required to store elements of this type
       #
       # @return [Class] Returns +Malloc+.
@@ -112,11 +118,7 @@ module Hornetseye
       #
       # @return [String] Returns a string (e.g. "SFLOAT").
       def inspect
-        retval = "#{ double ? 'D' : 'S' }FLOAT"
-        ( class << self; self; end ).instance_eval do
-          define_method( :inspect ) { retval }
-        end
-        retval
+        "#{ double ? 'D' : 'S' }FLOAT"
       end
 
       # Get unique descriptor of this class
@@ -237,10 +239,8 @@ module Hornetseye
   #
   # @see FLOAT_
   # @see FLOAT_.double
-  def FLOAT( double )
-    retval = Class.new FLOAT_
-    retval.double = double
-    retval
+  def FLOAT(double)
+    FLOAT_.inherit double
   end
 
   module_function :FLOAT

data/lib/multiarray/gcccache.rb

@@ -1,5 +1,5 @@
 # multiarray - Lazy multi-dimensional arrays for Ruby
-# Copyright (C) 2010 Jan Wedekind
+# Copyright (C) 2010, 2011 Jan Wedekind
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

data/lib/multiarray/gcccontext.rb

@@ -1,5 +1,5 @@
 # multiarray - Lazy multi-dimensional arrays for Ruby
-# Copyright (C) 2010 Jan Wedekind
+# Copyright (C) 2010, 2011 Jan Wedekind
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -112,9 +112,9 @@ module Hornetseye
     # @private
     def initialize( lib_name )
       @lib_name = lib_name
-      @instructions = ''
-      @wrappers = ''
-      @registrations = ''
+      @c_instructions = ''
+      @c_wrappers = ''
+      @c_registrations = ''
     end
 
     # Create Ruby extension
@@ -137,54 +137,34 @@ module Hornetseye
     #
     # @private
     def function( descriptor, *param_types )
-      @instructions << <<EOS
-struct Arguments
-{
-#{
+      @c_instructions << <<EOS
+VALUE #{descriptor}( #{
 param_types.collect do |t|
   t.identifiers
 end.flatten.collect_with_index do |ident,i|
-  "  #{ident} param#{i};"
-end.join( "\n" )
-}
-};
-
-VALUE #{descriptor}( void *args )
+  "#{ident} param#{i}"
+end.join ', '
+} )
 {
-#{
-param_types.collect do |t|
-  t.identifiers
-end.flatten.collect_with_index do |ident,i|
-  "  #{ident} param#{i} = ((struct Arguments *)args)->param#{i};"
-end.join( "\n" )
-}
 EOS
 
-      @wrappers << <<EOS
+      @c_wrappers << <<EOS
 VALUE wrap#{descriptor.capitalize}( int argc, VALUE *argv, VALUE rbSelf )
 {
-  struct Arguments args;
-#{
+  #{descriptor}( #{
 param_types.collect do |t|
   t.r2c
 end.flatten.collect_with_index do |conv,i|
-  "  args.param#{i} = #{conv.call "argv[ #{i} ]"};"
-end.join( "\n" )
-}
-#{
-if RUBY_VERSION < '1.9.0'
-  "  #{descriptor}( &args );"
-else
-  "  rb_thread_blocking_region( &#{descriptor}, &args, RUBY_UBF_PROCESS, NULL );"
-end
-}
+  "#{conv.call "argv[#{i}]"}"
+end.join ', '
+  } );
   return Qnil;
 }
 EOS
 
-      @registrations << <<EOS
-  rb_define_singleton_method( cGCCCache, "#{descriptor}",
-                    RUBY_METHOD_FUNC( wrap#{descriptor.capitalize} ), -1 ); 
+      @c_registrations << <<EOS
+  rb_define_singleton_method(cGCCCache, "#{descriptor}",
+                             RUBY_METHOD_FUNC( wrap#{descriptor.capitalize} ), -1); 
 EOS
     end
 
@@ -197,7 +177,8 @@ EOS
     #
     # @private
     def compile
-      template = <<EOS
+      c_template = <<EOS
+/* This file is generated automatically. It is pointless to edit this file. */
 #include <ruby.h>
 #include <math.h>
 
@@ -220,43 +201,43 @@ static unsigned long make_mask( unsigned long x )
   return x;
 }
 
-static unsigned long limited_rand( unsigned long limit )
+static unsigned long limited_rand(unsigned long limit)
 {
   int i;
   unsigned long mask, val;
-  if ( limit < 2 ) return 0;
-  mask = make_mask( limit - 1 );
+  if (limit < 2) return 0;
+  mask = make_mask(limit - 1);
   retry:
   val = 0;
-  for ( i = SIZEOF_LONG / 4 - 1; 0 <= i; i-- ) {
-    if ( ( mask >> ( i * 32 ) ) & 0xffffffff ) {
-      val |= (unsigned long)rb_genrand_int32() << ( i * 32 );
+  for (i = SIZEOF_LONG / 4 - 1; 0 <= i; i--) {
+    if ((mask >> (i * 32)) & 0xffffffff) {
+      val |= (unsigned long)rb_genrand_int32() << (i * 32);
       val &= mask;
-      if ( limit <= val )
+      if (limit <= val)
         goto retry;
     };
   };
   return val;
 }
 
-#{@instructions}
+#{@c_instructions}
 
-#{@wrappers}
+#{@c_wrappers}
 void Init_#{@lib_name}(void)
 {
-  VALUE mHornetseye = rb_define_module( "Hornetseye" );
-  VALUE cGCCCache = rb_define_class_under( mHornetseye, "GCCCache",
-                                           rb_cObject );
-#{@registrations}
+  VALUE mHornetseye = rb_define_module("Hornetseye");
+  VALUE cGCCCache = rb_define_class_under(mHornetseye, "GCCCache", rb_cObject);
+#{@c_registrations}
 }
 EOS
       # File::EXCL no overwrite
       File.open "#{DIRNAME}/#{@lib_name}.c", 'w', 0600 do |f|
-        f << template
+        f << c_template
       end
       gcc = "#{LDSHARED} #{CFLAGS} -o #{DIRNAME}/#{@lib_name}.#{DLEXT} " +
             "#{DIRNAME}/#{@lib_name}.c #{LIBRUBYARG}"
-      # puts template
+      # puts c_template
+      # puts gcc
       raise "The following command failed: #{gcc}" unless system gcc
       require "#{DIRNAME}/#{@lib_name}"
     end
@@ -271,7 +252,7 @@ EOS
     #
     # @private
     def <<( str )
-      @instructions << str
+      @c_instructions << str
       self
     end
 

data/lib/multiarray/gccfunction.rb

@@ -1,5 +1,5 @@
 # multiarray - Lazy multi-dimensional arrays for Ruby
-# Copyright (C) 2010 Jan Wedekind
+# Copyright (C) 2010, 2011 Jan Wedekind
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -31,40 +31,33 @@ module Hornetseye
       # @private
       def run( block )
         keys, values, term = block.strip
-        labels = Hash[ *keys.zip( ( 0 ... keys.size ).to_a ).flatten ]
-        method_name = ( '_' + term.descriptor( labels ) ).
-                            tr( '(),+\-*/%.@?~&|^<=>',
-                                '0123\456789ABCDEFGH' )
-        compile method_name, term, *keys
-        args = values.collect { |arg| arg.values }.flatten
-        GCCCache.send method_name, *args
+        GCCCache.send compile(term, *keys), *values.collect { |arg| arg.values }.flatten
       end
 
       # Compile a block of Ruby code if not compiled already
       #
-      # @param [String] method_name Unique method name of function.
       # @param [Node] term Stripped expression to compile.
-      # @param [Array<Variable>] keys Variables for performing substitutions on
-      #        +term+.
+      # @param [Array<Variable>] keys Variables for performing substitutions on +term+.
       #
-      # @return [Object] The return value should be ignored.
+      # @return [String] Unique method name of compiled function.
       #
       # @private
-      def compile( method_name, term, *keys )
+      def compile(term, *keys)
+        labels = Hash[*keys.zip((0 ... keys.size).to_a).flatten]
+        method_name = ('_' + term.descriptor(labels)).method_name
         unless GCCCache.respond_to? method_name
           GCCContext.build do |context|
             function = GCCFunction.new context, method_name,
                                        *keys.collect { |var| var.meta }
-            Thread.current[ :function ] = function
-            term_subst = Hash[ *keys.zip( function.params ).flatten ]
-            Hornetseye::lazy do
-              term.subst( term_subst ).demand
-            end
-            Thread.current[ :function ] = nil
+            Thread.current[:function] = function
+            term_subst = Hash[ *keys.zip(function.params).flatten ]
+            Hornetseye::lazy { term.subst(term_subst).demand }
+            Thread.current[:function] = nil
             function.insn_return
             function.compile
           end
         end
+        method_name
       end
 
     end

data/lib/multiarray/gcctype.rb

@@ -1,5 +1,5 @@
 # multiarray - Lazy multi-dimensional arrays for Ruby
-# Copyright (C) 2010 Jan Wedekind
+# Copyright (C) 2010, 2011 Jan Wedekind
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

data/lib/multiarray/gccvalue.rb

@@ -1,5 +1,5 @@
 # multiarray - Lazy multi-dimensional arrays for Ruby
-# Copyright (C) 2010 Jan Wedekind
+# Copyright (C) 2010, 2011 Jan Wedekind
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -47,7 +47,7 @@ module Hornetseye
       #
       # @private
       def define_unary_op( op, opcode = op )
-        define_method( op ) do
+        define_method op do
           GCCValue.new @function, "#{opcode}( #{self} )"
         end
       end
@@ -62,7 +62,7 @@ module Hornetseye
       # @private
       def define_unary_method( mod, op, opcode = op )
         mod.module_eval do
-          define_method( "#{op}_with_gcc" ) do |a|
+          define_method "#{op}_with_gcc" do |a|
             if a.is_a? GCCValue
               GCCValue.new a.function, "#{opcode}( #{a} )"
             else
@@ -84,7 +84,7 @@ module Hornetseye
       #
       # @private
       def define_binary_op( op, opcode = op )
-        define_method( op ) do |other|
+        define_method op do |other|
           if GCCValue.generic? other
             GCCValue.new @function, "( #{self} ) #{opcode} ( #{other} )"
           else
@@ -104,7 +104,7 @@ module Hornetseye
       # @private
       def define_binary_method( mod, op, opcode = op )
         mod.module_eval do
-          define_method( "#{op}_with_gcc" ) do |a,b|
+          define_method "#{op}_with_gcc" do |a,b|
             if a.is_a? GCCValue or b.is_a? GCCValue
               function = a.is_a?( GCCValue ) ? a.function : b.function
               GCCValue.new function, "#{opcode}( #{a}, #{b} )"
@@ -304,44 +304,6 @@ module Hornetseye
       end
     end
 
-    # Create code for conditional selection of RGB value
-    #
-    # @param [GCCValue,Object] a First value.
-    # @param [GCCValue,Object] b Second value.
-    #
-    # @return [GCCValue] C value referring to result.
-    #
-    # @private
-    def conditional_with_rgb( a, b )
-      if a.is_a?( RGB ) or b.is_a?( RGB )
-        Hornetseye::RGB( conditional( a.r, b.r ), conditional( a.g, b.g ),
-                         conditional( a.b, b.b ) )
-      else
-        conditional_without_rgb a, b
-      end
-    end
-
-    alias_method_chain :conditional, :rgb
-
-    # Create code for conditional selection of complex value
-    #
-    # @param [GCCValue,Object] a First value.
-    # @param [GCCValue,Object] b Second value.
-    #
-    # @return [GCCValue] C value referring to result.
-    #
-    # @private
-    def conditional_with_complex( a, b )
-      if a.is_a?( InternalComplex ) or b.is_a?( InternalComplex )
-        InternalComplex.new conditional( a.real, b.real ),
-                            conditional( a.imag, b.imag )
-      else
-        conditional_without_complex a, b
-      end
-    end
-
-    alias_method_chain :conditional, :complex
-
     # Generate code for conditional statement
     #
     # @param [Proc] action Block of conditional.
@@ -400,6 +362,7 @@ module Hornetseye
     define_binary_op :<=
     define_binary_op :>
     define_binary_op :>=
+    define_binary_op :>=
     define_unary_method Math, :sqrt
     define_unary_method Math, :log
     define_unary_method Math, :log10
@@ -522,6 +485,63 @@ module Hornetseye
         "( ( #{self} ) <= ( #{other} ) ) ? ( #{self} ) : ( #{other} )"
     end
 
+    # Create code for conditional selection of RGB value
+    #
+    # @param [GCCValue,Object] a First value.
+    # @param [GCCValue,Object] b Second value.
+    #
+    # @return [GCCValue] C value referring to result.
+    #
+    # @private
+    def conditional_with_rgb( a, b )
+      if a.is_a?(RGB) or b.is_a?(RGB)
+        Hornetseye::RGB conditional(a.r, b.r), conditional(a.g, b.g), conditional(a.b, b.b)
+      else
+        conditional_without_rgb a, b
+      end
+    end
+
+    alias_method_chain :conditional, :rgb
+
+    # Create code for conditional selection of complex value
+    #
+    # @param [GCCValue,Object] a First value.
+    # @param [GCCValue,Object] b Second value.
+    #
+    # @return [GCCValue] C value referring to result.
+    #
+    # @private
+    def conditional_with_complex( a, b )
+      if a.is_a?( InternalComplex ) or b.is_a?( InternalComplex )
+        InternalComplex.new conditional( a.real, b.real ),
+                            conditional( a.imag, b.imag )
+      else
+        conditional_without_complex a, b
+      end
+    end
+
+    alias_method_chain :conditional, :complex
+
+    def major_with_rgb(other)
+      if other.is_a?(RGB)
+        Hornetseye::RGB r.major(other.r), g.major(other.g), b.major(other.b)
+      else
+        major_without_rgb other
+      end
+    end
+
+    alias_method_chain :major, :rgb
+
+    def minor_with_rgb(other)
+      if other.is_a?(RGB)
+        Hornetseye::RGB r.minor(other.r), g.minor(other.g), b.minor(other.b)
+      else
+        minor_without_rgb other
+      end
+    end
+
+    alias_method_chain :minor, :rgb
+
     # Generate a +for+ loop in C
     #
     # @param [Proc] action Code for generating loop body.

data/lib/multiarray/histogram.rb

@@ -1,5 +1,5 @@
 # multiarray - Lazy multi-dimensional arrays for Ruby
-# Copyright (C) 2010 Jan Wedekind
+# Copyright (C) 2010, 2011 Jan Wedekind
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -44,6 +44,10 @@ module Hornetseye
       @dest, @weight, @sources = dest, weight, sources
     end
 
+    def sexp?
+      true
+    end
+
     # Get unique descriptor of this object
     #
     # @param [Hash] hash Labels for any variables.
@@ -57,17 +61,12 @@ module Hornetseye
         "#{@sources.collect { |source| source.descriptor( hash ) }.join ','})"
     end
 
-    # Get type of result of delayed operation
-    #
-    # @return [Class] Type of result.
-    #
-    # @private
-    def array_type
-      retval = @dest.array_type
-      ( class << self; self; end ).instance_eval do
-        define_method( :array_type ) { retval }
-      end
-      retval
+    def typecode
+      @dest.typecode
+    end
+
+    def shape
+      @dest.shape
     end
 
     # Reevaluate computation
@@ -80,19 +79,18 @@ module Hornetseye
     def demand
       if variables.empty?
         if @sources.any? { |source| source.dimension > 0 }
-          source_type = @sources.
-            collect { |source| source.array_type }.inject { |a,b| a.coercion b }
+          source_type = @sources.inject { |a,b| a.dimension > b.dimension ? a : b }
           source_type.shape.last.times do |i|
             sources = @sources.collect do |source|
-              source.dimension > 0 ? source.element( INT.new( i ) ) : source
+              source.dimension > 0 ? source.element(INT.new(i)) : source
             end
-            weight = @weight.dimension > 0 ? @weight.element( INT.new( i ) ) : @weight
-            Histogram.new( @dest, weight, *sources ).demand
+            weight = @weight.dimension > 0 ? @weight.element(INT.new(i)) : @weight
+            Histogram.new(@dest, weight, *sources).demand
           end
         else
           dest = @dest
-          ( @dest.dimension - 1 ).downto( 0 ) do |i|
-            dest = dest.element @sources[ i ].demand
+          (@dest.dimension - 1).downto(0) do |i|
+            dest = dest.element @sources[i].demand
           end
           dest.store dest + @weight
         end