BOAST 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0bb86d632c7e15c62f42007db65ef307a86ed1eb
-  data.tar.gz: 8b4323362889540f6e731bad43e6765b24f26d2c
+  metadata.gz: 5fab0f4b52a0cd282c1abfc5778a690c5c90baae
+  data.tar.gz: 7e8adb0b43d8913a825a2349a8806af4097dd494
 SHA512:
-  metadata.gz: d4dd1ffe821624820fec06684910ad87f0dd451d81b596fafceda7b41651e0d5810dfe4aa902de69d609387577e4ace87b1ede8dea7ebcc65cc4d11d13cd3dda
-  data.tar.gz: 65d6bc915e2299d38e1bd2f4c52057f42e5c6ada5fd5d26416dacd20a4169f364f3eaec28c9e755a4d3b40c3903cb8f2092c23d55dcf400b5b7dbeac5a3f1787
+  metadata.gz: 4fc23c211872b5bd42ae68cd18be4dacdcdc8a235c14bd5c40e80359bbff25a8c0433bdc52cf9d4b5a605ad0342f025384cf2c32cb94d3ed9241d4b058932d70
+  data.tar.gz: 29db1a68750851b3ce5a1f4e1b8e8495a8f553d0b979628ab132cf7cc3c4e96bc8672ffed74b7a938bead7e0e6a5c212b89041f73be8b7647d68c188a603452c

data/BOAST.gemspec

@@ -1,14 +1,14 @@
 Gem::Specification.new do |s|
   s.name = 'BOAST'
-  s.version = "1.2.1"
+  s.version = "1.2.2"
   s.author = "Brice Videau"
   s.email = "brice.videau@imag.fr"
   s.homepage = "https://github.com/Nanosim-LIG/boast"
   s.summary = "BOAST is a computing kernel metaprogramming tool."
   s.description = "BOAST aims at providing a framework to metaprogram, benchmark and validate computing kernels"
   s.files = Dir['BOAST.gemspec', 'LICENSE', 'README.md', 'lib/**/*']
-  s.has_rdoc = true
-  s.license = 'BSD'
+  s.has_rdoc = false
+  s.license = 'BSD-2-Clause'
   s.required_ruby_version = '>= 1.9.3'
   s.add_dependency 'narray', '~> 0.6.0', '>=0.6.0.8'
   s.add_dependency 'narray_ffi', '~> 1.2', '>=1.2.0'

data/lib/BOAST/Language/Algorithm.rb

@@ -2,36 +2,8 @@ module BOAST
 
   extend TypeTransition
   
-  FORTRAN = 1
-  C = 2
-  CL = 3
-  CUDA = 4
-  #X86 = 1
-  #ARM = 2
-  MPPA = 3
-
   module PrivateStateAccessor
 
-    private_state_accessor :output, :lang, :architecture, :model, :address_size
-    private_state_accessor :default_int_size, :default_real_size
-    private_state_accessor :default_align
-    private_state_accessor :array_start
-    private_state_accessor :indent_level, :indent_increment
-    private_state_accessor :annotate_list
-    private_state_accessor :annotate_indepth_list
-    private_state_accessor :annotate_level
-    private_state_accessor :optimizer_log_file
-
-    private_boolean_state_accessor :replace_constants
-    private_boolean_state_accessor :default_int_signed
-    private_boolean_state_accessor :chain_code
-    private_boolean_state_accessor :debug
-    private_boolean_state_accessor :use_vla
-    private_boolean_state_accessor :decl_module
-    private_boolean_state_accessor :annotate
-    private_boolean_state_accessor :optimizer_log
-    private_boolean_state_accessor :disable_openmp
-
     private
     def push_env(*args)
       BOAST::push_env(*args)
@@ -67,69 +39,8 @@ module BOAST
 
   end
 
