opencl_ruby_ffi 0.995 → 0.996

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 0713a0dacbcdc402b03447ecb6de63b041b359a3
+  data.tar.gz: 48115b80e8d5bade57ef1634972c52b1d3ce381b
+SHA512:
+  metadata.gz: 8ba6e9b12fb6ffb166c57613bfd76011fbc28d92fa57b72661591870d34d188db580c8ba8d548bc6d658b3142e3e8b7d10442d67539593e7f0945bcd618cdaa2
+  data.tar.gz: 8dfe8b59516785150b979adf667ad85ce9dfae59589ab8167ee00181a323fecd5da5a0ea0876492c53859831636cfb8109e9e1ae04ac5a2512dbf6c42dd9c37e

data/lib/opencl_ruby_ffi/CommandQueue.rb

@@ -549,7 +549,7 @@ module OpenCL
   # ==== Returns
   #
   # the Event associated with the command
-  def self.enqueue_acquire_GL_object( command_queue, mem_objects, options = {} )
+  def self.enqueue_acquire_GL_objects( command_queue, mem_objects, options = {} )
     num_objs = [mem_objects].flatten.length
     objs = nil
     if num_objs > 0 then
@@ -560,10 +560,13 @@ module OpenCL
     end
     num_events, events = get_event_wait_list( options )
     event = FFI::MemoryPointer::new( Event )
-    error = clEnqueueAcquireGLObject( command_queue, num_objs, objs, num_events, events, event )
+    error = clEnqueueAcquireGLObjects( command_queue, num_objs, objs, num_events, events, event )
     error_check(error)
     return Event::new(event.read_pointer, false)
   end
+  class << self
+    alias :enqueue_acquire_gl_objects :enqueue_acquire_GL_objects
+  end
 
   # Release OpenCL Mem objects that have been created from OpenGL objects and previously acquired
   #
@@ -580,7 +583,7 @@ module OpenCL
   # ==== Returns
   #
   # the Event associated with the command
-  def self.enqueue_release_GL_object( command_queue, mem_objects, options = {} )
+  def self.enqueue_release_GL_objects( command_queue, mem_objects, options = {} )
     num_objs = [mem_objects].flatten.length
     objs = nil
     if num_objs > 0 then
@@ -591,10 +594,13 @@ module OpenCL
     end
     num_events, events = get_event_wait_list( options )
     event = FFI::MemoryPointer::new( Event )
-    error = clEnqueueReleaseGLObject( command_queue, num_objs, objs, num_events, events, event )
+    error = clEnqueueReleaseGLObjects( command_queue, num_objs, objs, num_events, events, event )
     error_check(error)
     return Event::new(event.read_pointer, false)
   end
+  class << self
+    alias :enqueue_release_gl_objects :enqueue_release_GL_objects
+  end
 
   # Enqueues a command to fill a Buffer with the given pattern
   #
@@ -954,6 +960,9 @@ module OpenCL
     error_check(error)
     return Event::new(event.read_pointer, false)
   end
+  class << self
+    alias :enqueue_nd_range_kernel :enqueue_NDrange_kernel
+  end
 
   # Enqueues a barrier on a list of envents
   #
@@ -1077,25 +1086,6 @@ module OpenCL
     # Returns the :cl_command_queue_properties used to create the CommandQueue
     eval get_info("CommandQueue", :cl_command_queue_properties, "PROPERTIES")
 
-    # Enqueues a native kernel using the CommandQueue
-    #  not yet fully implemented
-    #
-    # ==== Attributes
-    # 
-    # * +options+ - a hash containing named options
-    # * +func+ - a Proc object to execute
-    #
-    # ==== Options
-    #
-    # * +:event_wait_list+ - if provided, a list of Event to wait upon before executing the command
-    #
-    # ==== Returns
-    #
-    # the Event associated with the command
-    def enqueue_native_kernel( options = {}, &func )
-      return OpenCL.enqueue_native_kernel( self, options, &func )
-    end
-
     # Enqueues a kernel as a task using the CommandQueue
     #
     # ==== Attributes
