cumo 0.1.0 → 0.1.1

data/ext/cumo/narray/gen/cogen.rb

@@ -4,11 +4,13 @@ thisdir = File.dirname(__FILE__)
 libpath = File.absolute_path(File.dirname(__FILE__))+"/../../../../lib"
 $LOAD_PATH.unshift libpath
 
-require_relative "./narray_def"
+require_relative "narray_def"
+
+$line_number = false
 
 while true
   if ARGV[0] == "-l"
-    require "erbpp/line_number"
+    $line_number = true
     ARGV.shift
   elsif ARGV[0] == "-o"
     ARGV.shift
@@ -33,6 +35,7 @@ erb_dir.unshift("tmpl_bit") if (type_name == "bit")
 erb_dir.map!{|d| File.join(thisdir,d)}
 
 code = DefLib.new do
+  set line_number: $line_number
   set erb_dir: erb_dir
   set erb_suffix: ".c"
   set ns_var: "mCumo"

data/ext/cumo/narray/gen/cogen_kernel.rb

@@ -4,11 +4,13 @@ thisdir = File.dirname(__FILE__)
 libpath = File.absolute_path(File.dirname(__FILE__))+"/../../../../lib"
 $LOAD_PATH.unshift libpath
 
-require_relative "./narray_def"
+require_relative "narray_def"
+
+$line_number = false
 
 while true
   if ARGV[0] == "-l"
-    require "erbpp/line_number"
+    $line_number = true
     ARGV.shift
   elsif ARGV[0] == "-o"
     ARGV.shift
@@ -33,6 +35,7 @@ erb_dir.unshift("tmpl_bit") if (type_name == "bit")
 erb_dir.map!{|d| File.join(thisdir,d)}
 
 code = DefLib.new do
+  set line_number: $line_number
   set erb_dir: erb_dir
   set erb_suffix: "_kernel.cu"
   set ns_var: "mCumo"

data/ext/cumo/narray/gen/def/dcomplex.rb

@@ -4,7 +4,7 @@ set full_class_name:     "Cumo::DComplex"
 set class_name:          "DComplex"
 set class_alias:         "Complex64"
 set class_var:           "cT"
-set ctype:               "dcomplex"
+set ctype:               "cumo_dcomplex"
 set real_class_name:     "DFloat"
 set real_ctype:          "double"
 

data/ext/cumo/narray/gen/def/scomplex.rb

@@ -4,7 +4,7 @@ set full_class_name:     "Cumo::SComplex"
 set class_name:          "SComplex"
 set class_alias:         "Complex32"
 set class_var:           "cT"
-set ctype:               "Scomplex"
+set ctype:               "cumo_scomplex"
 set real_class_name:     "SFloat"
 set real_ctype:          "float"
 

data/ext/cumo/narray/gen/erbln.rb