-  state_accessor :output, :lang, :architecture, :model, :address_size
-  state_accessor :default_int_size, :default_real_size
-  state_accessor :default_align
-  state_accessor :array_start
-  state_accessor :indent_level, :indent_increment
-  state_accessor :annotate_list
-  state_accessor :annotate_indepth_list
-  state_accessor :annotate_level
-  state_accessor :optimizer_log_file
-
-  boolean_state_accessor :replace_constants
-  boolean_state_accessor :default_int_signed
-  boolean_state_accessor :chain_code
-  boolean_state_accessor :debug
-  boolean_state_accessor :use_vla
-  boolean_state_accessor :decl_module
-  boolean_state_accessor :annotate
-  boolean_state_accessor :optimizer_log
-  boolean_state_accessor :disable_openmp
-
-  default_state_getter :address_size,          OS.bits/8
-  default_state_getter :lang,                  FORTRAN, '"const_get(#{envs})"', :BOAST_LANG
-  default_state_getter :model,                 "native"
-  default_state_getter :debug,                 false
-  default_state_getter :use_vla,               false
-  default_state_getter :replace_constants,     true
-  default_state_getter :default_int_signed,    true
-  default_state_getter :default_int_size,      4
-  default_state_getter :default_real_size,     8
-  default_state_getter :default_align,         1
-  default_state_getter :indent_level,          0
-  default_state_getter :indent_increment,      2
-  default_state_getter :array_start,           1
-  default_state_getter :annotate,              false
-  default_state_getter :annotate_list,         ["For"], '"#{envs}.split(\",\").collect { |arg| YAML::load(arg) }"'
-  default_state_getter :annotate_indepth_list, ["For"], '"#{envs}.split(\",\").collect { |arg| YAML::load(arg) }"'
-  default_state_getter :annotate_level,        0
-  default_state_getter :optimizer_log,         false
-  default_state_getter :optimizer_log_file,    nil
-  default_state_getter :disable_openmp,        false
-
-  alias use_vla_old? use_vla?
-  class << self
-    alias use_vla_old? use_vla?
-  end
-
-  def use_vla?
-    return false if [CL,CUDA].include?(lang)
-    return use_vla_old?
-  end
-
-  module_function :use_vla?
-
   module_function
 
-  def get_default_architecture
-    architecture = const_get(ENV["ARCHITECTURE"]) if ENV["ARCHITECTURE"]
-    architecture = const_get(ENV["ARCH"]) if not architecture and ENV["ARCH"]
-    return architecture if architecture
-    return ARM if YAML::load( OS.report )["host_cpu"].match("arm")
-    return X86
-  end
-
   def get_architecture_name
     case architecture
     when X86
@@ -160,7 +71,6 @@ module BOAST
 
   @@output = STDOUT
   @@chain_code = false
-  @@architecture = get_default_architecture
   @@decl_module = false
   @@annotate_numbers = Hash::new { |h,k| h[k] = 0 }
 

data/lib/BOAST/Language/Config.rb

