opencl_ruby_ffi 1.2.2 → 1.3.0

data/lib/opencl_ruby_ffi/opencl_types.rb

@@ -72,8 +72,20 @@ module OpenCL
     [ :cl_uint, :cl_gl_platform_info ],
     [ :cl_uint, :cl_gl_context_info ],
     [ :cl_uint, :cl_queue_priority_khr ],
-    [ :cl_uint, :cl_queue_throttle_khr ]
+    [ :cl_uint, :cl_queue_throttle_khr ],
+    [ :cl_bitfield, :cl_device_partition_property_ext ],
+    [ :cl_device_partition_property_ext, :cl_device_affinity_domain_ext ],
+    [ :pointer, :cl_egl_display_khr ],
+    [ :pointer, :cl_egl_image_khr ],
+    [ :pointer, :cl_egl_sync_khr ],
+    [ :cl_uint, :cl_d3d10_device_source_khr ],
+    [ :cl_uint, :cl_d3d10_device_set_khr ],
+    [ :cl_uint, :cl_d3d11_device_source_khr ],
+    [ :cl_uint, :cl_d3d11_device_set_khr ],
+    [ :cl_uint, :cl_dx9_media_adapter_type_khr ],
+    [ :cl_uint, :cl_dx9_media_adapter_set_khr ]
   ]