@@ -0,0 +1,132 @@
+require 'erb'
+
+class ErbPP
+
+  class CountLnString < String
+
+    def initialize(filename)
+      @filename = filename
+      @lnchar = "\n"
+      @buf = ""
+      @str = ""
+      @countln = 1
+      @current = 1
+      super("\n"+report_line)
+    end
+
+    def report_line
+      "#line #{@current} \"#{@filename}\"\n"
+    end
+
+    def concat0(s)
+      ln(caller[0])
+      @buf.concat(s)
+      @str.concat(s)
+    end
+
+    def concat1(s)
+      ln(caller[0])
+      @buf.concat(s)
+    end
+
+    def ln(status=nil)
+      case status
+      when /:(\d+):/
+        n = $1.to_i
+      else
+        n = status.to_i
+      end
+      return if n == @current
+      if @current != @countln || @postpone
+        if /\A\s*\z/ =~ @str || /\A#line / =~ @buf
+          @postpone = true
+        elsif @in_comment
+          @postpone = false
+        else
+          if self[-1] != "\n"
+            concat("\n")
+          end
+          concat(report_line)
+          @postpone = false
+        end
+      end
+      concat(@buf)
+
+      b = @buf.gsub(/".*?(?<!\\)"/,'""')
+      /^.*(\/\*)(.*?)$/ =~ b
+      x = $2
+      /^.*(\*\/)(.*?)$/ =~ b
+      y = $2
+      if x
+        if y
+          if x.size < y.size
+            #:in_comment
+            @in_comment = true
+          else
+            #:out_comment
+            @in_comment = false
+          end
+        else
+          #:in_comment
+          @in_comment = true
+        end
+      else
+        if y
+          #:out_comment
+          @in_comment = false
+        else
+          #:keep
+        end
+      end
+
+      @countln = @current + @buf.count(@lnchar)
+      @current = n
+      @buf = ""
+      @str = ""
+    end
+
+    def d(s)
+      p [s, [x,y], r]
+      r
+    end
+
+    def final
+      ln(caller[0])
+      concat(@buf)
+    end
+
+  end
+
+  class ERBLN
+
+    def initialize(str, filename, trim_mode=nil, eoutvar='_erbout')
+      @filename = filename
+      compiler = ERB::Compiler.new(trim_mode)
+      set_eoutvar(compiler, eoutvar)
+      @src, @enc = *compiler.compile(str)
+    end
+
+    def set_eoutvar(compiler, eoutvar = '_erbout')
+      compiler.put_cmd = "#{eoutvar}.concat0"
+      compiler.insert_cmd = "#{eoutvar}.concat1"
+      compiler.pre_cmd = ["#{eoutvar} = CountLnString.new(#{@filename.inspect})"]
+      compiler.post_cmd = ["#{eoutvar}.final"]
+    end
+
+    def run(b)
+      print self.result(b)
+    end
+
+    def result(b)
+      #open("tmpout","a") do |f|
+      #  f.puts "\n#file:#{@filename}"
+      #  f.puts @src
+      #end
+      eval(@src, b, (@filename || '(erb)'), 0)
+    end
+
+    #require "fileutils"
+    #FileUtils.rm_f("tmpout")
+  end
+
+end

data/ext/cumo/narray/gen/erbpp2.rb

@@ -1,4 +1,5 @@
 require "erb"
+require_relative "erbln"
 
 class ErbPP
 
@@ -66,8 +67,12 @@ class ErbPP
       Dir.glob(x).each do |dir|
         path = File.join(dir,file)
         if File.exist?(path)
-          erb = ERB.new(File.read(path), safe_level, trim_mode)
-          erb.filename = path
+          if get(:line_number)
+            erb = ERBLN.new(File.read(path), path, trim_mode)
+          else
+            erb = ERB.new(File.read(path), safe_level, trim_mode)
+            erb.filename = path
+          end
           return erb
         end
       end
@@ -119,15 +124,15 @@ class DefLib < ErbPP
     opts[:include_files] ||= []
     super(parent, **opts, &block)
   end
-  def id_assign
+  def cumo_id_assign
     ids = []
-    @children.each{|c| a=c.get(:id_list); ids.concat(a) if a}
-    ids.sort.uniq.map{|x| "id_#{x[1]} = rb_intern(\"#{x[0]}\");"}
+    @children.each{|c| a=c.get(:cumo_id_list); ids.concat(a) if a}
+    ids.sort.uniq.map{|x| "cumo_id_#{x[1]} = rb_intern(\"#{x[0]}\");"}
   end
-  def id_decl
+  def cumo_id_decl
     ids = []
-    @children.each{|c| a=c.get(:id_list); ids.concat(a) if a}
-    ids.sort.uniq.map{|x| "static ID id_#{x[1]};\n"}
+    @children.each{|c| a=c.get(:cumo_id_list); ids.concat(a) if a}
+    ids.sort.uniq.map{|x| "static ID cumo_id_#{x[1]};\n"}
   end
   def def_class(**opts, &block)
     DefClass.new(self, **opts, &block)
@@ -173,12 +178,12 @@ class DefModule < ErbPP
     eb = opts[:erb_base] || 'module'
     super(parent, erb_base:eb, **opts, &block)
   end
-  def id_list
-    @id_list ||= []
+  def cumo_id_list
+    @cumo_id_list ||= []
   end
   def def_id(name,var=nil)
     var = name.gsub(/\?/,"_p").gsub(/\!/,"_bang") if var.nil?
-    id_list << [name,var]
+    cumo_id_list << [name,var]
   end
   def init_def
     load_erb(init_erb).result(binding)
