numo-narray 0.9.1.0 → 0.9.1.1

data/ext/numo/narray/numo/narray.h

@@ -13,8 +13,8 @@ extern "C" {
 #endif
 #endif
 
-#define NARRAY_VERSION "0.9.1.0"
-#define NARRAY_VERSION_CODE 910
+#define NARRAY_VERSION "0.9.1.1"
+#define NARRAY_VERSION_CODE 911
 
 #include <math.h>
 #include "numo/compat.h"

data/ext/numo/narray/numo/types/real_accum.h

@@ -439,3 +439,48 @@ static inline dtype f_ptp(size_t n, char *p, ssize_t stride)
     f_minmax(n,p,stride,&min,&max);
     return m_sub(max,min);
 }
+
+
+static inline dtype f_maximum(dtype x, dtype y)
+{
+    if (m_ge(x,y)) {
+        return x;
+    }
+    if (not_nan(y)) {
+        return y;
+    }
+    return x;
+}
+
+static inline dtype f_maximum_nan(dtype x, dtype y)
+{
+    if (m_ge(x,y)) {
+        return x;
+    }
+    if (!not_nan(x)) {
+        return x;
+    }
+    return y;
+}
+
+static inline dtype f_minimum(dtype x, dtype y)
+{
+    if (m_le(x,y)) {
+        return x;
+    }
+    if (not_nan(y)) {
+        return y;
+    }
+    return x;
+}
+
+static inline dtype f_minimum_nan(dtype x, dtype y)
+{
+    if (m_le(x,y)) {
+        return x;
+    }
+    if (!not_nan(x)) {
+        return x;
+    }
+    return y;
+}

data/ext/numo/narray/numo/types/xint_macro.h

@@ -171,3 +171,19 @@ static inline double f_seq(double x, double y, double c)
 {
     return x + y * c;
 }
+
+static inline dtype f_maximum(dtype x, dtype y)
+{
+    if (m_ge(x,y)) {
+        return x;
+    }
+    return y;
+}
+
+static inline dtype f_minimum(dtype x, dtype y)
+{
+    if (m_le(x,y)) {
+        return x;
+    }
+    return y;
+}

data/numo-narray.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["masa16.tanaka@gmail.com"]
   spec.description   = %q{Numo::NArray - New NArray class library in Ruby/Numo.}
   spec.summary       = %q{alpha release of Numo::NArray - New NArray class library in Ruby/Numo (NUmerical MOdule)}
-  spec.homepage      = "https://github.com/ruby-numo/narray"
+  spec.homepage      = "https://github.com/ruby-numo/numo-narray"
   spec.license       = "BSD-3-Clause"
   spec.required_ruby_version = '~> 2.1'
 
@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake", "~> 0"
-  spec.add_development_dependency "rspec", "~> 3"
+  spec.add_development_dependency "test-unit"
   spec.add_development_dependency 'rake-compiler', "~> 1.0", ">= 1.0.1"
   spec.add_development_dependency "rake-compiler-dock", "~> 0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: numo-narray
 version: !ruby/object:Gem::Version
-  version: 0.9.1.0
+  version: 0.9.1.1
 platform: ruby
 authors:
 - Masahiro TANAKA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-28 00:00:00.000000000 Z
+date: 2018-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
@@ -120,6 +120,7 @@ files:
 - ext/numo/narray/gen/def/uint32.rb
 - ext/numo/narray/gen/def/uint64.rb
 - ext/numo/narray/gen/def/uint8.rb
+- ext/numo/narray/gen/erbln.rb
 - ext/numo/narray/gen/erbpp2.rb
 - ext/numo/narray/gen/narray_def.rb
 - ext/numo/narray/gen/spec.rb
@@ -144,6 +145,7 @@ files:
 - ext/numo/narray/gen/tmpl/cum.c
 - ext/numo/narray/gen/tmpl/each.c
 - ext/numo/narray/gen/tmpl/each_with_index.c
+- ext/numo/narray/gen/tmpl/ewcomp.c
 - ext/numo/narray/gen/tmpl/extract.c
 - ext/numo/narray/gen/tmpl/extract_data.c
 - ext/numo/narray/gen/tmpl/eye.c
@@ -239,15 +241,10 @@ files:
 - ext/numo/narray/rand.c
 - ext/numo/narray/step.c
 - ext/numo/narray/struct.c
-- lib/erbpp.rb
-- lib/erbpp/line_number.rb
-- lib/erbpp/narray_def.rb
 - lib/numo/narray.rb
 - lib/numo/narray/extra.rb
 - numo-narray.gemspec
-- spec/bit_spec.rb
-- spec/narray_spec.rb
-homepage: https://github.com/ruby-numo/narray
+homepage: https://github.com/ruby-numo/numo-narray
 licenses:
 - BSD-3-Clause
 metadata: {}
@@ -272,6 +269,4 @@ signing_key:
 specification_version: 4
 summary: alpha release of Numo::NArray - New NArray class library in Ruby/Numo (NUmerical
   MOdule)
-test_files:
-- spec/bit_spec.rb
-- spec/narray_spec.rb
+test_files: []

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
-    "numo#{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