opencl_ruby_ffi 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: acb95c841675fa710d38152d404a4793e719377d
-  data.tar.gz: 7210478d7cd4d25bc2a5927933cdd1f7baf9d615
+  metadata.gz: 2aaf99112a7a7223edf3461b3e7c813d3c0c44b0
+  data.tar.gz: 7c5bb20e06c5152dcfacd31f1506f2d3205b0f21
 SHA512:
-  metadata.gz: 5d6a9321eb0a9ac0328be3d712226345b51e41ea49731171732134270bf638be47ed31dd3eb6bf3cb3643d2ae09ff62621bb5f5b27b1dfc9c2a122dcdca771c9
-  data.tar.gz: 60e325360ba6a96d9610803ef567354f77f735e99e7c30e25e51d4cc7031642551f3feea2f051c58b3b3b89474d0584c5a19e50052f01a2755bcc39ce4840391
+  metadata.gz: 63aa2044a7c9322484e92e6d72c7f41df687c8c8204a20ac26539dd017aff5c4dedbeb86edd170645f9cfdc0ec712de5461b0bbd125fbceb89cd3db2aacf02c8
+  data.tar.gz: 88633e9e8fd7d3c5d54a4d422cc2bcd3999631863cdca78054ceba5454a45246e88a7ad09cd71c67e560e0f08475323b60053baf886463844a96cdf1129ef246

data/.yardopts