@@ -221,11 +226,11 @@ class DefMethod < ErbPP
     set erb_base: erb_base
   end
 
-  def id_op
+  def cumo_id_op
     if op.size == 1
       "'#{op}'"
     else
-      "id_#{c_name}"
+      "cumo_id_#{c_name}"
     end
   end
 

data/ext/cumo/narray/gen/narray_def.rb

@@ -1,4 +1,4 @@
-require_relative './erbpp2'
+require_relative 'erbpp2'
 
 module NArrayMethod
 
@@ -232,11 +232,11 @@ class Store < DefMethod
   def extract_data(ptr,pos,x)
     case type_name
     when "Bit"
-      "{BIT_DIGIT b; LOAD_BIT(#{ptr},#{pos},b); x = m_from_sint(b);}"
+      "{BIT_DIGIT b; CUMO_LOAD_BIT(#{ptr},#{pos},b); x = m_from_sint(b);}"
     when "RObject"
       "#{x} = m_num_to_data(*(#{dtype}*)(#{ptr}+#{pos}))"
     when /Complex/
-      "{#{dtype} *p = (#{dtype}*)(#{ptr}+#{pos}); #{x} = c_new(REAL(*p),IMAG(*p));}"
+      "{#{dtype} *p = (#{dtype}*)(#{ptr}+#{pos}); #{x} = c_new(CUMO_REAL(*p),CUMO_IMAG(*p));}"
     when /Float/
       "#{x} = m_from_real(*(#{dtype}*)(#{ptr}+#{pos}))"
     when /UInt64/

data/ext/cumo/narray/gen/spec.rb

@@ -108,8 +108,8 @@ def_method "store" do
   store_numeric
   store_from "Bit"
   if is_complex
-    store_from "DComplex","dcomplex","m_from_dcomplex"
-    store_from "SComplex","scomplex","m_from_scomplex"
+    store_from "DComplex","cumo_dcomplex","m_from_dcomplex"
+    store_from "SComplex","cumo_scomplex","m_from_scomplex"
   end
   store_from "DFloat","double",   "m_from_real"
   store_from "SFloat","float",    "m_from_real"

data/ext/cumo/narray/gen/tmpl/accum.c

@@ -5,12 +5,12 @@
 //<% unless indexer_ops.include?(name) %>
 void cumo_<%=type_name%>_<%=name%><%=nan%>_kernel_launch(size_t n, char *p1, ssize_t s1, char *p2);
 <% else %>
-void cumo_<%=type_name%>_<%=name%><%=nan%>_kernel_launch(na_reduction_arg_t* arg);
+void cumo_<%=type_name%>_<%=name%><%=nan%>_kernel_launch(cumo_na_reduction_arg_t* arg);
 <% end %>
 <% end %>
 
 static void
