cumo 0.1.0 → 0.1.1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cumo
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-30 00:00:00.000000000 Z
+date: 2018-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: numo-narray
@@ -63,6 +63,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- 3rd_party/LICENSE.txt
 - 3rd_party/mkmf-cu/.gitignore
 - 3rd_party/mkmf-cu/Gemfile
 - 3rd_party/mkmf-cu/LICENSE
@@ -86,6 +87,7 @@ files:
 - bin/console
 - bin/setup
 - cumo.gemspec
+- docs/src-tree.md
 - ext/cumo/cuda/cublas.c
 - ext/cumo/cuda/driver.c
 - ext/cumo/cuda/memory_pool.cpp
@@ -108,7 +110,6 @@ files:
 - ext/cumo/include/cumo/cuda/runtime.h
 - ext/cumo/include/cumo/indexer.h
 - ext/cumo/include/cumo/intern.h
-- ext/cumo/include/cumo/intern_fwd.h
 - ext/cumo/include/cumo/intern_kernel.h
 - ext/cumo/include/cumo/narray.h
 - ext/cumo/include/cumo/narray_kernel.h
@@ -184,6 +185,7 @@ files:
 - ext/cumo/narray/gen/def/uint32.rb
 - ext/cumo/narray/gen/def/uint64.rb
 - ext/cumo/narray/gen/def/uint8.rb
+- ext/cumo/narray/gen/erbln.rb
 - ext/cumo/narray/gen/erbpp2.rb
 - ext/cumo/narray/gen/narray_def.rb
 - ext/cumo/narray/gen/spec.rb
@@ -320,9 +322,6 @@ files:
 - lib/cumo/linalg.rb
 - lib/cumo/narray.rb
 - lib/cumo/narray/extra.rb
-- lib/erbpp.rb
-- lib/erbpp/line_number.rb
-- lib/erbpp/narray_def.rb
 - numo-narray-version
 - run.gdb
 homepage: https://github.com/sonots/cumo
@@ -345,7 +344,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Cumo is CUDA aware numerical library whose interface is highly compatible

data/ext/cumo/include/cumo/intern_fwd.h

@@ -1,38 +0,0 @@
-#ifndef CUMO_INTERN_NARRAY_H
-#define CUMO_INTERN_NARRAY_H
-
-/* Add cumo_ prefix to avoid C symbol collisions with Numo without modifying C implementations */
-
-#define na_debug_flag cumo_na_debug_flag
-extern int cumo_na_debug_flag;
-
-#define mCumo rb_mCumo
-extern VALUE rb_mCumo;
-#define cNArray cumo_cNArray
-extern VALUE cumo_cNArray;
-#define nary_eCastError cumo_nary_eCastError
-extern VALUE cumo_nary_eCastError;
-#define nary_eShapeError cumo_nary_eShapeError
-extern VALUE cumo_nary_eShapeError;
-#define nary_eOperationError cumo_nary_eOperationError
-extern VALUE cumo_nary_eOperationError;
-#define nary_eDimensionError cumo_nary_eDimensionError
-extern VALUE cumo_nary_eDimensionError;
-#define nary_eValueError cumo_nary_eValueError
-extern VALUE cumo_nary_eValueError;
-#define na_data_type cumo_na_data_type
-extern const rb_data_type_t cumo_na_data_type;
-
-#define na_cStep cumo_na_cStep
-extern VALUE cumo_na_cStep;
-
-#define sym_reduce cumo_sym_reduce
-extern VALUE cumo_sym_reduce;
-#define sym_option cumo_sym_option
-extern VALUE cumo_sym_option;
-#define sym_loop_opt cumo_sym_loop_opt
-extern VALUE cumo_sym_loop_opt;
-#define sym_init cumo_sym_init
-extern VALUE cumo_sym_init;
-
-#endif /* CUMO_INTERN_NARRAY_H */

data/lib/erbpp.rb

