BOAST 0.999 → 0.9991

data/BOAST.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'BOAST'
-  s.version = "0.999"
+  s.version = "0.9991"
   s.author = "Brice Videau"
   s.email = "brice.videau@imag.fr"
   s.homepage = "https://forge.imag.fr/projects/boast/"

data/lib/BOAST/CKernel.rb

@@ -20,6 +20,10 @@ module BOAST
     :NVCCFLAGS => '-O2',
     :LDFLAGS => '',
     :CLFLAGS => '',
+    :CLVENDOR => nil,
+    :CLPLATFORM => nil,
+    :CLDEVICE => nil,
+    :CLDEVICETYPE => nil,
     :openmp => false
   }
   
@@ -252,27 +256,44 @@ module BOAST
       return ld_flags
     end
 
-    def build_opencl(options)
-      require 'opencl_ruby_ffi'
-      platform = nil
+    def select_cl_platform(options)
       platforms = OpenCL::get_platforms
       if options[:platform_vendor] then
-        platforms.each{ |p|
-          platform = p if p.vendor.match(options[:platform_vendor])
+        platforms.select!{ |p|
+          p.vendor.match(options[:platform_vendor])
+        }
+      elsif options[:CLVENDOR] then
+        platforms.select!{ |p|
+          p.vendor.match(options[:CLVENDOR])
         }
-      else
-        platform = platforms.first
       end
-      device = nil
-      type = options[:device_type] ? options[:device_type] : OpenCL::Device::Type::ALL
+      if options[:CLPLATFORM] then
+        platforms.select!{ |p|
+          p.name.match(options[:CLPLATFORM])
+        }
+      end
+      return platforms.first
+    end
+
+    def select_cl_device(options)
+      platform = select_cl_platform(options)
+      type = options[:device_type] ? OpenCL::Device::Type.const_get(options[:device_type]) : options[:CLDEVICETYPE] ? OpenCL::Device::Type.const_get(options[:CLDEVICETYPE]) : OpenCL::Device::Type::ALL
       devices = platform.devices(type)
       if options[:device_name] then
-        devices.each{ |d|
-          device = d if d.name.match(options[:device_name])
+        devices.select!{ |d|
+          d.name.match(options[:device_name])
+        }
+      elsif options[:CLDEVICE] then
+        devices.select!{ |d|
+          d.name.match(options[:CLDEVICE])
         }
-      else
-        device = devices.first
       end
+      return devices.first
+    end
+
+    def build_opencl(options)
+      require 'opencl_ruby_ffi'
+      device = select_cl_device(options)
       @context = OpenCL::create_context([device])
       program = @context.create_program_with_source([@code.string])
       opts = options[:CLFLAGS]

data/lib/BOAST/Procedure.rb

@@ -109,7 +109,9 @@ module BOAST
 #      s += self.header(BOAST::get_lang,false)
 #      s += ";\n"
       if BOAST::get_lang == CL then
-        if not @properties[:local] then
+        if @properties[:local] then
+          s += "static "
+        else
           s += "__kernel "
           wgs = @properties[:reqd_work_group_size]
           if wgs then

data/lib/BOAST/Variable.rb

@@ -331,7 +331,7 @@ module BOAST
         s += ")"
       end
       s += " :: #{@name}"
-      if @constant
+      if @constant then
         s += " = #{@constant}"
         s += "_wp" if not @dimension and @type and @type.size == 8
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: BOAST
 version: !ruby/object:Gem::Version
-  version: '0.999'
+  version: '0.9991'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-10 00:00:00.000000000 Z
+date: 2014-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: narray