cumo 0.2.5 → 0.3.0.pre1

data/ext/cumo/narray/narray.c

@@ -769,6 +769,29 @@ cumo_na_get_offset(VALUE self)
     return 0;
 }
 
+char*
+cumo_na_get_offset_pointer(VALUE a)
+{
+    return cumo_na_get_pointer(a) + cumo_na_get_offset(a);
+}
+
+char*
+cumo_na_get_offset_pointer_for_write(VALUE a)
+{
+    return cumo_na_get_pointer_for_write(a) + cumo_na_get_offset(a);
+}
+
+char*
+cumo_na_get_offset_pointer_for_read(VALUE a)
+{
+    return cumo_na_get_pointer_for_read(a) + cumo_na_get_offset(a);
+}
+
+char*
+cumo_na_get_offset_pointer_for_read_write(VALUE a)
+{
+    return cumo_na_get_pointer_for_read_write(a) + cumo_na_get_offset(a);
+}
 
 void
 cumo_na_index_arg_to_internal_order(int argc, VALUE *argv, VALUE self)
@@ -866,6 +889,12 @@ cumo_na_check_contiguous(VALUE self)
     return Qfalse;
 }
 
+VALUE
+cumo_na_as_contiguous_array(VALUE a)
+{
+    return cumo_na_check_contiguous(a) == Qtrue ? a : rb_funcall(a, rb_intern("dup"), 0);
+}
+
 //----------------------------------------------------------------------
 
 /*

data/lib/cumo/cuda.rb

@@ -9,3 +9,4 @@ require_relative 'cuda/device'
 require_relative 'cuda/module'
 require_relative 'cuda/link_state'
 require_relative 'cuda/nvrtc_program'
+require_relative 'cuda/cudnn'

data/lib/cumo/cuda/cudnn.rb

@@ -0,0 +1,88 @@
+require 'cumo'
+
+module Cumo
+  [SFloat, DFloat].each do |klass|
+    klass.class_eval do
+      alias_method :conv_backward_data, :conv_transpose
+      alias_method :conv_backward_filter, :conv_grad_w
+
+      def max_pool(*args, **kwargs)
+        self.pooling_forward(Cumo::CUDA::CUDNN::CUDNN_POOLING_MAX, *args, **kwargs)
+      end
+
+      def max_pool_backward(*args, **kwargs)
+        self.pooling_backward(Cumo::CUDA::CUDNN::CUDNN_POOLING_MAX, *args, **kwargs)
+      end
+
+      def avg_pool(*args, **kwargs)
+        pad_value = kwargs.delete(:pad_value)
+        if pad_value == 0
+          mode = Cumo::CUDA::CUDNN::CUDNN_POOLING_AVERAGE_COUNT_INCLUDE_PADDING
+        elsif pad_value.nil?
+          mode = Cumo::CUDA::CUDNN::CUDNN_POOLING_AVERAGE_COUNT_EXCLUDE_PADDING
+        else
+          raise "pad_value: #{pad_value} is not supported"
+        end
+        self.pooling_forward(mode, *args, **kwargs)
+      end
+
+      def avg_pool_backward(*args, **kwargs)
+        pad_value = kwargs.delete(:pad_value)
+        if pad_value == 0
+          mode = Cumo::CUDA::CUDNN::CUDNN_POOLING_AVERAGE_COUNT_INCLUDE_PADDING
+        elsif pad_value.nil?
+          mode = Cumo::CUDA::CUDNN::CUDNN_POOLING_AVERAGE_COUNT_EXCLUDE_PADDING
+        else
+          raise "pad_value: #{pad_value} is not supported"
+        end
+        self.pooling_backward(mode, *args, **kwargs)
+      end
+    end
+  end
+end
+
+module Cumo
+  module CUDA
+    module CUDNN
+      class << self
+        def conv(a, *args, **kwargs)
+          a.conv(*args, **kwargs)
+        end
+
+        def conv_transpose(a, *args, **kwargs)
+          a.conv_transpose(*args, **kwargs)
+        end
+        alias_method :conv_backward_data, :conv_transpose
+
+        def conv_grad_w(a, *args, **kwargs)
+          a.conv_grad_w(*args, **kwargs)
+        end
+        alias_method :conv_backward_filter, :conv_grad_w
+
+        def batch_norm(a, *args, **kwargs)
+          a.batch_norm(*args, **kwargs)
+        end
+
+        def batch_norm_backward(a, *args, **kwargs)
+          a.batch_norm_backward(*args, **kwargs)
+        end
+
+        def max_pool(a, *args, **kwargs)
+          a.max_pool(*args, **kwargs)
+        end
+
+        def max_pool_backward(a, *args, **kwargs)
+          a.max_pool_backward(*args, **kwargs)
+        end
+
+        def avg_pool(a, *args, **kwargs)
+          a.avg_pool(*args, **kwargs)
+        end
+
+        def avg_pool_backward(a, *args, **kwargs)
+          a.avg_pool_backward(*args, **kwargs)
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cumo
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.0.pre1
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-04 00:00:00.000000000 Z
+date: 2019-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: numo-narray
@@ -90,6 +90,8 @@ files:
 - cumo.gemspec
 - docs/src-tree.md
 - ext/cumo/cuda/cublas.c
+- ext/cumo/cuda/cudnn.c
+- ext/cumo/cuda/cudnn_impl.cpp
 - ext/cumo/cuda/driver.c
 - ext/cumo/cuda/memory_pool.cpp
 - ext/cumo/cuda/memory_pool_impl.cpp
@@ -103,12 +105,14 @@ files:
 - ext/cumo/include/cumo.h
 - ext/cumo/include/cumo/compat.h
 - ext/cumo/include/cumo/cuda/cublas.h
+- ext/cumo/include/cumo/cuda/cudnn.h
 - ext/cumo/include/cumo/cuda/cumo_thrust.hpp
 - ext/cumo/include/cumo/cuda/cumo_thrust_complex.hpp
 - ext/cumo/include/cumo/cuda/driver.h
 - ext/cumo/include/cumo/cuda/memory_pool.h
 - ext/cumo/include/cumo/cuda/nvrtc.h
 - ext/cumo/include/cumo/cuda/runtime.h
+- ext/cumo/include/cumo/hash_combine.hpp
 - ext/cumo/include/cumo/indexer.h
 - ext/cumo/include/cumo/intern.h
 - ext/cumo/include/cumo/intern_kernel.h
@@ -202,6 +206,8 @@ files:
 - ext/cumo/narray/gen/tmpl/aref.c
 - ext/cumo/narray/gen/tmpl/aref_cpu.c
 - ext/cumo/narray/gen/tmpl/aset.c
+- ext/cumo/narray/gen/tmpl/batch_norm.c
+- ext/cumo/narray/gen/tmpl/batch_norm_backward.c
 - ext/cumo/narray/gen/tmpl/binary.c
 - ext/cumo/narray/gen/tmpl/binary2.c
 - ext/cumo/narray/gen/tmpl/binary2_kernel.cu
@@ -219,6 +225,9 @@ files:
 - ext/cumo/narray/gen/tmpl/cond_binary.c
 - ext/cumo/narray/gen/tmpl/cond_binary_kernel.cu
 - ext/cumo/narray/gen/tmpl/cond_unary.c
+- ext/cumo/narray/gen/tmpl/conv.c
+- ext/cumo/narray/gen/tmpl/conv_grad_w.c
+- ext/cumo/narray/gen/tmpl/conv_transpose.c
 - ext/cumo/narray/gen/tmpl/cum.c
 - ext/cumo/narray/gen/tmpl/each.c
 - ext/cumo/narray/gen/tmpl/each_with_index.c
@@ -251,6 +260,8 @@ files:
 - ext/cumo/narray/gen/tmpl/new_dim0.c
 - ext/cumo/narray/gen/tmpl/new_dim0_kernel.cu
 - ext/cumo/narray/gen/tmpl/poly.c
+- ext/cumo/narray/gen/tmpl/pooling_backward.c
+- ext/cumo/narray/gen/tmpl/pooling_forward.c
 - ext/cumo/narray/gen/tmpl/pow.c
 - ext/cumo/narray/gen/tmpl/pow_kernel.cu
 - ext/cumo/narray/gen/tmpl/powint.c
@@ -319,6 +330,7 @@ files:
 - lib/cumo/cuda.rb
 - lib/cumo/cuda/compile_error.rb
 - lib/cumo/cuda/compiler.rb
+- lib/cumo/cuda/cudnn.rb
 - lib/cumo/cuda/device.rb
 - lib/cumo/cuda/link_state.rb
 - lib/cumo/cuda/module.rb
@@ -343,11 +355,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.1
+rubyforge_project: 
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Cumo is CUDA aware numerical library whose interface is highly compatible