@@ -0,0 +1,141 @@
+require 'os'
+require 'yaml'
+
+module BOAST
+  FORTRAN = 1
+  C = 2
+  CL = 3
+  CUDA = 4
+  X86 = 1
+  ARM = 2
+  MPPA = 3
+
+  @@boast_config = {
+    :fortran_line_length => 72
+  }
+
+  def assert_boast_config_dir
+    home_config_dir = ENV["XDG_CONFIG_HOME"]
+    home_config_dir = "#{Dir.home}/.config" if not home_config_dir
+    Dir.mkdir( home_config_dir ) if not File::exist?( home_config_dir )
+    return nil if not File::directory?(home_config_dir)
+    boast_config_dir = "#{home_config_dir}/BOAST"
+    Dir.mkdir( boast_config_dir ) if not File::exist?( boast_config_dir )
+    return nil if not File::directory?(boast_config_dir)
+    return boast_config_dir
+  end
+
+  module_function :assert_boast_config_dir
+
+  def read_boast_config
+    boast_config_dir = assert_boast_config_dir
+    return unless boast_config_dir
+    boast_config_file = "#{boast_config_dir}/config"
+    if File::exist?( boast_config_file ) then
+      File::open( boast_config_file, "r" ) { |f|
+        @@boast_config.update( YAML::load( f.read ) )
+      }
+    else
+      File::open( boast_config_file, "w" ) { |f|
+        f.write YAML::dump( @@boast_config )
+      }
+    end
+  end
+
+  module_function :read_boast_config
+
+  read_boast_config
+
+  module PrivateStateAccessor
+
+    private_state_accessor :output, :lang, :architecture, :model, :address_size
+    private_state_accessor :default_int_size, :default_real_size
+    private_state_accessor :default_align
+    private_state_accessor :array_start
+    private_state_accessor :indent_level, :indent_increment
+    private_state_accessor :annotate_list
+    private_state_accessor :annotate_indepth_list
+    private_state_accessor :annotate_level
+    private_state_accessor :optimizer_log_file
+
+    private_boolean_state_accessor :replace_constants
+    private_boolean_state_accessor :default_int_signed
+    private_boolean_state_accessor :chain_code
+    private_boolean_state_accessor :debug
+    private_boolean_state_accessor :use_vla
+    private_boolean_state_accessor :decl_module
+    private_boolean_state_accessor :annotate
+    private_boolean_state_accessor :optimizer_log
+    private_boolean_state_accessor :disable_openmp
+
+  end
+
+  state_accessor :output, :lang, :architecture, :model, :address_size
+  state_accessor :default_int_size, :default_real_size
+  state_accessor :default_align
+  state_accessor :array_start
+  state_accessor :indent_level, :indent_increment
+  state_accessor :annotate_list
+  state_accessor :annotate_indepth_list
+  state_accessor :annotate_level
+  state_accessor :optimizer_log_file
+
+  boolean_state_accessor :replace_constants
+  boolean_state_accessor :default_int_signed
+  boolean_state_accessor :chain_code
+  boolean_state_accessor :debug
+  boolean_state_accessor :use_vla
+  boolean_state_accessor :decl_module
+  boolean_state_accessor :annotate
+  boolean_state_accessor :optimizer_log
+  boolean_state_accessor :disable_openmp
+  boolean_state_accessor :boast_inspect
+
+
+  default_state_getter :address_size,          OS.bits/8
+  default_state_getter :lang,                  FORTRAN, '"const_get(#{envs})"', :BOAST_LANG
+  default_state_getter :model,                 "native"
+  default_state_getter :debug,                 false
+  default_state_getter :use_vla,               false
+  default_state_getter :replace_constants,     true
+  default_state_getter :default_int_signed,    true
+  default_state_getter :default_int_size,      4
+  default_state_getter :default_real_size,     8
+  default_state_getter :default_align,         1
+  default_state_getter :indent_level,          0
+  default_state_getter :indent_increment,      2
+  default_state_getter :array_start,           1
+  default_state_getter :annotate,              false
+  default_state_getter :annotate_list,         ["For"], '"#{envs}.split(\",\").collect { |arg| YAML::load(arg) }"'
+  default_state_getter :annotate_indepth_list, ["For"], '"#{envs}.split(\",\").collect { |arg| YAML::load(arg) }"'
+  default_state_getter :annotate_level,        0
+  default_state_getter :optimizer_log,         false
+  default_state_getter :optimizer_log_file,    nil
+  default_state_getter :disable_openmp,        false
+  default_state_getter :boast_inspect, false, nil, :INSPECT
+
+  alias use_vla_old? use_vla?
+  class << self
+    alias use_vla_old? use_vla?
+  end
+
+  def use_vla?
+    return false if [CL,CUDA].include?(lang)
+    return use_vla_old?
+  end
+
+  module_function :use_vla?
+
+  def get_default_architecture
+    architecture = const_get(ENV["ARCHITECTURE"]) if ENV["ARCHITECTURE"]
+    architecture = const_get(ENV["ARCH"]) if not architecture and ENV["ARCH"]
+    return architecture if architecture
+    return ARM if YAML::load( OS.report )["host_cpu"].match("arm")
+    return X86
+  end
+
+  module_function :get_default_architecture
+
+  @@architecture = get_default_architecture
+
+end

data/lib/BOAST/Language/Inspectable.rb

@@ -1,8 +1,5 @@
 module BOAST
 
-  boolean_state_accessor :boast_inspect
-  default_state_getter :boast_inspect, false, nil, :INSPECT
-
   module Inspectable
 
     def inspect

data/lib/BOAST/Language/Intrinsics.rb

@@ -5,9 +5,6 @@ require 'rgl/dijkstra'
 
 module BOAST
 
-  X86 = 1
-  ARM = 2
-
   native_flags = []
 
   if OS.mac? then

data/lib/BOAST/Language/State.rb

@@ -41,7 +41,8 @@ EOF
     envs = "ENV['#{env}']"
     s = <<EOF
   def get_default_#{arg}