@@ -1 +1 @@
--p templates_custom/ --no-private lib/opencl_ruby_ffi/opencl_ruby_ffi_base_gen.rb lib/opencl_ruby_ffi/opencl_ruby_ffi_base.rb lib/**/*.rb lib/opencl_ruby_ffi/opencl_ruby_ffi_base.rb lib/**/**/*.rb
+-p templates_custom/ --no-private lib/opencl_ruby_ffi/opencl_ruby_ffi_base_gen.rb lib/opencl_ruby_ffi/opencl_ruby_ffi_base.rb lib/**/*.rb lib/**/**/*.rb

data/lib/opencl_ruby_ffi.rb

@@ -17,7 +17,3 @@ require "opencl_ruby_ffi/Pipe.rb"
 require "opencl_ruby_ffi/SVM.rb"
 require "opencl_ruby_ffi/ext.rb"
 require "opencl_ruby_ffi/gl_ext.rb"
-
-require "narray_ffi"
-
-

data/lib/opencl_ruby_ffi/Image.rb

@@ -103,7 +103,7 @@ module OpenCL
     flags = get_flags( options )
     host_ptr = options[:host_ptr]
     error = MemoryPointer::new( :cl_int )
-    img_ptr = clCreateImage3D( context, fs, format, width, height, depth, row_pitch, slice_pitch, d, error )
+    img_ptr = clCreateImage3D( context, flags, format, width, height, depth, row_pitch, slice_pitch, host_ptr, error )
     error_check(error.read_cl_int)
     return Image::new(img_ptr, false)
   end

data/lib/opencl_ruby_ffi/Kernel.rb

@@ -93,6 +93,7 @@ module OpenCL
         end
 
       end
+
       # Sets this Arg to value. The size of value can be specified.
       def set(value, size = nil)
         if value.class == SVMPointer and @kernel.context.platform.version_number >= 2.0 then
@@ -222,19 +223,24 @@ module OpenCL
       OpenCL.set_kernel_arg(self, index, value, size)
     end
 
-    # Enqueues the Kernel in the given queue, specifying the global_work_size. Arguments for the kernel are specified afterwards. Last, a hash containing options for enqueu_ndrange kernel can be specified
+    # Set the arguments of the kernel, arguments can be a scalar or an [ arg, size ] duplet.
+    def set_args(*args)
+      num_args.times { |i|
+        OpenCL.set_kernel_arg(self, i, *[args[i]].flatten )
+      }
+    end
+
+    # Enqueues the Kernel in the given queue, specifying the global_work_size. Arguments for the kernel are specified afterwards, they can be scalar or [arg, size]. Last, a hash containing options for enqueu_ndrange kernel can be specified
     def enqueue_with_args(command_queue, global_work_size, *args)
-      n = self.num_args
+      n = num_args
       error_check(INVALID_KERNEL_ARGS) if args.length < n
       error_check(INVALID_KERNEL_ARGS) if args.length > n + 1
       if args.length == n + 1
-        options = args.last
+        options = args.pop
       else
         options = {}
       end
-      n.times { |i|
-        self.set_arg(i, args[i])
-      }
+      set_args(*args)
       command_queue.enqueue_ndrange_kernel(self, global_work_size, options)
     end
 

data/lib/opencl_ruby_ffi/Program.rb

@@ -164,7 +164,6 @@ module OpenCL
       strs = [strings].flatten
     end
     n_strs = strs.size
-    strs_lengths = MemoryPointer::new( :size_t, n_strs )
     c_strs = MemoryPointer::new( :pointer, n_strs )
 
     c_strs_p = []

data/lib/opencl_ruby_ffi/amd/device_attribute_query.rb

@@ -1,4 +1,3 @@
-require 'opencl_ruby_ffi'
 using OpenCLRefinements if RUBY_VERSION.scan(/\d+/).collect(&:to_i).first >= 2
 
 module OpenCL

data/lib/opencl_ruby_ffi/ext/device_fission.rb

@@ -1,4 +1,3 @@
-require 'opencl_ruby_ffi'
 using OpenCLRefinements if RUBY_VERSION.scan(/\d+/).collect(&:to_i).first >= 2
 
 module OpenCL

data/lib/opencl_ruby_ffi/khr/d3d10_sharing.rb

@@ -1,4 +1,3 @@
-require 'opencl_ruby_ffi'
 using OpenCLRefinements if RUBY_VERSION.scan(/\d+/).collect(&:to_i).first >= 2
 
 module OpenCL

data/lib/opencl_ruby_ffi/khr/d3d11_sharing.rb

@@ -1,4 +1,3 @@
-require 'opencl_ruby_ffi'
 using OpenCLRefinements if RUBY_VERSION.scan(/\d+/).collect(&:to_i).first >= 2
 
 module OpenCL

data/lib/opencl_ruby_ffi/khr/dx9_media_sharing.rb

@@ -1,4 +1,3 @@
-require 'opencl_ruby_ffi'
 using OpenCLRefinements if RUBY_VERSION.scan(/\d+/).collect(&:to_i).first >= 2
 
 module OpenCL

data/lib/opencl_ruby_ffi/khr/egl_event.rb

@@ -1,4 +1,3 @@
-require 'opencl_ruby_ffi'
 using OpenCLRefinements if RUBY_VERSION.scan(/\d+/).collect(&:to_i).first >= 2
 
 module OpenCL

data/lib/opencl_ruby_ffi/khr/egl_image.rb

@@ -1,4 +1,3 @@
-require 'opencl_ruby_ffi'
 using OpenCLRefinements if RUBY_VERSION.scan(/\d+/).collect(&:to_i).first >= 2
 
 module OpenCL

data/lib/opencl_ruby_ffi/khr/fp16.rb

@@ -1,4 +1,3 @@
-require 'opencl_ruby_ffi'
 using OpenCLRefinements if RUBY_VERSION.scan(/\d+/).collect(&:to_i).first >= 2
 
 module OpenCL

data/lib/opencl_ruby_ffi/khr/fp64.rb

@@ -1,4 +1,3 @@
-require 'opencl_ruby_ffi'
 using OpenCLRefinements if RUBY_VERSION.scan(/\d+/).collect(&:to_i).first >= 2
 
 module OpenCL

data/lib/opencl_ruby_ffi/khr/gl_event.rb

@@ -1,4 +1,3 @@
-require 'opencl_ruby_ffi'
 using OpenCLRefinements if RUBY_VERSION.scan(/\d+/).collect(&:to_i).first >= 2
 
 module OpenCL

data/lib/opencl_ruby_ffi/khr/gl_sharing.rb

@@ -1,4 +1,3 @@
-require 'opencl_ruby_ffi'
 using OpenCLRefinements if RUBY_VERSION.scan(/\d+/).collect(&:to_i).first >= 2
 
 module OpenCL
@@ -20,7 +19,7 @@ module OpenCL
 
   end
 
-  f = attach_extension_function( "clGetGLContextInfoKHR", :cl_int, [:pointer, :cl_gl_context_info, :size_t, :pointer, :pointer] )
+  attach_extension_function( "clGetGLContextInfoKHR", :cl_int, [:pointer, :cl_gl_context_info, :size_t, :pointer, :pointer] )
 
   def self.get_gl_context_info_khr( properties, param_name )
     props = MemoryPointer::new( :cl_context_properties, properties.length + 1 )

data/lib/opencl_ruby_ffi/khr/icd.rb

@@ -1,4 +1,3 @@
-require 'opencl_ruby_ffi'
 using OpenCLRefinements if RUBY_VERSION.scan(/\d+/).collect(&:to_i).first >= 2
 
 module OpenCL

data/lib/opencl_ruby_ffi/khr/initalize_memory.rb

@@ -1,4 +1,3 @@
-require 'opencl_ruby_ffi'
 using OpenCLRefinements if RUBY_VERSION.scan(/\d+/).collect(&:to_i).first >= 2
 
 module OpenCL

data/lib/opencl_ruby_ffi/khr/priority_hints.rb

@@ -1,4 +1,3 @@
-require 'opencl_ruby_ffi'
 using OpenCLRefinements if RUBY_VERSION.scan(/\d+/).collect(&:to_i).first >= 2
 
 module OpenCL

data/lib/opencl_ruby_ffi/khr/spir.rb

@@ -1,4 +1,3 @@
-require 'opencl_ruby_ffi'
 using OpenCLRefinements if RUBY_VERSION.scan(/\d+/).collect(&:to_i).first >= 2
 
 module OpenCL

data/lib/opencl_ruby_ffi/khr/sub_groups.rb

@@ -1,4 +1,3 @@
-require 'opencl_ruby_ffi'
 using OpenCLRefinements if RUBY_VERSION.scan(/\d+/).collect(&:to_i).first >= 2
 
 module OpenCL

data/lib/opencl_ruby_ffi/khr/terminate_context.rb

@@ -1,4 +1,3 @@
-require 'opencl_ruby_ffi'
 using OpenCLRefinements if RUBY_VERSION.scan(/\d+/).collect(&:to_i).first >= 2
 
 module OpenCL

data/lib/opencl_ruby_ffi/khr/throttle_hints.rb

@@ -1,4 +1,3 @@
-require 'opencl_ruby_ffi'
 using OpenCLRefinements if RUBY_VERSION.scan(/\d+/).collect(&:to_i).first >= 2
 
 module OpenCL

data/lib/opencl_ruby_ffi/nv/device_attribute_query.rb

@@ -1,4 +1,3 @@
-require 'opencl_ruby_ffi'
 using OpenCLRefinements if RUBY_VERSION.scan(/\d+/).collect(&:to_i).first >= 2
 
 module OpenCL

data/lib/opencl_ruby_ffi/opencl_ruby_ffi_base_gen.rb

@@ -918,26 +918,27 @@ EOF
     SVM_FINE_GRAIN_SYSTEM = (1 << 2)
     SVM_ATOMICS = (1 << 3)
     PAGE_SIZE_QCOM = 0x40A1
-  
-    # Creates a new Device and retains it if specified and aplicable
-    def initialize(ptr, retain = true)
-      super(ptr)
-      if platform.version_number >= 1.2 and retain then
-        error = OpenCL.clRetainDevice(ptr)
-        error_check( error )
-      end
-    end
-  
-    # method called at Device deletion, releases the object if aplicable
-    # @private
-    def self.release(ptr)
-      plat = FFI::MemoryPointer::new( Platform )
-      OpenCL.clGetDeviceInfo( ptr, OpenCL::Device::PLATFORM, plat.size, plat, nil)
-      platform = OpenCL::Platform::new(plat.read_pointer)
-      if platform.version_number >= 1.2 then
-        OpenCL.clReleaseDevice(ptr)
-      end
-    end
+
+    #DEFINED in ext/device_fission.rb  
+#    # Creates a new Device and retains it if specified and aplicable
+#    def initialize(ptr, retain = true)
+#      super(ptr)
+#      if platform.version_number >= 1.2 and retain then
+#        error = OpenCL.clRetainDevice(ptr)
+#        error_check( error )
+#      end
+#    end
+#  
+#    # method called at Device deletion, releases the object if aplicable
+#    # @private
+#    def self.release(ptr)
+#      plat = FFI::MemoryPointer::new( Platform )
+#      OpenCL.clGetDeviceInfo( ptr, OpenCL::Device::PLATFORM, plat.size, plat, nil)
+#      platform = OpenCL::Platform::new(plat.read_pointer)
+#      if platform.version_number >= 1.2 then
+#        OpenCL.clReleaseDevice(ptr)
+#      end
+#    end
   
   end
 

data/opencl_ruby_ffi.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'opencl_ruby_ffi'
-  s.version = "1.3.2"
+  s.version = "1.3.3"
   s.author = "Brice Videau"
   s.email = "brice.videau@imag.fr"
   s.homepage = "https://github.com/Nanosim-LIG/opencl-ruby"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opencl_ruby_ffi
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - Brice Videau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-27 00:00:00.000000000 Z
+date: 2017-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: narray
@@ -145,4 +145,3 @@ signing_key:
 specification_version: 4
 summary: Ruby OpenCL FFI bindings
 test_files: []
-has_rdoc: false