-<%=c_iter%><%=nan%>(na_loop_t *const lp)
+<%=c_iter%><%=nan%>(cumo_na_loop_t *const lp)
 {
     <% if type_name == 'robject' || name == 'kahan_sum' || nan == '_nan' %>
     {
@@ -18,11 +18,11 @@ static void
         char    *p1, *p2;
         ssize_t  s1;
 
-        INIT_COUNTER(lp, n);
-        INIT_PTR(lp, 0, p1, s1);
+        CUMO_INIT_COUNTER(lp, n);
+        CUMO_INIT_PTR(lp, 0, p1, s1);
         p2 = lp->args[1].ptr + lp->args[1].iter[0].pos;
 
-        SHOW_SYNCHRONIZE_FIXME_WARNING_ONCE("<%=name%><%=nan%>", "<%=type_name%>");
+        CUMO_SHOW_SYNCHRONIZE_FIXME_WARNING_ONCE("<%=name%><%=nan%>", "<%=type_name%>");
         *(<%=dtype%>*)p2 = f_<%=name%><%=nan%>(n,p1,s1);
     }
     //<% elsif !indexer_ops.include?(name) %>
@@ -31,8 +31,8 @@ static void
         char    *p1, *p2;
         ssize_t  s1;
 
-        INIT_COUNTER(lp, n);
-        INIT_PTR(lp, 0, p1, s1);
+        CUMO_INIT_COUNTER(lp, n);
+        CUMO_INIT_PTR(lp, 0, p1, s1);
         p2 = lp->args[1].ptr + lp->args[1].iter[0].pos;
 
         cumo_<%=type_name%>_<%=name%><%=nan%>_kernel_launch(n,p1,s1,p2);
@@ -41,7 +41,7 @@ static void
     {
         // TODO(sonots): How to compute Kahan summation algorithm in parallel?
         // TODO(sonots): Implement nan CUDA version
-        na_reduction_arg_t arg = na_make_reduction_arg(lp);
+        cumo_na_reduction_arg_t arg = cumo_na_make_reduction_arg(lp);
         cumo_<%=type_name%>_<%=name%><%=nan%>_kernel_launch(&arg);
     }
     <% end %>
@@ -64,20 +64,20 @@ static VALUE
 <%=c_func(-1)%>(int argc, VALUE *argv, VALUE self)
 {
     VALUE v, reduce;
-    ndfunc_arg_in_t ain[2] = {{cT,0},{sym_reduce,0}};
-    ndfunc_arg_out_t aout[1] = {{<%=result_class%>,0}};
+    cumo_ndfunc_arg_in_t ain[2] = {{cT,0},{cumo_sym_reduce,0}};
+    cumo_ndfunc_arg_out_t aout[1] = {{<%=result_class%>,0}};
     //<% if type_name == 'robject' || !indexer_ops.include?(name) %>
-    ndfunc_t ndf = { <%=c_iter%>, STRIDE_LOOP_NIP|NDF_FLAT_REDUCE, 2, 1, ain, aout };
+    cumo_ndfunc_t ndf = { <%=c_iter%>, CUMO_STRIDE_LOOP_NIP|CUMO_NDF_FLAT_REDUCE, 2, 1, ain, aout };
     <% else %>
-    ndfunc_t ndf = { <%=c_iter%>, STRIDE_LOOP_NIP|NDF_FLAT_REDUCE|NDF_INDEXER_LOOP, 2, 1, ain, aout };
+    cumo_ndfunc_t ndf = { <%=c_iter%>, CUMO_STRIDE_LOOP_NIP|CUMO_NDF_FLAT_REDUCE|CUMO_NDF_INDEXER_LOOP, 2, 1, ain, aout };
     <% end %>
 
   <% if is_float %>
-    reduce = na_reduce_dimension(argc, argv, 1, &self, &ndf, <%=c_iter%>_nan);
+    reduce = cumo_na_reduce_dimension(argc, argv, 1, &self, &ndf, <%=c_iter%>_nan);
   <% else %>
-    reduce = na_reduce_dimension(argc, argv, 1, &self, &ndf, 0);
+    reduce = cumo_na_reduce_dimension(argc, argv, 1, &self, &ndf, 0);
   <% end %>
-    v =  na_ndloop(&ndf, 2, self, reduce);
+    v =  cumo_na_ndloop(&ndf, 2, self, reduce);
   <% if result_class == "cT" %>
     return <%=type_name%>_extract(v);
   <% else %>

data/ext/cumo/narray/gen/tmpl/accum_binary.c

@@ -6,41 +6,41 @@ void <%="cumo_#{type_name}_#{name}#{nan}_kernel_launch"%>(char *p1, char *p2, ch
 <% end %>
 
 static void
-<%=c_iter%><%=nan%>(na_loop_t *const lp)
+<%=c_iter%><%=nan%>(cumo_na_loop_t *const lp)
 {
     size_t   n;
     char    *p1, *p2, *p3;
     ssize_t  s1, s2, s3;
 
-    INIT_COUNTER(lp, n);
-    INIT_PTR(lp, 0, p1, s1);
-    INIT_PTR(lp, 1, p2, s2);
-    INIT_PTR(lp, 2, p3, s3);
+    CUMO_INIT_COUNTER(lp, n);
+    CUMO_INIT_PTR(lp, 0, p1, s1);
+    CUMO_INIT_PTR(lp, 1, p2, s2);
+    CUMO_INIT_PTR(lp, 2, p3, s3);
 
     <% if type_name == 'robject' %>
     {
         size_t i;
-        SHOW_SYNCHRONIZE_FIXME_WARNING_ONCE("<%=name%><%=nan%>", "<%=type_name%>");
+        CUMO_SHOW_SYNCHRONIZE_FIXME_WARNING_ONCE("<%=name%><%=nan%>", "<%=type_name%>");
         if (s3==0) {
             dtype z;
             // Reduce loop
-            GET_DATA(p3,dtype,z);
+            CUMO_GET_DATA(p3,dtype,z);
             for (i=0; i<n; i++) {
                 dtype x, y;
-                GET_DATA_STRIDE(p1,s1,dtype,x);
-                GET_DATA_STRIDE(p2,s2,dtype,y);
+                CUMO_GET_DATA_STRIDE(p1,s1,dtype,x);
+                CUMO_GET_DATA_STRIDE(p2,s2,dtype,y);
                 m_<%=name%><%=nan%>(x,y,z);
             }
-            SET_DATA(p3,dtype,z);
+            CUMO_SET_DATA(p3,dtype,z);
             return;
         } else {
             for (i=0; i<n; i++) {
                 dtype x, y, z;
-                GET_DATA_STRIDE(p1,s1,dtype,x);
-                GET_DATA_STRIDE(p2,s2,dtype,y);
-                GET_DATA(p3,dtype,z);
+                CUMO_GET_DATA_STRIDE(p1,s1,dtype,x);
+                CUMO_GET_DATA_STRIDE(p2,s2,dtype,y);
+                CUMO_GET_DATA(p3,dtype,z);
                 m_<%=name%><%=nan%>(x,y,z);
-                SET_DATA_STRIDE(p3,s3,dtype,z);
+                CUMO_SET_DATA_STRIDE(p3,s3,dtype,z);
             }
         }
     }
@@ -62,9 +62,9 @@ static VALUE
 {
     VALUE v, reduce;
     VALUE naryv[2];
-    ndfunc_arg_in_t ain[4] = {{cT,0},{cT,0},{sym_reduce,0},{sym_init,0}};
-    ndfunc_arg_out_t aout[1] = {{cT,0}};
-    ndfunc_t ndf = { <%=c_iter%>, STRIDE_LOOP_NIP, 4, 1, ain, aout };
+    cumo_ndfunc_arg_in_t ain[4] = {{cT,0},{cT,0},{cumo_sym_reduce,0},{cumo_sym_init,0}};
+    cumo_ndfunc_arg_out_t aout[1] = {{cT,0}};
+    cumo_ndfunc_t ndf = { <%=c_iter%>, CUMO_STRIDE_LOOP_NIP, 4, 1, ain, aout };
 
     if (argc < 1) {
         rb_raise(rb_eArgError,"wrong number of arguments (%d for >=1)",argc);
@@ -73,12 +73,12 @@ static VALUE
     naryv[0] = self;
     naryv[1] = argv[0];
     //<% if is_float %>
-    reduce = na_reduce_dimension(argc-1, argv+1, 2, naryv, &ndf, <%=c_iter%>_nan);
+    reduce = cumo_na_reduce_dimension(argc-1, argv+1, 2, naryv, &ndf, <%=c_iter%>_nan);
     //<% else %>
-    reduce = na_reduce_dimension(argc-1, argv+1, 2, naryv, &ndf, 0);
+    reduce = cumo_na_reduce_dimension(argc-1, argv+1, 2, naryv, &ndf, 0);
     //<% end %>
 
-    v =  na_ndloop(&ndf, 4, self, argv[0], reduce, m_<%=name%>_init);
+    v =  cumo_na_ndloop(&ndf, 4, self, argv[0], reduce, m_<%=name%>_init);
     return <%=type_name%>_extract(v);
 }
 
@@ -110,11 +110,11 @@ static VALUE
     //<% if is_object %>
     return <%=c_func%>_self(argc, argv, self);
     //<% else %>
-    klass = na_upcast(CLASS_OF(self),CLASS_OF(argv[0]));
+    klass = cumo_na_upcast(rb_obj_class(self),rb_obj_class(argv[0]));
     if (klass==cT) {
         return <%=c_func%>_self(argc, argv, self);
     } else {
-        v = rb_funcall(klass, id_cast, 1, self);
+        v = rb_funcall(klass, cumo_id_cast, 1, self);
         return rb_funcall2(v, rb_intern("<%=name%>"), argc, argv);
     }
     //<% end %>