@@ -1134,6 +1124,7 @@ module OpenCL
     def enqueue_NDrange_kernel( kernel, global_work_size, options = {} )
       return OpenCL.enqueue_NDrange_kernel( self, kernel, global_work_size, options )
     end
+    alias :enqueue_nd_range_kernel :enqueue_NDrange_kernel
 
     # Enqueues a command to write to a Buffer object from host memory using the CommandQueue
     #
@@ -1497,9 +1488,10 @@ module OpenCL
     # ==== Returns
     #
     # the Event associated with the command
-    def enqueue_acquire_GL_object( mem_objects, options = {} )
-      return OpenCL.enqueue_acquire_GL_object( self, mem_objects, options )
+    def enqueue_acquire_GL_objects( mem_objects, options = {} )
+      return OpenCL.enqueue_acquire_GL_objects( self, mem_objects, options )
     end
+    alias :enqueue_acquire_gl_objects :enqueue_acquire_GL_objects
 
     # Release OpenCL Mem objects that have been created from OpenGL objects and previously acquired using the CommandQueue
     #
@@ -1515,9 +1507,10 @@ module OpenCL
     # ==== Returns
     #
     # the Event associated with the command
-    def enqueue_release_GL_object( mem_objects, options = {} )
-      return OpenCL.enqueue_release_GL_object( self, mem_objects, options )
+    def enqueue_release_GL_objects( mem_objects, options = {} )
+      return OpenCL.enqueue_release_GL_objects( self, mem_objects, options )
     end
+    alias :enqueue_release_gl_objects :enqueue_release_GL_objects
 
     # Enqueues a command to map a Buffer into host memory using the CommandQueue
     #
@@ -1697,8 +1690,8 @@ module OpenCL
     # ==== Returns
     #
     # the Event associated with the command
-    def enqueue_svm_fill(command_queue, svm_ptr, pattern, size, options = {})
-      return OpenCL.enqueue_svm_fill(self, svm_ptr, pattern, size, options)
+    def enqueue_svm_mem_fill(command_queue, svm_ptr, pattern, size, options = {})
+      return OpenCL.enqueue_svm_mem_fill(self, svm_ptr, pattern, size, options)
     end
 
     # Enqueues a command to map an Image into host memory using the CommandQueue

data/lib/opencl_ruby_ffi/Image.rb

@@ -197,7 +197,7 @@ module OpenCL
   end
 
   # Maps the cl_mem OpenCL objects of type CL_MEM_OBJECT_IMAGE*
-  class Image
+  class Image #< Mem
 
     ##
     # :method: element_size

data/lib/opencl_ruby_ffi/Pipe.rb

@@ -21,7 +21,7 @@ module OpenCL
   end
 
   # Maps the cl_mem OpenCL objects of type CL_MEM_OBJECT_PIPE
-  class Pipe
+  class Pipe #< Mem
     include InnerInterface
 
     class << self

data/lib/opencl_ruby_ffi/SVM.rb

@@ -4,19 +4,25 @@ module OpenCL
   class SVMPointer < FFI::Pointer
 
     # create a new SVMPointer from its address and the context it pertains to
-    def initialize( address, context )
+    def initialize( address, context, size, base = nil )
       super( address )
       @context = context
+      if base then
+        @base = base
+      else
+        @base = address
+      end
+      @size = size
     end
 
     # creates a new SVMPointer relative to an existing one from an offset
     def +( offset )
-      return SVMPointer::new(  self.address + offset, @context )
+      return SVMPointer::new(  self.address + offset, @context, @size, @base )
     end
 
-    # frees the SVMPointer (must not be called on an SVMPointer obtained from an offset)
+    # frees the parent memory region associated to this SVMPointer
     def free
-      return OpenCL::svm_free( @context, self )
+      return OpenCL::svm_free( @context, @base )
     end
 
   end