@@ -1,294 +0,0 @@
-require "erb"
-
-class ErbPP
-  ATTRS = []
-
-  class ParamNotSetError < StandardError; end
-
-  def self.define_attrs(attrs)
-    attrs.each do |attr|
-      ivar = ("@"+attr).to_sym
-      define_method(attr){|*a| attr_method(ivar,*a)}
-    end
-  end
-
-  def attr_method(ivar,arg=nil)
-    if arg.nil?
-      instance_variable_get(ivar)
-    else
-      instance_variable_set(ivar,arg)
-    end
-  end
-
-  def initialize(parent,erb_path,opts={})
-    parents.push(parent) if parent
-    @erb_path = erb_path
-    @tmpl = @erb_path
-
-    @opts = opts
-    if @opts.class != Hash
-      raise ArgumentError, "option is not Hash"
-    end
-
-    @opts.each do |k,v|
-      ivar = ("@"+k.to_s).to_sym
-      instance_variable_set(ivar,v)
-    end
-  end
-
-  def load_erb
-    safe_level = nil
-    trim_mode = '%<>'
-    @erb = ERB.new(File.read(@erb_path),safe_level,trim_mode)
-    @erb.filename = @erb_path
-  end
-
-  def parents
-    @parents ||= []
-  end
-
-  def search_method_in_parents(_meth_id)
-    parents.each do |x|
-      if x.has_attr? _meth_id
-        return x
-      end
-    end
-    parents.each do |x|
-      if f = x.search_method_in_parents(_meth_id)
-        return f
-      end
-    end
-    nil
-  end
-
-  def attrs
-    self.class::ATTRS
-  end
-
-  def has_attr?(_meth_id)
-    respond_to?(_meth_id) or attrs.include?(_meth_id.to_s)
-  end
-
-  def check_params(*params)
-    params.each do |x|
-      val = send(x)
-      if !val # || val.empty?
-        raise ParamNotSetError,"parameter #{x.to_s} is not set"
-      end
-    end
-  end
-
-  alias method_missing_alias method_missing
-
-  def method_missing(_meth_id, *args, &block)
-    ivar = "@"+_meth_id.to_s
-    if args.empty? and instance_variable_defined?(ivar)
-      parm = instance_variable_get(ivar)
-      if parm.nil?
-        raise ParamNotSetError,"parameter #{_meth_id.to_s} is not set"
-      end
-      parm
-    elsif args.size == 1 and attrs.include?(_meth_id.to_s)
-      instance_variable_set(ivar,args.first)
-    elsif x = search_method_in_parents(_meth_id)
-      x.send(_meth_id, *args, &block)
-    else
-      method_missing_alias(_meth_id, *args)
-    end
-  end
-
-  def run
-    load_erb unless @erb
-    @erb.run(binding)
-  end
-
-  def result
-    load_erb unless @erb
-    @erb.result(binding)
-  end
-end
-
-# ----------------------------------------------------------------------
-
-class IdVar
-  DEFS = []
-
-  def id_decl
-    "static ID #{@id_var};"
-  end
-
-  def id_assign
-    "#{@id_var} = rb_intern(\"#{@name}\");"
-  end
-
-  def initialize(parent,name,var=nil)
-    @name = name
-    var = name if var.nil?
-    @id_var = "id_"+var.gsub(/\?/,"_p").gsub(/\!/,"_bang")
-    DEFS.push(self)
-  end
-
-  def self.declaration
-    DEFS.map do |x|
-      x.id_decl
-    end
-  end
-
-  def self.assignment
-    DEFS.map do |x|
-      x.id_assign
-    end
-  end
-end
-
-# ----------------------------------------------------------------------
-
-class Function < ErbPP
-  DEFS = []
-
-  attrs = %w[
-    singleton
-    meth
-    n_arg
-  ]
-  define_attrs attrs
-
-  def id_op
-    if op.size == 1
-      "'#{op}'"
-    else
-      "id_#{method}"
-    end
-  end
-
-  def method
-    meth.gsub(/\?/,"_p").gsub(/\!/,"_bang")
-  end
-
-  def initialize(parent,tmpl,**opts)
-    super
-    @aliases = opts[:aliases] || []
-    parent.tmpl_dirs.each do |d|
-      @erb_path = File.join(d, tmpl+".c")
-      break if File.exist?(@erb_path)
-    end
-    DEFS.push(self)
-  end
-
-  def c_method
-    "#{m_prefix}#{method}"
-  end
-
-  def c_iter
-    begin
-      t = "_"+type_name
-    rescue
-      t = ""
-    end
-    "iter#{t}_#{method}"
-  end
-  alias c_iterator c_iter
-
-  def c_func
-    s = singleton ? "_s" : ""
-    begin
-      t = "_"+type_name
-    rescue
-      t = ""
-    end
-    "cumo#{t}#{s}_#{method}"
-  end
-  alias c_function c_func
-  alias c_instance_method c_func
-
-  def op_map
-    @op || meth
-  end
-
-  def code
-    result + "\n\n"
-  end
-
-  def definition
-    return nil if n_arg <= -9
-    s = singleton ? "_singleton" : ""
-    check_params(:mod_var, :op_map, :c_func, :n_arg)
-    m = op_map
-    a = ["rb_define#{s}_method(#{mod_var}, \"#{m}\", #{c_func}, #{n_arg});"]
-    @aliases.map{|x| a << "rb_define_alias(#{mod_var}, \"#{x}\", \"#{m}\");"}
-    a
-  end
-
-  def self.codes
-    a = []
-    DEFS.each do |i|
-      x = i.code
-      a.push(x) if x
-    end
-    a
-  end
-
-  def self.definitions
-    a = []
-    DEFS.each do |i|
-      case x = i.definition
-      when Array
-        a.concat(x)
-      when String
-        a.push(x)
-      else
-        raise "unknown definition: #{x}" if x
-      end
-    end
-    a
-  end
-end
-
-class ModuleFunction < Function
-  def definition
-    m = op_map
-    "rb_define_module_function(#{mod_var}, \"#{m}\", #{c_func}, #{n_arg});"
-  end
-end
-
-class NodefFunction < Function
-  def definition
-    nil
-  end
-end
-
-class Alias < ErbPP
-  def initialize(parent, dst, src)
-    super(parent,nil)
-    @dst = dst
-    @src = src
-    Function::DEFS.push(self)
-  end
-
-  def code
-    nil
-  end
-
-  def definition
-    "rb_define_alias(#{mod_var}, \"#{dst}\", \"#{src}\");"
-  end
-end
-
-class Const < ErbPP
-  def initialize(parent,name,value,desc)
-    super(parent,nil)
-    @name = name
-    @value = value
-    @desc = desc
-    Function::DEFS.push(self)
-  end
-
-  def code
-    nil
-  end
-
-  def definition
-    "/*"+desc+"*/\n    "+
-      "rb_define_const(#{mod_var},\"#{name}\",#{value});"
-  end
-end

