BOAST 0.1 → 0.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 70e302d3019847a191f670dd7c3b9988a2fc1e02
+  data.tar.gz: cacec85165ae25deb86319b6c35e18220f76e9c9
+SHA512:
+  metadata.gz: 493beab807ea8b2d932f2b916faae3443f7b2193e894caf1865ae8d0463d8baaa639e10cd04129baae4dd637f2657e41987490982e281689d816e27b6a3ccd4a
+  data.tar.gz: 940fcbb439c4dcff8b3c4ef1dc9fc37f282407ad777b99a277c946e32be585e4f3009f16039b2380ace20b1979babec8bd566f599c7af94413f8d7cf56200de7

data/BOAST.gemspec

@@ -1,12 +1,12 @@
 Gem::Specification.new do |s|
   s.name = 'BOAST'
-  s.version = "0.1"
+  s.version = "0.2"
   s.author = "Brice Videau"
   s.email = "brice.videau@imag.fr"
   s.homepage = "https://forge.imag.fr/projects/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 = %w( BOAST.gemspec LICENSE lib/BOAST.rb lib/BOAST/Algorithm.rb lib/BOAST/CKernel.rb lib/BOAST/BOAST_OpenCL.rb )
+  s.files = %w( BOAST.gemspec LICENSE lib/BOAST.rb lib/BOAST/Algorithm.rb lib/BOAST/CKernel.rb lib/BOAST/BOAST_OpenCL.rb lib/BOAST/Transitions.rb)
   s.has_rdoc = true
   s.license = 'BSD'
   s.required_ruby_version = '>= 1.9.3'

data/lib/BOAST/Algorithm.rb

@@ -19,6 +19,8 @@ end
 
 module BOAST
 
+  extend TypeTransition
+  
   FORTRAN = 1
   C = 2
   CL = 3
@@ -36,7 +38,6 @@ module BOAST
 
   @@env = Hash.new{|h, k| h[k] = []}
 