+  private_constant :TYPES
   
   TYPES.each { |orig, add|
     typedef orig, add
@@ -87,7 +99,7 @@ if RUBY_VERSION.scan(/\d+/).collect(&:to_i).first >= 2
 
     refine FFI::Pointer do
       methods_prefix = [:put, :get, :write, :read, :put_array_of, :get_array_of]
-      OpenCL::TYPES.each { |orig, add|
+      OpenCL::const_get(:TYPES).each { |orig, add|
         methods_prefix.each { |meth|
           alias_method "#{meth}_#{add}".to_sym, "#{meth}_#{orig}".to_sym
         }
@@ -100,7 +112,7 @@ else
 
   class FFI::Pointer
     methods_prefix = [:put, :get, :write, :read, :put_array_of, :get_array_of]
-    OpenCL::TYPES.each { |orig, add|
+    OpenCL::const_get(:TYPES).each { |orig, add|
       methods_prefix.each { |meth|
         alias_method "#{meth}_#{add}".to_sym, "#{meth}_#{orig}".to_sym
       }

data/opencl_ruby_ffi.gemspec

@@ -1,14 +1,14 @@
 Gem::Specification.new do |s|
   s.name = 'opencl_ruby_ffi'
-  s.version = "1.2.2"
+  s.version = "1.3.0"
   s.author = "Brice Videau"
   s.email = "brice.videau@imag.fr"
   s.homepage = "https://github.com/Nanosim-LIG/opencl-ruby"
   s.summary = "Ruby OpenCL FFI bindings"
   s.description = "Ruby OpenCL FFI bindings. OpenCL 2.1 ready"
-  s.files =  Dir[ 'opencl_ruby_ffi.gemspec', 'LICENSE', 'lib/**/*']
-  s.has_rdoc = true
-  s.license = 'BSD'
+  s.files =  Dir[ 'opencl_ruby_ffi.gemspec', 'LICENSE', 'lib/**/**/*', '.yardopts', 'templates_custom/default/module/setup.rb' ]
+  s.has_rdoc = false
+  s.license = 'BSD-2-Clause'
   s.required_ruby_version = '>= 1.8.7'
   s.add_dependency 'narray', '~> 0.6', '>=0.6.0.8'
   s.add_dependency 'ffi', '~> 1.9', '>=1.9.3'

data/templates_custom/default/module/setup.rb

@@ -0,0 +1,9 @@
+def init
+  sections :header, :box_info, :pre_docstring, T('docstring'), :children,
+    :attribute_summary, [:item_summary], :inherited_attributes,
+    :method_summary, [:item_summary], :inherited_methods,
+    :methodmissing, [T('method_details')],
+    :attribute_details, [T('method_details')],
+    :method_details_list, [T('method_details')],
+    :constant_summary, [T('docstring')], :inherited_constants
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opencl_ruby_ffi
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors:
 - Brice Videau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-19 00:00:00.000000000 Z
+date: 2016-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: narray
@@ -76,6 +76,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".yardopts"
 - LICENSE
 - lib/opencl_ruby_ffi.rb
 - lib/opencl_ruby_ffi/Buffer.rb
@@ -83,7 +84,6 @@ files:
 - lib/opencl_ruby_ffi/Context.rb
 - lib/opencl_ruby_ffi/Device.rb
 - lib/opencl_ruby_ffi/Event.rb
-- lib/opencl_ruby_ffi/GLExt.rb
 - lib/opencl_ruby_ffi/Image.rb
 - lib/opencl_ruby_ffi/Kernel.rb
 - lib/opencl_ruby_ffi/Mem.rb
@@ -92,15 +92,37 @@ files:
 - lib/opencl_ruby_ffi/Program.rb
 - lib/opencl_ruby_ffi/SVM.rb
 - lib/opencl_ruby_ffi/Sampler.rb
-- lib/opencl_ruby_ffi/Stream.rb
+- lib/opencl_ruby_ffi/amd/device_attribute_query.rb
+- lib/opencl_ruby_ffi/egl.rb
+- lib/opencl_ruby_ffi/ext.rb
+- lib/opencl_ruby_ffi/ext/device_fission.rb
+- lib/opencl_ruby_ffi/gl_ext.rb
+- lib/opencl_ruby_ffi/khr/d3d10_sharing.rb
+- lib/opencl_ruby_ffi/khr/d3d11_sharing.rb
+- lib/opencl_ruby_ffi/khr/dx9_media_sharing.rb
+- lib/opencl_ruby_ffi/khr/egl_event.rb
+- lib/opencl_ruby_ffi/khr/egl_image.rb
+- lib/opencl_ruby_ffi/khr/fp16.rb
+- lib/opencl_ruby_ffi/khr/fp64.rb
+- lib/opencl_ruby_ffi/khr/gl_event.rb
+- lib/opencl_ruby_ffi/khr/gl_sharing.rb
+- lib/opencl_ruby_ffi/khr/icd.rb
+- lib/opencl_ruby_ffi/khr/initalize_memory.rb
+- lib/opencl_ruby_ffi/khr/priority_hints.rb
+- lib/opencl_ruby_ffi/khr/spir.rb
+- lib/opencl_ruby_ffi/khr/sub_groups.rb
+- lib/opencl_ruby_ffi/khr/terminate_context.rb
+- lib/opencl_ruby_ffi/khr/throttle_hints.rb
+- lib/opencl_ruby_ffi/nv/device_attribute_query.rb
 - lib/opencl_ruby_ffi/opencl_arithmetic_gen.rb
 - lib/opencl_ruby_ffi/opencl_ruby_ffi_base.rb
 - lib/opencl_ruby_ffi/opencl_ruby_ffi_base_gen.rb
 - lib/opencl_ruby_ffi/opencl_types.rb
 - opencl_ruby_ffi.gemspec
+- templates_custom/default/module/setup.rb
 homepage: https://github.com/Nanosim-LIG/opencl-ruby
 licenses:
-- BSD
+- BSD-2-Clause
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -118,8 +140,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby OpenCL FFI bindings
 test_files: []
+has_rdoc: false

data/lib/opencl_ruby_ffi/GLExt.rb

@@ -1,58 +0,0 @@
-require 'opencl_ruby_ffi'
-using OpenCLRefinements if RUBY_VERSION.scan(/\d+/).collect(&:to_i).first >= 2
-
-module OpenCL
-
-  name_p = MemoryPointer.from_string("clGetGLContextInfoKHR")
-  p = clGetExtensionFunctionAddress(name_p)
-  if p then
-    func = Function::new( :cl_int, [:pointer, :cl_gl_context_info, :size_t, :pointer, :pointer], p)
-    func.attach(OpenCL, "clGetGLContextInfoKHR")
-
-    def self.get_gl_context_info_khr( properties, param_name )
-      props = MemoryPointer::new( :cl_context_properties, properties.length + 1 )
-      properties.each_with_index { |e,i|
-        props[i].write_cl_context_properties(e)
-      }
-      props[properties.length].write_cl_context_properties(0)
-      size_p = MemoryPointer::new( :size_t )
-      error = clGetGLContextInfoKHR( props, param_name, 0, nil, size_p )
-      error_check(error)
-      size = size_p.read_size_t
-      nb_devices = size/Device.size
-      values = MemoryPointer::new( Device, nb_devices )
-      error = clGetGLContextInfoKHR( props, param_name, size, values, nil )
-      error_check(error)
-      return values.get_array_of_pointer(0, nb_devices).collect { |device_ptr|
-        Device::new(device_ptr, false)
-      }
-    end
-  end
-
-  name_p = MemoryPointer.from_string("clCreateEventFromGLsyncKHR")
-  p = clGetExtensionFunctionAddress(name_p)
-  if p then
-    func = Function::new( Event, [Context, :pointer, :pointer], p)
-    func.attach(OpenCL, "clCreateEventFromGLsyncKHR")
-
-    def self.create_event_from_glsync_khr( context, sync)
-      error_check(INVALID_OPERATION) if context.platform.version_number < 1.1
-      error_p = MemoryPointer::new( :cl_int )
-      event = clCreateEventFromGLsyncKHR( context, sync, error_p )
-      error_check(error_p.read_cl_int)
-      return Event::new( event, false )
-    end
-  end
-
-  class Context
-    def get_gl_info_khr( param_name )
-      error_check(INVALID_OPERATION) unless self.platform.extensions.include?( "cl_khr_gl_sharing" )
-      return OpenCL.get_gl_context_info_khr( self.properties, param_name )
-    end
-
-    def create_event_from_glsync_khr( sync )
-      error_check(INVALID_OPERATION) unless self.platform.extensions.include?( "cl_khr_gl_sharing" )
-      return OpenCL.create_event_from_glsync_khr( self, sync )
-    end
-  end
-end

data/lib/opencl_ruby_ffi/Stream.rb

@@ -1,127 +0,0 @@
-using OpenCLRefinements if RUBY_VERSION.scan(/\d+/).collect(&:to_i).first >= 2
-module OpenCL
-
-  module StreamDSL
-
-    class Stream
-
-      def initialize(queue)
-        @queue = queue
-        @tail_events = nil
-      end
-
-      def <<(commands)
-        events = []
-        [commands].flatten.each { |c|
-          events.push ( c.enqueue( queue, @tail_events ) )
-        }
-        @tail_events = events
-        return self
-      end
-
-    end
-
-    class Command
-
-      def initialize(type, options = {})
-        @_type = type
-        @_options = options
-        @_event = nil
-        @_func = nil
-        @_params = []
-      end
-
-      def enqueue(queue, event_wait_list = nil)
-        if options and options[:event_wait_list] then
-          @_event_wait_list = [options[:event_wait_list]].flatten
-        else
-          @_event_wait_list = nil
-        end
-        if event_wait_list then
-          if @_event_wait_list then
-            @_event_wait_list = @_event_wait_list + [event_wait_list].flatten
-          else
-            @_event_wait_list = [event_wait_list].flatten
-          end
-        end
-        opts = @_options.dup
-        opts[:event_wait_list] = @_event_wait_list
-        @_event, @_result = @_enqueue_proc.call( queue, *@_param, opts, &@f_unc )
-      end
-
-      def result
-        return @_result
-      end
-
-    end
-
-    def self.command_constructor( name, const, function, params)
-      params_array = params + ["options = {}"]
-      params_array += ["&func"]
-      p_variables = params.collect { |p| "@_params.push(@#{p})" }
-      return <<EOF
-    class #{name} < Command
-
-      def initialize( #{params_array.join(", ")}, &func )
-        super(CommandType::#{const}, options)
-        #{i_variables.join("\n        ")}
-        @_func = func
-        @_enqueue_proc = OpenCL.method(:enqueue_#{function})
-      end
-
-    end
-EOF
-    end
-
-    eval command_constructor( :NDRangeKernel, :NDRANGE_KERNEL, :ndrange_kernel, [ :buffer, :global_work_size ] )
-    eval command_constructor( :Task, :TASK, :task, [ :kernel ] )
-    eval command_constructor( :NativeKernel, :NATIVE_KERNEL, :native_kernel, [] )
-    eval command_constructor( :ReadBuffer, :READ_BUFFER, :read_buffer, [ :buffer, :ptr ] )
-    eval command_constructor( :WriteBuffer, :WRITE_BUFFER, :write_buffer, [ :buffer, :ptr ] )
-    eval command_constructor( :CopyBuffer, :COPY_BUFFER, :copy_buffer, [ :src_buffer, :dst_buffer ] )
-    eval command_constructor( :ReadImage, :READ_IMAGE, :read_image, [ :image, :ptr ] )
-    eval command_constructor( :WriteImage, :WRITE_IMAGE, :write_image, [ :image, :ptr ] )
-    eval command_constructor( :CopyImage, :COPY_IMAGE, :copy_image, [ :src_image, :dst_image ] )
-    eval command_constructor( :CopyImageToBuffer, :COPY_IMAGE_TO_BUFFER, :copy_image_to_buffer, [ :src_image, :dst_buffer ] )
-    eval command_constructor( :CopyBufferToImage, :COPY_BUFFER_TO_IMAGE, :copy_buffer_to_image, [ :src_buffer, :dst_image ] )
-    eval command_constructor( :MapBuffer, :MAP_BUFFER, :map_buffer, [ :buffer, :map_flags ] )
-    eval command_constructor( :MapImage, :MAP_IMAGE, :map_image, [ :image, :map_flags ] )
-    eval command_constructor( :UnmapMemObject, :UNMAP_MEM_OBJECT, :unmap_mem_object, [ :mem_obj, :mapped_ptr ] )
-
-    class Marker < Command
-
-      def initialize( events = [] )
-        super(CommandType::MARKER, nil)
-        @events = events
-        @_enqueue_proc = OpenCL.method(:enqueue_marker)
-      end
-
-    end
-
-    eval command_constructor( :AcquireGLObjects, :ACQUIRE_GL_OBJECTS, :acquire_gl_objects, [ :mem_objects ] )
-    eval command_constructor( :ReleaseGLObjects, :RELEASE_GL_OBJECTS, :release_gl_objects, [ :mem_objects ] )
-    eval command_constructor( :ReadBufferRect, :READ_BUFFER_RECT, :read_buffer_rect, [ :buffer, :ptr, :region ] )
-    eval command_constructor( :WriteBufferRect, :WRITE_BUFFER_RECT, :write_buffer_rect, [ :buffer, :ptr, :region ] )
-    eval command_constructor( :CopyBufferRect, :COPY_BUFFER_RECT, :copy_buffer_rect, [ :src_buffer, :dst_buffer, :region ] )
-
-    class Barrier < Command
-
-      def initialize( events = [] )
-        super(CommandType::BARRIER, nil)
-        @events = events
-        @_enqueue_proc = OpenCL.method(:enqueue_barrier)
-      end
-
-    end
-
-    eval command_constructor( :FillBuffer, :FILL_BUFFER, :fill_buffer, [ :buffer, :pattern ] )
-    eval command_constructor( :FillImage, :FILL_IMAGE, :fill_image, [ :image, :fill_color ] )
-    eval command_constructor( :SVMFree, :SVM_FREE, :svm_free, [ :svm_pointers ] )
-    eval command_constructor( :SVMMemcpy, :SVM_MEMCPY, :svm_memcpy, [ :dst_ptr, :src_ptr, :size ] )
-    eval command_constructor( :SVMMemFill, :SVM_MEMFILL, :svm_memfill, [ :svm_ptr, :pattern, :size ] )
-    eval command_constructor( :SVMMap, :SVM_MAP, :svm_map, [ :svm_ptr, :size, :map_flags ] )
-    eval command_constructor( :SVMUnmap, :SVM_UNMAP, :svm_unmap, [ :svm_ptr ] )
-
-  end
-  
-end