opencl_ruby_ffi 0.96 → 0.97

data/lib/opencl_ruby_ffi/CommandQueue.rb

@@ -898,11 +898,17 @@ module OpenCL
   #
   # the Event associated with the command
   def self.enqueue_task( command_queue, kernel, options = {} )
-    num_events, events = OpenCL.get_event_wait_list( options )
-    event = FFI::MemoryPointer::new( OpenCL::Event )
-    error = OpenCL.clEnqueueTask( command_queue, kernel, num_events, events, event )
-    OpenCL.error_check(error)
-    return OpenCL::Event::new(event.read_pointer, false)
+    if queue.context.platform.version_number < 2.0 then
+      num_events, events = OpenCL.get_event_wait_list( options )
+      event = FFI::MemoryPointer::new( OpenCL::Event )
+      error = OpenCL.clEnqueueTask( command_queue, kernel, num_events, events, event )
+      OpenCL.error_check(error)
+      return OpenCL::Event::new(event.read_pointer, false)
+    else
+      opts = options.dup
+      opts[:local_work_size] = [1]
+      return OpenCL.enqueue_NDrange_kernel( command_queue, kernel, [1], opts )
+    end
   end
 
   # Enqueues a kernel as a NDrange

data/lib/opencl_ruby_ffi/Context.rb

@@ -377,6 +377,29 @@ module OpenCL
       return OpenCL.create_pipe( self, pipe_packet_size, pipe_max_packets, opts )
     end
 
+    # Creates an SVMPointer pointing to an SVM area of memory in the Context
+    #
+    # ==== Attributes
+    #
+    # * +size+ - the size of the mmemory area to allocate
+    # * +options+ - a hash containing named options
+    #
+    # ==== Options
+    #
+    # * +:alignment+ - imposes the minimum alignment in byte
+    def svm_alloc(size, options = {})
+      return OpenCL.svm_alloc( self, size, options)
+    end
+
+    # Frees an SVMPointer
+    #
+    #  ==== Attributes
+    #
+    # * +svm_pointer+ - the SVMPointer to deallocate
+    def self.svm_free(svm_pointer)
+      return OpenCL.svm_free(self, svm_pointer)
+    end
+
   end
 
 end

data/lib/opencl_ruby_ffi/Pipe.rb

@@ -20,6 +20,7 @@ module OpenCL
     return OpenCL::Pipe::new(pipe_ptr, false)
   end
 
+  # Maps the cl_mem OpenCL objects of type CL_MEM_OBJECT_PIPE
   class Pipe
     
     ##

data/lib/opencl_ruby_ffi/Platform.rb

@@ -43,7 +43,7 @@ module OpenCL
   # * +return_type+ - the type of data returned by the function
   # * +param_types+ - an Array of types, corresponding to the parameters type
   # * +options+ - if given, a hash of named options that will be given to FFI::Function::new. See FFI doc for details.
-  def get_extension_function_for_platform( platform, name, return_type, param_types, options = {} )
+  def self.get_extension_function_for_platform( platform, name, return_type, param_types, options = {} )
     OpenCL.error_check(OpenCL::INVALID_OPERATION) if self.version_number < 1.2
     name_p = FFI::MemoryPointer.from_string(name)
     ptr = OpenCL.clGetExtensionFunctionAddressForPlatform( platform, name_p )

data/lib/opencl_ruby_ffi/SVM.rb

@@ -3,21 +3,36 @@ module OpenCL
   # maps the SVM pointer type
   class SVMPointer < FFI::Pointer
 
+    # create a new SVMPointer from its address and the context it pertains to
     def initialize( address, context )
       super( address )
       @context = context
     end
 
+    # creates a new SVMPointer relative to an existing one from an offset
     def +( offset )
       return OpenCL::SVMPointer::new(  self.address + offset, @context )
     end
 
+    # frees the SVMPointer (must not be called on an SVMPointer obtained from an offset)
     def free
       return OpenCL::svm_free( @context, self )
     end
 
   end
 
+
+  # Creates an SVMPointer pointing to an SVM area of memory
+  #
+  # ==== Attributes
+  #
+  # * +context+ - the Context in which to allocate the memory
+  # * +size+ - the size of the mmemory area to allocate
+  # * +options+ - a hash containing named options
+  #
+  # ==== Options
+  #
+  # * +:alignment+ - imposes the minimum alignment in byte
   def self.svm_alloc(context, size, options = {})
     OpenCL.error_check(OpenCL::INVALID_OPERATION) if context.platform.version_number < 2.0
     flags = OpenCL::get_flags(options)
@@ -28,6 +43,12 @@ module OpenCL
     return OpenCL::SVMPointer::new( ptr, context )
   end
 
+  # Frees an SVMPointer
+  #
+  #  ==== Attributes
+  #
+  # * +context+ - the Context in which to deallocate the memory
+  # * +svm_pointer+ - the SVMPointer to deallocate
   def self.svm_free(context, svm_pointer)
     OpenCL.error_check(OpenCL::INVALID_OPERATION) if context.platform.version_number < 2.0
     return OpenCL.clSVMFree( context, svm_pointer )
@@ -38,6 +59,7 @@ module OpenCL
     OpenCL.error_check(OpenCL::INVALID_OPERATION) if kernel.context.platform.version_number < 2.0
     error = OpenCL.clSetKernelArgSVMPointer( kernel, index, val )
     OpenCL.error_check(error)
+    return kernel
   end
 
   # Enqueues a command that frees SVMPointers (or Pointers using a callback)

data/opencl_ruby_ffi.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'opencl_ruby_ffi'
-  s.version = "0.96"
+  s.version = "0.97"
   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.96'
+  version: '0.97'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-28 00:00:00.000000000 Z
+date: 2014-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: narray