-
   def BOAST::push_env(vars = {})
     vars.each { |key,value|
       var = nil
@@ -267,24 +268,57 @@ module BOAST
     def -@
       return Expression::new("-",nil,self)
     end
-   
+
+    def to_var
+      op1 = nil
+      op1 = @operand1.to_var if @operand1 and @operand1.respond_to?(:to_var)
+      op2 = nil
+      op2 = @operand2.to_var if @operand2 and @operand2.respond_to?(:to_var)
+      res_exp = Expression::new(@operator, op1.nil? ? @operand1 : op1, op2.nil? ? @operand2 : op2)
+      if op1 and op2 then
+        r_t, oper = BOAST::transition(op1, op2, @operator)
+        return r_t.copy("#{res_exp}", :const => nil, :constant => nil)
+      elsif op1
+        return op1.copy("#{res_exp}", :const => nil, :constant => nil)
+      elsif op2
+        return op2.copy("#{res_exp}", :const => nil, :constant => nil)
+      else
+        STDERR.puts "#{@operand1} #{@operand2}"
+        raise "Expression on no operand!"
+      end
+    end
+ 
     def to_str
+      op1 = nil
+      op1 = @operand1.to_var if @operand1 and @operand1.respond_to?(:to_var)
+      op2 = nil
+      op2 = @operand2.to_var if @operand2 and @operand2.respond_to?(:to_var)
+      if op1 and op2 then
+        r_t, oper = BOAST::transition(op1, op2, @operator)
+      else
+        oper = @operator
+      end
+
+      op1 = @operand1 if not op1
+      op2 = @operand2 if not op2
+     
       s = ""
-      if @operand1 then
-        s += "(" if (@operator == "*" or @operator == "/") 
-        s += @operand1.to_s
-        s += ")" if (@operator == "*" or @operator == "/") 
+      if op1 then
+        s += "(" if (oper == "*" or oper == "/") 
+        s += op1.to_s
+        s += ")" if (oper == "*" or oper == "/") 
       end        
-      s += " " unless @operator.to_s == "++" or @operator.to_s == "."
-      s += @operator.to_s 
-      s += " " unless @operator.to_s == "." or @operator.to_s == "&" or ( @operator.to_s == "*" and @operand1.nil? )
-      if @operand2 then
-        s += "(" if (@operator == "*" or @operator == "/" or @operator == "-") 
-        s += @operand2.to_s
-        s += ")" if (@operator == "*" or @operator == "/" or @operator == "-") 
+      s += " " unless oper == "++" or oper == "."
+      s += oper 
+      s += " " unless oper == "." or oper == "&" or ( oper == "*" and op1.nil? )
+      if op2 then
+        s += "(" if (oper == "*" or oper == "/" or oper == "-") 
+        s += op2.to_s
+        s += ")" if (oper == "*" or oper == "/" or oper == "-") 
       end
       return s
     end
+
     def print(final=true)
       s=""
       s += " "*BOAST::get_indent_level if final
@@ -320,6 +354,11 @@ module BOAST
       @source = source
       @indexes = indexes
     end
+
+    def to_var
+      return @source.copy("#{self}", :const => nil, :constant => nil, :dim => nil, :dimension => nil)
+    end
+
     def to_s
       self.to_str
     end
@@ -532,7 +571,7 @@ module BOAST
     attr_reader :local
     attr_reader :texture
     attr_reader :sampler
-    attr_reader :replace_constant
+    attr_accessor :replace_constant
     attr_accessor :force_replace_constant
 
     def initialize(name,type,hash={})
@@ -558,8 +597,12 @@ module BOAST
       @hash = hash
     end
 
-    def copy(name=@name)
-      return Variable::new(name, @type.class, @hash)
+    def copy(name=@name,options={})
+      hash = @hash.clone
+      options.each { |k,v|
+        hash[k] = v
+      }
+      return Variable::new(name, @type.class, hash)
     end
   
     def to_s
@@ -575,6 +618,10 @@ module BOAST
       return @name.to_str
     end
 
+    def to_var
+      return self
+    end
+
     def ===(x)
       return Expression::new("=",self,x)
     end
@@ -1055,7 +1102,7 @@ module BOAST
       end
     end
     def decl
-      return "integer(kind=#{BOAST::get_default_int_signed})" if BOAST::get_lang == FORTRAN
+      return "integer(kind=#{BOAST::get_default_int_size})" if BOAST::get_lang == FORTRAN
       if not @signed then
         return "size_t" if [C, CL, CUDA].include?( BOAST::get_lang )
       else
@@ -1213,6 +1260,8 @@ module BOAST
   end
  
   class FuncCall
+    @return_type
+    @options
     def self.parens(*args,&block)
       return self::new(*args,&block)
     end
@@ -1223,7 +1272,24 @@ module BOAST
 
     def initialize(func_name, *args)
       @func_name = func_name
-      @args = args
+      if args.last.kind_of?(Hash) then
+        @options = args.last
+        @args = args[0..-2]
+      else
+        @args = args
+      end
+      @return_type = @options[:returns] if @options
+    end
+
+    def to_var
+      if @return_type then
+        if @return_type.kind_of?(Variable)
+          return @return_type.copy("#{self}")
+        else
+          return Variable::new("#{self}", @return_type)
+        end
+      end
+      return nil
     end
       
     def to_s
@@ -1755,5 +1821,32 @@ module BOAST
   Var = Variable
   Dim = Dimension
   Call = FuncCall
+
+  set_transition(Int, Int, :default, Int)
+  set_transition(Real, Int, :default, Real)
+  set_transition(Int, Real, :default, Real)
+  set_transition(Real, Real, :default, Real)
+  set_transition(Sizet, Sizet, :default, Sizet)
+  set_transition(Sizet, Int, :default, Sizet)
+  set_transition(Int, Sizet, :default, Sizet)
+  
 end
+
 ConvolutionGenerator = BOAST
+
+class Integer
+  def to_var
+    if self < 0 then
+       return BOAST::Variable::new("#{self}", BOAST::Int, :signed => true, :constant => self )
+     else
+       return BOAST::Variable::new("#{self}", BOAST::Int, :signed => false, :constant => self )
+    end
+  end
+end
+
+class Float
+  def to_var
+    return BOAST::Variable::new("#{self}", BOAST::Real, :constant => self )
+  end
+end
+

data/lib/BOAST/BOAST_OpenCL.rb

@@ -1,6 +1,11 @@
 module BOAST
   @@ocl_cuda_dim_assoc = { 0 => "x", 1 => "y", 2 => "z" }
 
+  @@cuda_threadIdx = CStruct("threadIdx",:type_name => "cuda_trheadIdx", :members => [Int("x", :signed => false),Int("y", :signed => false),Int("z", :signed => false)])
+  @@cuda_blockIdx = CStruct("blockIdx",:type_name => "cuda_blockIdx", :members => [Int("x", :signed => false),Int("y", :signed => false),Int("z", :signed => false)])
+  @@cuda_blockDim = CStruct("blockDim",:type_name => "cuda_blockDim", :members => [Int("x", :signed => false),Int("y", :signed => false),Int("z", :signed => false)])
+  @@cuda_gridDim = CStruct("gridDim",:type_name => "cuda_gridDim", :members => [Int("x", :signed => false),Int("y", :signed => false),Int("z", :signed => false)])
+
   def BOAST::barrier(*locality)
     if @@lang == CL then
       loc=""
@@ -23,7 +28,7 @@ module BOAST
 
   def BOAST::get_work_dim
     if @@lang == CL then
-      return FuncCall::new("get_work_dim")
+      return FuncCall::new("get_work_dim", :returns => Int("wd", :signed => false))
     else
       raise "Unsupported language!"
     end
@@ -31,11 +36,11 @@ module BOAST
   
   def BOAST::get_global_size(dim)
     if @@lang == CL then
-      return FuncCall::new("get_global_size",dim)
+      return FuncCall::new("get_global_size", dim, :returns => Sizet)
     elsif @@lang == CUDA then
       d = @@ocl_cuda_dim_assoc[dim]
       raise "Unsupported dimension!" if not d
-      return Expression::new(".", "gridDim", d)*Expression::new(".", "blockDim", d)
+      return eval "@@cuda_gridDim.#{d}*@@cuda_blockDim.#{d}"
     else
       raise "Unsupported language!"
     end
@@ -43,11 +48,11 @@ module BOAST
 
   def BOAST::get_global_id(dim)
     if @@lang == CL then
-      return FuncCall::new("get_global_id",dim)
+      return FuncCall::new("get_global_id",dim, :returns => Sizet)
     elsif @@lang == CUDA then
       d = @@ocl_cuda_dim_assoc[dim]
       raise "Unsupported dimension!" if not d
-      return Expression::new(".", "threadIdx", d)+Expression::new(".", "blockIdx", d)*Expression::new(".", "blockDim", d)
+      return eval "@@cuda_threadIdx.#{d}+@@cuda_blockIdx.#{d}*@@cuda_blockDim.#{d}"
     else
       raise "Unsupported language!"
     end
@@ -55,11 +60,11 @@ module BOAST
 
   def BOAST::get_local_size(dim)
     if @@lang == CL then
-      return FuncCall::new("get_local_size",dim)
+      return FuncCall::new("get_local_size",dim, :returns => Sizet)
     elsif @@lang == CUDA then
       d = @@ocl_cuda_dim_assoc[dim]
       raise "Unsupported dimension!" if not d
-      return Expression::new(".", "blockDim", d)
+      return eval "@@cuda_blockDim.#{d}"
     else
       raise "Unsupported language!"
     end
@@ -67,11 +72,11 @@ module BOAST
 
   def BOAST::get_local_id(dim)
     if @@lang == CL then
-      return FuncCall::new("get_local_id",dim)
+      return FuncCall::new("get_local_id",dim, :returns => Sizet)
     elsif @@lang == CUDA then
       d = @@ocl_cuda_dim_assoc[dim]
       raise "Unsupported dimension!" if not d
-      return Expression::new(".", "threadIdx", d)
+      return eval "@@cuda_threadIdx.#{d}"
     else
       raise "Unsupported language!"
     end
@@ -79,11 +84,11 @@ module BOAST
   
   def BOAST::get_num_groups(dim)
     if @@lang == CL then
-      return FuncCall::new("get_num_groups",dim)
+      return FuncCall::new("get_num_groups",dim, :returns => Sizet)
     elsif @@lang == CUDA then
       d = @@ocl_cuda_dim_assoc[dim]
       raise "Unsupported dimension!" if not d
-      return Expression::new(".", "gridDim", d)
+      return eval "@@cuda_gridDim.#{d}"
     else
       raise "Unsupported language!"
     end
@@ -91,11 +96,11 @@ module BOAST
 
   def BOAST::get_group_id(dim)
     if @@lang == CL then
-      return FuncCall::new("get_group_id",dim)
+      return FuncCall::new("get_group_id",dim, :returns => Sizet)
     elsif @@lang == CUDA then
       d = @@ocl_cuda_dim_assoc[dim]
       raise "Unsupported dimension!" if not d
-      return Expression::new(".", "blockIdx", d)
+      return eval "@@cuda_blockIdx.#{d}"
     else
       raise "Unsupported language!"
     end

data/lib/BOAST/CKernel.rb

@@ -88,6 +88,7 @@ module BOAST
 
       includes = "-I#{RbConfig::CONFIG["archdir"]}"
       includes += " -I#{RbConfig::CONFIG["rubyhdrdir"]} -I#{RbConfig::CONFIG["rubyhdrdir"]}/#{RbConfig::CONFIG["arch"]}"
+      includes += " -I#{RbConfig::CONFIG["rubyarchhdrdir"]}" if RbConfig::CONFIG["rubyarchhdrdir"]
       ld_flags += " -L#{RbConfig::CONFIG["libdir"]} #{RbConfig::CONFIG["LIBRUBYARG"]} -lrt"
       ld_flags += " -lcudart" if @lang == BOAST::CUDA
       narray_path = nil

data/lib/BOAST/Transitions.rb

@@ -0,0 +1,47 @@
+module BOAST
+  module TypeTransition
+    @@transitions = Hash::new { |hash, key| hash[key] = Hash::new{ |has, ke| has[ke] = Hash::new } }
+    def get_transition(type1, type2, operator)
+      #STDERR.puts @@transitions.inspect
+      match_type1 = @@transitions.keys.select { |e1| true if type1 <= e1 }
+      raise "Unknown type!" if match_type1.length == 0
+      match_type1.sort!
+      #STDERR.puts match_type1.inspect
+      match_type1.each { |t1|
+        match_type2 = @@transitions[t1].keys.select{ |e2| true if type2 <= e2 }
+        match_type2.sort!
+        #STDERR.puts match_type2.inspect
+        match_type2.each { |t2|
+          #STDERR.puts @@transitions[t1][t2].inspect
+          return [@@transitions[t1][t2][operator], operator] if @@transitions[t1][t2][operator]
+          return [@@transitions[t1][t2][:default], operator] if @@transitions[t1][t2][:default]
+        }
+      }
+      raise "Unresolvable transition!"
+    end
+
+    def set_transition(type1, type2, operator, return_type)
+      @@transitions[type1][type2][operator] = return_type
+    end
+
+    def transition(var1, var2, operator)
+      signed = false
+      size = nil
+      return_type, operator = get_transition(var1.type.class, var2.type.class, operator)
+      #STDERR.puts "#{return_type} : #{var1.type.class} #{operator} #{var2.type.class}"
+      if var1.type.class <= return_type and var2.type.class <= return_type then
+        signed = signed or var1.type.signed if var1.type.respond_to?(:signed)
+        signed = signed or var2.type.signed if var2.type.respond_to?(:signed)
+        if var1.type.respond_to?(:size) and var2.type.respond_to?(:size) then
+          size = [var1.type.size, var2.type.size].max
+        end
+        [BOAST::Variable::new("dummy", return_type, :size => size, :signed => signed), operator]
+      elsif var1.type.class <= return_type then
+        return [var1, operator]
+      elsif var2.type.class <= return_type then
+        return [var2, operator]
+      end
+    end
+  end
+
+end

data/lib/BOAST.rb

@@ -1,3 +1,4 @@
+require 'BOAST/Transitions.rb'
 require 'BOAST/Algorithm.rb'
 require 'BOAST/CKernel.rb'
 require 'BOAST/BOAST_OpenCL.rb'

metadata

@@ -1,62 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: BOAST
 version: !ruby/object:Gem::Version
-  version: '0.1'
-  prerelease: 
+  version: '0.2'
 platform: ruby
 authors:
 - Brice Videau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-25 00:00:00.000000000 Z
+date: 2014-04-12 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: opencl_ruby_ffi
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0.4'
 - !ruby/object:Gem::Dependency
   name: systemu
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.2.0
 description: BOAST aims at providing a framework to metaprogram, benchmark and validate
@@ -72,29 +65,29 @@ files:
 - lib/BOAST/Algorithm.rb
 - lib/BOAST/CKernel.rb
 - lib/BOAST/BOAST_OpenCL.rb
+- lib/BOAST/Transitions.rb
 homepage: https://forge.imag.fr/projects/boast/
 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.9.3
 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.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: BOAST is a computing kernel metaprogramming tool.
 test_files: []