opencl_ruby_ffi 0.6 → 0.7

data/lib/opencl_ruby_ffi/CommandQueue.rb

@@ -102,6 +102,7 @@ module OpenCL
   def self.enqueue_map_image( command_queue, image, map_flags, options = {} )
     blocking = OpenCL::FALSE
     blocking = OpenCL::TRUE if options[:blocking] or options[:blocking_map]
+    flags = OpenCL.get_flags( {:flags => map_flags} )
 
     origin, region = OpenCL.get_origin_region( image, options, :origin, :region )
 
@@ -110,7 +111,7 @@ module OpenCL
     image_slice_pitch = FFI::MemoryPointer::new( :size_t )
     event = FFI::MemoryPointer::new( OpenCL::Event )
     error = FFI::MemoryPointer::new( :cl_int )
-    OpenCL.clEnqueueMapImage( command_queue, image, blocking, map_flags, origin, region, image_row_pitch, image_slice_pitch, num_events, events, event, error )
+    OpenCL.clEnqueueMapImage( command_queue, image, blocking, flags, origin, region, image_row_pitch, image_slice_pitch, num_events, events, event, error )
     OpenCL.error_check( error.read_cl_int )
     ev = OpenCL::Event::new( event.read_ptr, false )
     return [ev, ptr, image_row_pitch.read_size_t, image_slice_pitch.read_size_t]
@@ -141,6 +142,8 @@ module OpenCL
   def self.enqueue_map_buffer( command_queue, buffer, map_flags, options = {} )
     blocking = OpenCL::FALSE
     blocking = OpenCL::TRUE if options[:blocking] or options[:blocking_map]
+    flags = OpenCL.get_flags( {:flags => map_flags} )
+
     offset = 0
     offset = options[:offset] if options[:offset]
     size = buffer.size - offset
@@ -148,7 +151,7 @@ module OpenCL
     num_events, events = OpenCL.get_event_wait_list( options )
     event = FFI::MemoryPointer::new( OpenCL::Event )
     error = FFI::MemoryPointer::new( :cl_int )
-    ptr = OpenCL.clEnqueueMapBuffer( command_queue, buffer, blocking, map_flags, offset, size, num_events, events, error )
+    ptr = OpenCL.clEnqueueMapBuffer( command_queue, buffer, blocking, flags, offset, size, num_events, events, error )
     OpenCL.error_check( error.read_cl_int )
     ev = OpenCL::Event::new( event.read_ptr, false )
     return [ev, ptr]

data/lib/opencl_ruby_ffi/Context.rb

@@ -14,14 +14,15 @@ module OpenCL
   # * +:user_data+ - an FFI::Pointer or an object that can be converted into one using to_ptr. The pointer is passed to the callback.
   def self.create_context(devices, options = {}, &block)
     @@callbacks.push( block ) if block
-    pointer = FFI::MemoryPointer::new( Device, devices.size)
-    devices.size.times { |indx|
-      pointer.put_pointer(indx, devices[indx])
+    devs = [devices].flatten
+    pointer = FFI::MemoryPointer::new( Device, devs.size)
+    devs.size.times { |indx|
+      pointer.put_pointer(indx, devs[indx])
     }
     properties = OpenCL.get_context_properties( options )
     user_data = options[:user_data]
     error = FFI::MemoryPointer::new( :cl_int )
-    ptr = OpenCL.clCreateContext(properties, devices.size, pointer, block, user_data, error)
+    ptr = OpenCL.clCreateContext(properties, devs.size, pointer, block, user_data, error)
     OpenCL.error_check(error.read_cl_int)
     return OpenCL::Context::new(ptr, false)
   end

data/lib/opencl_ruby_ffi/Device.rb

@@ -10,7 +10,7 @@ module OpenCL
   # ==== Returns
   #
   # an Array of Device
-  def self.create_sub_devices( in_device, properties = [OpenCL::Device::PARTITION_BY_AFFINITY_DOMAIN, OpenCL::Device::AFFINITY_DOMAIN_NEXT_PARTITIONABLE] )
+  def self.create_sub_devices( in_device, properties )
     OpenCL.error_check(OpenCL::INVALID_OPERATION) if in_device.platform.version_number < 1.2
     props = FFI::MemoryPointer::new( :cl_device_partition_property, properties.length + 1 )
     properties.each_with_index { |e,i|

data/lib/opencl_ruby_ffi/Program.rb

@@ -189,7 +189,7 @@ module OpenCL
   # * +strings+ - a single or an Array of String repesenting the program source code
   def self.create_program_with_source(context, strings)
     strs = nil
-    if strings == nil then
+    if not strings then
       raise OpenCL::Error::new(OpenCL::Error.getErrorString(OpenCL::Error::INVALID_VALUE))
     else
       strs = [strings].flatten

data/opencl_ruby_ffi.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'opencl_ruby_ffi'
-  s.version = "0.6"
+  s.version = "0.7"
   s.author = "Brice Videau"
   s.email = "brice.videau@imag.fr"
   s.homepage = "https://forge.imag.fr/projects/opencl-ruby/"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opencl_ruby_ffi
 version: !ruby/object:Gem::Version
-  version: '0.6'
+  version: '0.7'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-26 00:00:00.000000000 Z
+date: 2014-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: narray