cumo 0.4.3 → 0.5.0

data/ext/cumo/narray/struct.c

@@ -812,7 +812,7 @@ nst_s_add_type(int argc, VALUE *argv, VALUE mod)
 
 #define NST_TYPEDEF(tpname,tpclass)                 \
 static VALUE                                        \
-nst_s_##tpname(VALUE argc, VALUE *argv, VALUE mod)  \
+nst_s_##tpname(int argc, VALUE *argv, VALUE mod)  \
 {   nstruct_add_type(tpclass,argc,argv,mod);        \
     return Qnil;                                    \
 }

data/lib/cumo/cuda/compile_error.rb

@@ -1,4 +1,4 @@
-require_relative '../cuda'
+# frozen_string_literal: true
 
 module Cumo::CUDA
   class CompileError < StandardError

data/lib/cumo/cuda/compiler.rb

@@ -1,32 +1,33 @@
+# frozen_string_literal: true
+
 require 'tmpdir'
 require 'tempfile'
 require 'fileutils'
 require 'digest/md5'
-require_relative '../cuda'
 
 module Cumo::CUDA
   class Compiler
     VALID_KERNEL_NAME = /\A[a-zA-Z_][a-zA-Z_0-9]*\z/
     DEFAULT_CACHE_DIR = File.expand_path('~/.cumo/kernel_cache')
-  
+
     @@empty_file_preprocess_cache ||= {}
-    
+
     def self.valid_kernel_name?(name)
       VALID_KERNEL_NAME.match?(name)
     end
-  
+
     def compile_using_nvrtc(source, options: [], arch: nil)
       arch ||= get_arch
       options += ["-arch=#{arch}"]
-    
+
       Dir.mktmpdir do |root_dir|
         path = File.join(root_dir, 'kern')
         cu_path = "#{path}.cu"
-    
+
         File.open(cu_path, 'w') do |cu_file|
           cu_file.write(source)
         end
-   
+
         prog = NVRTCProgram.new(source, name: cu_path)
         begin
           ptx = prog.compile(options: options)
@@ -41,12 +42,12 @@ module Cumo::CUDA
         return ptx
       end
     end
-    
+
     def compile_with_cache(source, options: [], arch: nil, cache_dir: nil, extra_source: nil)
       # NVRTC does not use extra_source. extra_source is used for cache key.
       cache_dir ||= get_cache_dir
       arch ||= get_arch
-    
+
       options += ['-ftz=true']
 
       env = [arch, options, get_nvrtc_version]
@@ -57,15 +58,15 @@ module Cumo::CUDA
         @@empty_file_preprocess_cache[env] = base
       end
       key_src = "#{env} #{base} #{source} #{extra_source}"
-    
+
       key_src.encode!('utf-8')
       digest = Digest::MD5.hexdigest(key_src)
       name = "#{digest}_2.cubin"
-    
+
       unless Dir.exist?(cache_dir)
         FileUtils.mkdir_p(cache_dir)
       end
-   
+
       # TODO(sonots): thread-safe?
       path = File.join(cache_dir, name)
       cubin = load_cache(path)
@@ -74,7 +75,7 @@ module Cumo::CUDA
         mod.load(cubin)
         return mod
       end
-    
+
       ptx = compile_using_nvrtc(source, options: options, arch: arch)
       cubin = nil
       cubin_hash = nil
@@ -85,7 +86,7 @@ module Cumo::CUDA
       end
 
       save_cache(path, cubin_hash, cubin)
-    
+
       # Save .cu source file along with .cubin
       if get_bool_env_variable('CUMO_CACHE_SAVE_CUDA_SOURCE', false)
         File.open("#{path}.cu", 'w') do |f|
@@ -97,7 +98,7 @@ module Cumo::CUDA
       mod.load(cubin)
       return mod
     end
-  
+
     private
 
     def save_cache(path, cubin_hash, cubin)
@@ -105,7 +106,7 @@ module Cumo::CUDA
       tf.write(cubin_hash)
       tf.write(cubin)
       temp_path = tf.path
-      File.rename(temp_path, path)
+      FileUtils.mv(temp_path, path)
     end
 
     def load_cache(path)
@@ -121,29 +122,29 @@ module Cumo::CUDA
       end
       nil
     end
-  
+
     def get_cache_dir
       ENV.fetch('CUMO_CACHE_DIR', DEFAULT_CACHE_DIR)
     end
-  
+
     def get_nvrtc_version
       @@nvrtc_version ||= NVRTC.nvrtcVersion
     end
-    
+
     def get_arch
       cc = Device.new.compute_capability
       "compute_#{cc}"
     end
-    
+
     def get_bool_env_variable(name, default)
       val = ENV[name]
       return default if val.nil? or val.size == 0
       Integer(val) == 1 rescue false
     end
-  
+
     def preprocess(source, options, arch)
       options += ["-arch=#{arch}"]
-    
+
       prog = NVRTCProgram.new(source, name: '')
       begin
         result = prog.compile(options: options)

data/lib/cumo/cuda/cudnn.rb

@@ -1,4 +1,4 @@
-require 'cumo'
+# frozen_string_literal: true
 
 module Cumo
   [SFloat, DFloat].each do |klass|

data/lib/cumo/cuda/device.rb

@@ -1,4 +1,4 @@
-require_relative '../cuda'
+# frozen_string_literal: true
 
 module Cumo::CUDA
   class Device

data/lib/cumo/cuda/link_state.rb

@@ -1,4 +1,4 @@
-require_relative '../cuda'
+# frozen_string_literal: true
 
 module Cumo::CUDA
   # CUDA link state.
@@ -25,7 +25,7 @@ module Cumo::CUDA
     end
 
     def complete
-      cubin = Driver.cuLinkComplete(@ptr)
+      Driver.cuLinkComplete(@ptr)
     end
   end
 end

data/lib/cumo/cuda/module.rb

@@ -1,4 +1,4 @@
-require_relative '../cuda'
+# frozen_string_literal: true
 
 module Cumo::CUDA
   # CUDA kernel module.
@@ -37,4 +37,3 @@ module Cumo::CUDA
     end
   end
 end
-

data/lib/cumo/cuda/nvrtc_program.rb

@@ -1,4 +1,5 @@
-require_relative '../cuda'
+# frozen_string_literal: true
+
 require_relative 'compile_error'
 
 module Cumo::CUDA
@@ -18,7 +19,7 @@ module Cumo::CUDA
       begin
         NVRTC.nvrtcCompileProgram(@ptr, options)
         return NVRTC.nvrtcGetPTX(@ptr)
-      rescue NVRTCError => e
+      rescue NVRTCError
         log = NVRTC.nvrtcGetProgramLog(@ptr)
         raise CompileError.new(log, @src, @name, options)
       end

data/lib/cumo/cuda.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Cumo
   module CUDA
   end

data/lib/cumo/linalg.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cumo'
 
 # Provide compatibility layers with numo/linalg