-    #{arg} = #{default.inspect}
+    #{arg} = @@boast_config[#{arg.inspect}]
+    #{arg} = #{default.inspect} unless #{arg}
     #{arg} = #{get_env_string ? eval( "#{get_env_string}" ) : "YAML::load(#{envs})" } if #{envs}
     return #{arg}
   end

data/lib/BOAST/Runtime/CKernel.rb

@@ -88,7 +88,7 @@ module BOAST
     def method_missing(meth, *args, &block)
      if meth.to_s == "run" then
        build
-       run(*args,&block)
+       run(*args, &block)
      else
        super
      end

data/lib/BOAST/Runtime/CompiledRuntime.rb

@@ -190,6 +190,19 @@ EOF
 EOF
     end
 
+    def add_run_options
+      get_output.print <<EOF
+  VALUE _boast_run_opts;
+  _boast_run_opts = rb_const_get(rb_cObject, rb_intern("BOAST"));
+  _boast_run_opts = rb_funcall(_boast_run_opts, rb_intern("get_run_config"), 0);
+  if ( NUM2UINT(rb_funcall(_boast_run_opts, rb_intern("size"), 0)) > 0 ) {
+    if ( _boast_rb_opts != Qnil )
+      rb_funcall(_boast_run_opts, rb_intern("update"), 1, _boast_rb_opts);
+    _boast_rb_opts = _boast_run_opts;
+  }
+EOF
+    end
+
     def fill_decl_module_params
       push_env(:decl_module => true)
       @procedure.parameters.each { |param|
@@ -314,6 +327,8 @@ EOF
 
       fill_check_args
 
+      add_run_options
+
       fill_decl_module_params
 
       @probes.reverse.map(&:decl)

data/lib/BOAST/Runtime/Compilers.rb

@@ -112,7 +112,7 @@ module BOAST
     def setup_cuda_compiler(options, runner)
       cuda_compiler = options[:NVCC]
       cudaflags = options[:NVCCFLAGS]
-      cudaflags += " --compiler-options '-fPIC'"
+      cudaflags += " --compiler-options '-fPIC','-D_FORCE_INLINES'"
 
       rule ".#{RbConfig::CONFIG["OBJEXT"]}" => '.cu' do |t|
         cuda_call_string = "#{cuda_compiler} #{cudaflags} -c -o #{t.name} #{t.source}"

data/lib/BOAST/Runtime/Config.rb

@@ -31,6 +31,13 @@ module BOAST
     "icpc" => "-openmp"
   }
 
+  @@run_options = [
+    :PAPI
+  ]
+
+  @@run_config = {
+  }
+
   module PrivateStateAccessor
     private_boolean_state_accessor :verbose
     private_boolean_state_accessor :debug_source
@@ -52,13 +59,9 @@ module BOAST
 
   module_function
 