@@ -40,7 +46,7 @@ module OpenCL
     alignment = options[:alignment] if options[:alignment]
     ptr = clSVMAlloc( context, flags, size, alignment )
     error_check(MEM_OBJECT_ALLOCATION_FAILURE) if ptr.null?
-    return SVMPointer::new( ptr, context )
+    return SVMPointer::new( ptr, context, size )
   end
 
   # Frees an SVMPointer
@@ -140,12 +146,12 @@ module OpenCL
   # ==== Returns
   #
   # the Event associated with the command
-  def self.enqueue_svm_fill(command_queue, svm_ptr, pattern, size, options = {})
+  def self.enqueue_svm_mem_fill(command_queue, svm_ptr, pattern, size, options = {})
     num_events, events = get_event_wait_list( options )
     pattern_size = pattern.size
     pattern_size = options[:pattern_size] if options[:pattern_size]
     event = FFI::MemoryPointer::new( Event )
-    error = clEnqueueSVMFill(command_queue, svm_ptr, pattern, pattern_size, size, num_events, events, event)
+    error = clEnqueueSVMMemFill(command_queue, svm_ptr, pattern, pattern_size, size, num_events, events, event)
     error_check(error)
     return Event::new(event.read_pointer, false)
   end

data/lib/opencl_ruby_ffi/opencl_ruby_ffi_base_gen.rb

@@ -6,7 +6,15 @@ module OpenCL
   begin
     ffi_lib "OpenCL"
   rescue LoadError => e
-    ffi_lib "libOpenCL.so.1"
+    begin
+      ffi_lib "libOpenCL.so.1"
+    rescue LoadError => e
+      begin
+        ffi_lib '/System/Library/Frameworks/OpenCL.framework/OpenCL'
+      rescue LoadError => e
+        raise "OpenCL implementation not found!"
+      end
+    end
   end
   #:stopdoc:
   SUCCESS = 0

data/opencl_ruby_ffi.gemspec

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

metadata

@@ -1,62 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: opencl_ruby_ffi
 version: !ruby/object:Gem::Version
-  version: '0.995'
-  prerelease: 
+  version: '0.996'
 platform: ruby
 authors:
 - Brice Videau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-10 00:00:00.000000000 Z
+date: 2014-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: narray
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.0.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.0.8
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.9.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.9.3
 - !ruby/object:Gem::Dependency
   name: narray_ffi
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.2'
 description: Ruby OpenCL FFI bindings. OpenCL 2.0 ready
@@ -65,7 +58,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- opencl_ruby_ffi.gemspec
 - LICENSE
 - lib/opencl_ruby_ffi.rb
 - lib/opencl_ruby_ffi/Arithmetic_gen.rb
@@ -77,36 +69,36 @@ files:
 - lib/opencl_ruby_ffi/Image.rb
 - lib/opencl_ruby_ffi/Kernel.rb
 - lib/opencl_ruby_ffi/Mem.rb
-- lib/opencl_ruby_ffi/opencl_ruby_ffi_base_gen.rb
-- lib/opencl_ruby_ffi/opencl_ruby_ffi_base.rb
+- lib/opencl_ruby_ffi/Pipe.rb
 - lib/opencl_ruby_ffi/Platform.rb
 - lib/opencl_ruby_ffi/Program.rb
-- lib/opencl_ruby_ffi/Sampler.rb
-- lib/opencl_ruby_ffi/Pipe.rb
 - lib/opencl_ruby_ffi/SVM.rb
+- lib/opencl_ruby_ffi/Sampler.rb
+- lib/opencl_ruby_ffi/opencl_ruby_ffi_base.rb
+- lib/opencl_ruby_ffi/opencl_ruby_ffi_base_gen.rb
+- opencl_ruby_ffi.gemspec
 homepage: https://github.com/Nanosim-LIG/opencl-ruby
 licenses:
 - BSD
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby OpenCL FFI bindings
 test_files: []