data/lib/erbpp/line_number.rb

@@ -1,137 +0,0 @@
-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
-    concat(@buf)
-  end
-
-end
-
-class ERB
-  alias result_orig result
-
-  def result(b=new_toplevel)
-    src = src_with_cpp_line
-    if @safe_level
-      proc {
-        $SAFE = @safe_level
-        eval(src, b, (@filename || '(erb)'), 0)
-      }.call
-    else
-      #open("tmpout","w"){|f| f.write src} if /dtype/=~@filename
-      eval(src, b, (@filename || '(erb)'), 0)
-    end
-  end
-
-  alias src_orig src
-
-  def src
-    src_with_cpp_line
-  end
-
-  def src_with_cpp_line
-    @src.each_line.with_index.map do |line, num|
-      # ruby ver 2.4 or earlier
-      line.gsub!(/_erbout.concat "/,'_erbout.concat0 "')
-      line.gsub!(/_erbout.concat\(/,'_erbout.concat1(')
-      # ruby ver 2.5
-      line.gsub!(/_erbout\.<<\(-/,'_erbout.concat0(-')
-      line.gsub!(/_erbout\.<<\(\(/, '_erbout.concat1((')
-      if num==0
-        # skip
-      elsif num==1
-        f = @filename.dump
-        line.sub!(/_erbout = (\+?''|String\.new);/, "_erbout = CountLnString.new(#{f});")
-      elsif /^; _erbout\.force_encoding/ =~ line
-        line.sub!(/^;/,";_erbout.ln(#{num});")
-      end
-      line
-    end.join+";_erbout.final;"
-  end
-
-end