-  def read_boast_config
-    home_config_dir = ENV["XDG_CONFIG_HOME"]
-    home_config_dir = "#{Dir.home}/.config" if not home_config_dir
-    Dir.mkdir( home_config_dir ) if not File::exist?( home_config_dir )
-    return if not File::directory?(home_config_dir)
-    boast_config_dir = "#{home_config_dir}/BOAST"
-    Dir.mkdir( boast_config_dir ) if not File::exist?( boast_config_dir )
+  def read_boast_compiler_config
+    boast_config_dir = assert_boast_config_dir
+    return unless boast_config_dir
     compiler_options_file = "#{boast_config_dir}/compiler_options"
     if File::exist?( compiler_options_file ) then
       File::open( compiler_options_file, "r" ) { |f|
@@ -85,7 +88,7 @@ module BOAST
     @@compiler_default_options[:LD] = ENV["LD"] if ENV["LD"]
   end
 
-  read_boast_config
+  read_boast_compiler_config
 
   def get_openmp_flags
     return @@openmp_default_flags.clone
@@ -95,4 +98,27 @@ module BOAST
     return @@compiler_default_options.clone
   end
 
+  def read_boast_run_config
+    boast_config_dir = assert_boast_config_dir
+    run_config_file = "#{boast_config_dir}/run_config"
+    if File::exist?( run_config_file ) then
+      File::open( run_config_file, "r" ) { |f|
+        @@run_config.update( YAML::load( f.read ) )
+      }
+    else
+      File::open( run_config_file, "w" ) { |f|
+        f.write YAML::dump( @@run_config )
+      }
+    end
+    @@run_options.each { |o|
+      @@run_config[o] = YAML::load(ENV[o.to_s]) if ENV[o.to_s]
+    }
+  end
+
+  read_boast_run_config
+
+  def get_run_config
+    return @@run_config.clone
+  end
+
 end

data/lib/BOAST/Runtime/FFIRuntime.rb

@@ -31,68 +31,64 @@ module BOAST
         ffi_lib "#{library_path}"
         attach_function :#{method_name}, [ #{@procedure.parameters.collect{ |p| ":"+p.decl_ffi(false,@lang).to_s }.join(", ")} ], :#{@procedure.properties[:return] ? @procedure.properties[:return].type.decl_ffi(false,@lang) : "void" }
         def run(*args)
-          if args.length < @procedure.parameters.length or args.length > @procedure.parameters.length + 1 then
-            raise "Wrong number of arguments for \#{@procedure.name} (\#{args.length} for \#{@procedure.parameters.length})"
-          else
-            ev_set = nil
-            if args.length == @procedure.parameters.length + 1 then
-              options = args.last
-              if options[:PAPI] then
-                require 'PAPI'
-                ev_set = PAPI::EventSet::new
-                ev_set.add_named(options[:PAPI])
+          raise "Wrong number of arguments for \#{@procedure.name} (\#{args.length} for \#{@procedure.parameters.length})" if args.length < @procedure.parameters.length or args.length > @procedure.parameters.length + 1
+          ev_set = nil
+          options = BOAST::get_run_config
+          options.update(args.last) if args.length == @procedure.parameters.length + 1
+          if options[:PAPI] then
+            require 'PAPI'
+            ev_set = PAPI::EventSet::new
+            ev_set.add_named(options[:PAPI])
+          end
+          t_args = []
+          r_args = {}
+          if @lang == FORTRAN then
+            @procedure.parameters.each_with_index { |p, i|
+              if p.decl_ffi(true,@lang) != :pointer then
+                arg_p = FFI::MemoryPointer::new(p.decl_ffi(true, @lang))
+                arg_p.send("write_\#{p.decl_ffi(true, @lang)}",args[i])
+                t_args.push(arg_p)
+                r_args[p] = arg_p if p.scalar_output?
+              else
+                t_args.push( args[i] )
               end
-            end
-            t_args = []
-            r_args = {}
-            if @lang == FORTRAN then
-              @procedure.parameters.each_with_index { |p, i|
-                if p.decl_ffi(true,@lang) != :pointer then
-                  arg_p = FFI::MemoryPointer::new(p.decl_ffi(true, @lang))
-                  arg_p.send("write_\#{p.decl_ffi(true, @lang)}",args[i])
-                  t_args.push(arg_p)
-                  r_args[p] = arg_p if p.scalar_output?
-                else
-                  t_args.push( args[i] )
-                end
-              }
-            else
-              @procedure.parameters.each_with_index { |p, i|
-                if p.scalar_output? then
-                  arg_p = FFI::MemoryPointer::new(p.decl_ffi(true, @lang))
-                  arg_p.send("write_\#{p.decl_ffi(true,@lang)}",args[i])
-                  t_args.push(arg_p)
-                  r_args[p] = arg_p
-                else
-                  t_args.push( args[i] )
-                end
-              }
-            end
-            results = {}
-            counters = nil
-            ev_set.start if ev_set
-            begin
-              start = Time::new
-              ret = #{method_name}(*t_args)
-              stop = Time::new
-            ensure
-              if ev_set then
-                counters = ev_set.stop
-                ev_set.cleanup
-                ev_set.destroy
+            }
+          else
+            @procedure.parameters.each_with_index { |p, i|
+              if p.scalar_output? then
+                arg_p = FFI::MemoryPointer::new(p.decl_ffi(true, @lang))
+                arg_p.send("write_\#{p.decl_ffi(true,@lang)}",args[i])
+                t_args.push(arg_p)
+                r_args[p] = arg_p
+              else
+                t_args.push( args[i] )
               end
+            }
+          end
+          results = {}
+          counters = nil
+          ev_set.start if ev_set
+          begin
+            start = Time::new
+            ret = #{method_name}(*t_args)
+            stop = Time::new
+          ensure
+            if ev_set then
+              counters = ev_set.stop
+              ev_set.cleanup
+              ev_set.destroy
             end
-            results = { :start => start, :stop => stop, :duration => stop - start, :return => ret }
-            results[:PAPI] = Hash[[options[:PAPI]].flatten.zip(counters)] if ev_set
-            if r_args.length > 0 then
-              ref_return = {}
-              r_args.each { |p, p_arg|
-                ref_return[p.name.to_sym] = p_arg.send("read_\#{p.decl_ffi(true, @lang)}")
-              }
-              results[:reference_return] = ref_return
-            end
-            return results
           end
+          results = { :start => start, :stop => stop, :duration => stop - start, :return => ret }
+          results[:PAPI] = Hash[[options[:PAPI]].flatten.zip(counters)] if ev_set
+          if r_args.length > 0 then
+            ref_return = {}
+            r_args.each { |p, p_arg|
+              ref_return[p.name.to_sym] = p_arg.send("read_\#{p.decl_ffi(true, @lang)}")
+            }
+            results[:reference_return] = ref_return
+          end
+          return results
         end
       end
 EOF

data/lib/BOAST/Runtime/OpenCLRuntime.rb

@@ -1,7 +1,10 @@
 module BOAST
   module OpenCLRuntime
 
-   def select_cl_platform(options)
+    attr_reader :context
+    attr_reader :queue
+
+    def select_cl_platforms(options)
       platforms = OpenCL::get_platforms
       if options[:platform_vendor] then
         platforms.select!{ |p|
@@ -17,53 +20,41 @@ module BOAST
           p.name.match(options[:CLPLATFORM])
         }
       end
-      return platforms.first
+      return platforms
     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.select!{ |d|
-          d.name.match(options[:device_name])
-        }
-      elsif options[:CLDEVICE] then
+    def select_cl_device(options, context = nil)
+      return options[:CLDEVICE] if options[:CLDEVICE] and options[:CLDEVICE].is_a?(OpenCL::Device)
+      devices = nil
+      if context then
+        devices = context.devices
+      else
+        platforms = select_cl_platforms(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 = platforms.collect { |plt| plt.devices(type) }
+        devices.flatten!
+      end
+      name_pattern = options[:device_name]
+      name_pattern = options[:CLDEVICE] unless name_pattern
+      if name_pattern then
         devices.select!{ |d|
-          d.name.match(options[:CLDEVICE])
+          d.name.match(name_pattern)
         }
       end
       return devices.first
     end
 
-    def init_opencl_types
-      @@opencl_real_types = {
-        2 => OpenCL::Half1,
-        4 => OpenCL::Float1,
-        8 => OpenCL::Double1
-      }
-
-      @@opencl_int_types = {
-        true => {
-          1 => OpenCL::Char1,
-          2 => OpenCL::Short1,
-          4 => OpenCL::Int1,
-          8 => OpenCL::Long1
-        },
-        false => {
-          1 => OpenCL::UChar1,
-          2 => OpenCL::UShort1,
-          4 => OpenCL::UInt1,
-          8 => OpenCL::ULong1
-        }
-      }
-    end
-
     def init_opencl(options)
       require 'opencl_ruby_ffi'
-      init_opencl_types
-      device = select_cl_device(options)
-      @context = OpenCL::create_context([device])
+      require 'BOAST/Runtime/OpenCLTypes.rb'
+      device = nil
+      if options[:CLCONTEXT] then
+        @context = options[:CLCONTEXT]
+        device = select_cl_device(options, @context)
+      else
+        device = select_cl_device(options)
+        @context = OpenCL::create_context([device])
+      end
       program = @context.create_program_with_source([@code.string])
       opts = options[:CLFLAGS]
       begin
@@ -88,6 +79,7 @@ module BOAST
     end
 
     def create_opencl_array(arg, parameter)
+      return arg if arg.kind_of? OpenCL::Mem
       if parameter.direction == :in then
         flags = OpenCL::Mem::Flags::READ_ONLY
       elsif parameter.direction == :out then
@@ -107,9 +99,9 @@ module BOAST
 
     def create_opencl_scalar(arg, parameter)
       if parameter.type.is_a?(Real) then
-        return @@opencl_real_types[parameter.type.size]::new(arg)
+        return OPENCL_REAL_TYPES[parameter.type.size]::new(arg)
       elsif parameter.type.is_a?(Int) then
-        return @@opencl_int_types[parameter.type.signed][parameter.type.size]::new(arg)
+        return OPENCL_INT_TYPES[parameter.type.signed][parameter.type.size]::new(arg)
       else
         return arg
       end
@@ -124,6 +116,7 @@ module BOAST
     end
 
     def read_opencl_param(param, arg, parameter)
+      return arg if arg.kind_of? OpenCL::Mem
       if parameter.texture then
         @queue.enqueue_read_image( param, arg, :blocking => true )
       else
@@ -140,8 +133,8 @@ module BOAST
 def self.run(*args)
   raise "Wrong number of arguments \#{args.length} for #{@procedure.parameters.length}" if args.length > #{@procedure.parameters.length+1} or args.length < #{@procedure.parameters.length}
   params = []
-  opts = {}
-  opts = args.pop if args.length == #{@procedure.parameters.length+1}
+  opts = BOAST::get_run_config
+  opts = opts.update(args.pop) if args.length == #{@procedure.parameters.length+1}
   @procedure.parameters.each_index { |i|
     params[i] = create_opencl_param( args[i], @procedure.parameters[i] )
   }
@@ -150,8 +143,10 @@ def self.run(*args)
   }
   gws = opts[:global_work_size]
   if not gws then
+    raise ":global_work_size or :block_number are required to run OpenCL kernels!" unless opts[:block_number]
     gws = []
     opts[:block_number].each_index { |i|
+      raise "if using :block_number, :block_size is required  to run OpenCL kernels!" unless opts[:block_size]
       gws.push(opts[:block_number][i]*opts[:block_size][i])
     }
   end
@@ -165,6 +160,7 @@ def self.run(*args)
       read_opencl_param( params[i], args[i], @procedure.parameters[i] )
     end
   }
+  @queue.finish
   result = {}
   result[:start] = event.profiling_command_start
   result[:end] = event.profiling_command_end

data/lib/BOAST/Runtime/OpenCLTypes.rb

@@ -0,0 +1,24 @@
+module BOAST
+  module OpenCLRuntime
+    OPENCL_REAL_TYPES = {
+      2 => OpenCL::Half1,
+      4 => OpenCL::Float1,
+      8 => OpenCL::Double1
+    }
+
+    OPENCL_INT_TYPES = {
+      true => {
+        1 => OpenCL::Char1,
+        2 => OpenCL::Short1,
+        4 => OpenCL::Int1,
+        8 => OpenCL::Long1
+      },
+      false => {
+        1 => OpenCL::UChar1,
+        2 => OpenCL::UShort1,
+        4 => OpenCL::UInt1,
+        8 => OpenCL::ULong1
+      }
+    }
+  end
+end

data/lib/BOAST.rb

@@ -1,5 +1,6 @@
 require 'BOAST/Language/Error.rb'
 require 'BOAST/Language/State.rb'
+require 'BOAST/Language/Config.rb'
 require 'BOAST/Language/Functors.rb'
 require 'BOAST/Language/Inspectable.rb'
 require 'BOAST/Language/Comment.rb'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: BOAST
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Brice Videau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-18 00:00:00.000000000 Z
+date: 2016-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: narray
@@ -204,6 +204,7 @@ files:
 - lib/BOAST/Language/Case.rb
 - lib/BOAST/Language/CodeBlock.rb
 - lib/BOAST/Language/Comment.rb
+- lib/BOAST/Language/Config.rb
 - lib/BOAST/Language/ControlStructure.rb
 - lib/BOAST/Language/DataTypes.rb
 - lib/BOAST/Language/Error.rb
@@ -239,10 +240,11 @@ files:
 - lib/BOAST/Runtime/MPPARuntime.rb
 - lib/BOAST/Runtime/NonRegression.rb
 - lib/BOAST/Runtime/OpenCLRuntime.rb
+- lib/BOAST/Runtime/OpenCLTypes.rb
 - lib/BOAST/Runtime/Probe.rb
 homepage: https://github.com/Nanosim-LIG/boast
 licenses:
-- BSD
+- BSD-2-Clause
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -260,8 +262,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: BOAST is a computing kernel metaprogramming tool.
 test_files: []
+has_rdoc: false