BOAST 2.0.2 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53cb9d1326b52f2ff8125f0e5a3e3c7423f4ccc1
-  data.tar.gz: 4f945e013c4b177f9a86363ad0896e84a7bc5dc4
+  metadata.gz: c229720903f977f8eecf78d3d66dd4471d8a8f28
+  data.tar.gz: ece1f7a741ecd2025e65df571ed374931f79fd2b
 SHA512:
-  metadata.gz: f5f93853b1709fbddce9fa34316a05e8314c9f3716ac3adb6da40dc64b36be806af8ce3542ad565e80aeb0edb5205312a80b19af110ee4156ffd337c15f6f9f9
-  data.tar.gz: ead3cd7fcebd87cfd9e088003b3155e44e807be24f4706f92ce7519a7717f8681877db8da6a90c09c0cd60a48a99bdd4c75c83ba2daa0dbe2fe43915cb363012
+  metadata.gz: ac2212627bbf0ff41330224ddade322cf51e73ac55c888d42fb5795985632db72759030f2f464edbc5f209fe408a1f5d2d22729bf8920d83e86fd450a2dcbf7b
+  data.tar.gz: f3af938b84253de6905d7984dc8d8954d5a58ca0337dda7c766fe2fa5f29b14025a6dd34425dfaa81a713f1e456a96034a5b39f881a952e97962cd24a23e415a

data/BOAST.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'BOAST'
-  s.version = "2.0.2"
+  s.version = "2.1.0"
   s.author = "Brice Videau"
   s.email = "brice.videau@imag.fr"
   s.homepage = "https://github.com/Nanosim-LIG/boast"
@@ -9,13 +9,14 @@ Gem::Specification.new do |s|
   s.files = Dir['BOAST.gemspec', 'LICENSE', 'README.md', 'lib/**/*']
   s.has_rdoc = false
   s.license = 'BSD-2-Clause'
-  s.required_ruby_version = '>= 1.9.3'
+  s.required_ruby_version = '>= 2.0.0'
   s.add_dependency 'narray', '~> 0.6.0', '>=0.6.0.8'
   s.add_dependency 'narray_ffi', '~> 1.2', '>=1.2.0'
   s.add_dependency 'opencl_ruby_ffi', '~> 1.3', '>=1.3.2'
   s.add_dependency 'systemu', '~> 2', '>=2.2.0'
   s.add_dependency 'os', '~> 0.9', '>=0.9.6'
-  s.add_dependency 'PAPI', '~> 0', '>=0.101'
+  s.add_dependency 'PAPI', '~> 1.0', '>=1.0.0'
+  s.add_dependency 'hwloc', '~> 0.3', '>=0.3.0'
   s.add_dependency 'ffi', '~> 1.9', '>=1.9.3'
   s.add_dependency 'rgl', '~> 0.5', '>=0.5.1'
   s.add_dependency 'rake', '>=0.9'

data/lib/BOAST.rb

@@ -44,6 +44,7 @@ require 'BOAST/Runtime/FORTRANRuntime.rb'
 require 'BOAST/Runtime/FFIRuntime.rb'
 require 'BOAST/Runtime/MPPARuntime.rb'
 require 'BOAST/Runtime/CKernel.rb'
+require 'BOAST/Runtime/CoExecute.rb'
 require 'BOAST/Runtime/NonRegression.rb'
 require 'BOAST/Runtime/RubyEnergyMonitor.rb'
 require 'BOAST/Language/Parens.rb'

data/lib/BOAST/Language/Arithmetic.rb

@@ -132,7 +132,7 @@ module BOAST
     alias | or
 
     def cast(type)
-      return type.copy("(#{type.type.decl} *)#{self}")
+      return type.copy("(#{type.type.decl}#{type.dimension? ? " *" : ""})#{self}")
     end
 
     def components( range )
@@ -151,5 +151,9 @@ module BOAST
       end
     end
 
+    def coerce(other)
+      return [other.to_var, self]
+    end
+
   end
 end

data/lib/BOAST/Language/BOAST_OpenCL.rb

@@ -42,7 +42,7 @@ module BOAST
         return FuncCall::new("get_global_size", dim, :return => Sizet)
       elsif lang == CUDA then
         d = OCL_CUDA_DIM_ASSOC[dim]
-        raise "Unsupported dimension!" if not d
+        raise "Unsupported dimension!" unless d
         return eval "CUDA_GRIDDIM.#{d}*CUDA_BLOCKDIM.#{d}"
       else
         raise "Unsupported language!"
@@ -54,7 +54,7 @@ module BOAST
         return FuncCall::new("get_global_id",dim, :return => Sizet)
       elsif lang == CUDA then
         d = OCL_CUDA_DIM_ASSOC[dim]
-        raise "Unsupported dimension!" if not d
+        raise "Unsupported dimension!" unless d
         return eval "CUDA_THREADIDX.#{d}+CUDA_BLOCKIDX.#{d}*CUDA_BLOCKDIM.#{d}"
       else
         raise "Unsupported language!"
@@ -66,7 +66,7 @@ module BOAST
         return FuncCall::new("get_local_size",dim, :return => Sizet)
       elsif lang == CUDA then
         d = OCL_CUDA_DIM_ASSOC[dim]
-        raise "Unsupported dimension!" if not d
+        raise "Unsupported dimension!" unless d
         return eval "CUDA_BLOCKDIM.#{d}"
       else
         raise "Unsupported language!"
@@ -78,7 +78,7 @@ module BOAST
         return FuncCall::new("get_local_id",dim, :return => Sizet)
       elsif lang == CUDA then
         d = OCL_CUDA_DIM_ASSOC[dim]
-        raise "Unsupported dimension!" if not d
+        raise "Unsupported dimension!" unless d
         return eval "CUDA_THREADIDX.#{d}"
       else
         raise "Unsupported language!"
@@ -90,7 +90,7 @@ module BOAST
         return FuncCall::new("get_num_groups",dim, :return => Sizet)
       elsif lang == CUDA then
         d = OCL_CUDA_DIM_ASSOC[dim]
-        raise "Unsupported dimension!" if not d
+        raise "Unsupported dimension!" unless d
         return eval "CUDA_GRIDDIM.#{d}"
       else
         raise "Unsupported language!"
@@ -102,7 +102,7 @@ module BOAST
         return FuncCall::new("get_group_id",dim, :return => Sizet)
       elsif lang == CUDA then
         d = OCL_CUDA_DIM_ASSOC[dim]
-        raise "Unsupported dimension!" if not d
+        raise "Unsupported dimension!" unless d
         return eval "CUDA_BLOCKIDX.#{d}"
       else
         raise "Unsupported language!"

data/lib/BOAST/Language/Case.rb

@@ -35,17 +35,17 @@ module BOAST
     def to_s
       s = ""
       if @constants then
-        s += case_string(@constants)
+        s << case_string(@constants)
       else
-        s += default_string
+        s << default_string
       end
       return s
     end
 
     def open
       s = ""
-      s += indent
-      s += to_s
+      s << indent
+      s << to_s
       output.puts s
       increment_indent_level
       return self
@@ -54,8 +54,8 @@ module BOAST
     def close
       if @constants and break_string then
         s = ""
-        s += indent
-        s += break_string
+        s << indent
+        s << break_string
         output.puts s
       end
       decrement_indent_level
@@ -117,14 +117,14 @@ module BOAST
 
     def to_s
       s = ""
-      s += switch_string(@expression)
+      s << switch_string(@expression)
       return s
     end
 
     def open
       s = ""
-      s += indent
-      s += to_s
+      s << indent
+      s << to_s
       output.puts s
       increment_indent_level
       return self
@@ -145,8 +145,8 @@ module BOAST
     def close
       decrement_indent_level
       s = ""
-      s += indent
-      s += end_string
+      s << indent
+      s << end_string
       output.puts s
       return self
     end

data/lib/BOAST/Language/Comment.rb

@@ -26,13 +26,13 @@ module BOAST
 
     def to_s_fortran
       s = ""
-      @comment.each_line { |l| s += "! #{l}" }
+      @comment.each_line { |l| s << "! #{l}" }
       return s
     end
 
     def to_s_c
       s = ""
-      @comment.each_line { |l| s += "/* #{l.delete("\n")} */\n" }
+      @comment.each_line { |l| s << "/* #{l.delete("\n")} */\n" }
       return s
     end
 

data/lib/BOAST/Language/Config.rb

@@ -22,12 +22,12 @@ module BOAST
 
   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)
+    home_config_dir = "#{Dir.home}/.config" unless home_config_dir
+    Dir.mkdir( home_config_dir ) unless File::exist?( home_config_dir )
+    return nil unless 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)
+    Dir.mkdir( boast_config_dir ) unless File::exist?( boast_config_dir )
+    return nil unless File::directory?(boast_config_dir)
     return boast_config_dir
   end
 

data/lib/BOAST/Language/DataTypes.rb

@@ -44,7 +44,7 @@ module BOAST
 
     def decl
       return "integer(kind=#{get_default_int_size})" if lang == FORTRAN
-      if not @signed then
+      unless @signed then
         return "size_t" if [C, CL, CUDA].include?( lang )
       else
         return "ptrdiff_t" if [C, CL, CUDA].include?( lang )
@@ -56,7 +56,7 @@ module BOAST
     end
 
     def signed?
-      return !!signed
+      return signed
     end
 
     def suffix
@@ -101,7 +101,7 @@ module BOAST
     end
 
     def signed?
-      return !!signed
+      return signed
     end
 
     def to_hash
@@ -137,9 +137,9 @@ module BOAST
     def suffix
       s = ""
       if [C, CL, CUDA].include?( lang ) then
-        s += "f" if @size == 4
+        s << "f" if @size == 4
       elsif lang == FORTRAN then
-        s += "_wp" if @size == 8
+        s << "_wp" if @size == 8
       end
       return s
     end
@@ -177,7 +177,7 @@ module BOAST
       end
       if hash[:vector_length] and hash[:vector_length] > 1 then
         @vector_length = hash[:vector_length]
-        raise "Vectors need to have their element size specified!" if not @size
+        raise "Vectors need to have their element size specified!" unless @size
       else
         @vector_length = 1
       end
@@ -197,7 +197,7 @@ module BOAST
     end
 
     def signed?
-      return !!@signed
+      return @signed
     end
 
     def decl
@@ -208,7 +208,7 @@ module BOAST
       if lang == C then
         if @vector_length == 1 then
           s = ""
-          s += "u" if not @signed
+          s << "u" unless @signed
           return s+"int#{8*@size}_t" if @size
           return s+"int"
         elsif @vector_length > 1 then
@@ -216,33 +216,35 @@ module BOAST
         end
       else
         s =""
-        s += "u" if not @signed
-        s += "nsigned " if not @signed and lang == CUDA and @vector_length == 1
+        unless @signed then
+          s << "u"
+          s << "nsigned " if lang == CUDA and @vector_length == 1
+        end
         case @size
         when 1
-          s += "char"
+          s << "char"
         when 2
-          s += "short"
+          s << "short"
         when 4
-          s += "int"
+          s << "int"
         when 8
           if lang == CUDA
             case @vector_length
             when 1
-              s += "long long"
+              s << "long long"
             else
-              s += "longlong"
+              s << "longlong"
             end
           else
-            s += "long"
+            s << "long"
           end
         when nil
-          s += "int"
+          s << "int"
         else
           raise "Unsupported integer size!"
         end
         if @vector_length > 1 then
-          s += "#{@vector_length}"
+          s << "#{@vector_length}"
         end
         return s
       end
@@ -250,9 +252,9 @@ module BOAST
 
     def decl_ffi
       t = ""
-      t += "u" if not @signed
-      t += "int"
-      t += "#{@size*8}" if @size
+      t << "u" unless @signed
+      t << "int"
+      t << "#{@size*8}" if @size
       return t.to_sym
     end
 
@@ -307,7 +309,7 @@ module BOAST
 
     def define_c
       s = indent
-      s += decl_c + " {"
+      s << decl_c + " {"
       output.puts s
       increment_indent_level
       @members_array.each { |value|
@@ -315,15 +317,15 @@ module BOAST
       }
       decrement_indent_level
       s = indent
-      s += "}"
-      s += finalize
+      s << "}"
+      s << finalize
       output.print s
       return self
     end
     
     def define_fortran
       s = indent
-      s += "TYPE :: #{@name}\n"
+      s << "TYPE :: #{@name}\n"
       output.puts s
       increment_indent_level
       @members_array.each { |value|
@@ -331,16 +333,16 @@ module BOAST
       }
       decrement_indent_level
       s = indent
-      s += "END TYPE #{@name}"
-      s += finalize
+      s << "END TYPE #{@name}"
+      s << finalize
       output.print s
       return self
     end
 
     def finalize
        s = ""
-       s += ";" if [C, CL, CUDA].include?( lang )
-       s+="\n"
+       s << ";" if [C, CL, CUDA].include?( lang )
+       s << "\n"
        return s
     end
 

data/lib/BOAST/Language/Expression.rb

@@ -21,7 +21,7 @@ module BOAST
 
     def method_missing(m, *a, &b)
       var = to_var
-      if var.type.methods.include?(:members) and var.type.members[m.to_s] then
+      if var.type.kind_of?(CStruct) and var.type.members[m.to_s] then
         return struct_reference(type.members[m.to_s])
       elsif var.vector? and m.to_s[0] == 's' and lang != CUDA then
         required_set = m.to_s[1..-1].chars.to_a
@@ -56,23 +56,23 @@ module BOAST
       return oper.string(op1, op2, return_type) unless oper.kind_of?(String)
       s = ""
       if op1 then
-        s += "(" if (oper == "*" or oper == "/") 
-        s += op1.to_s
-        s += ")" if (oper == "*" or oper == "/") 
-      end        
-      s += " " unless oper == "++" or oper == "."
-      s += oper unless ( oper == "&" and lang == FORTRAN )
-      s += " " unless oper == "." or oper == "&" or ( oper == "*" and op1.nil? )
+        s << "(" if (oper == "*" or oper == "/")
+        s << op1.to_s
+        s << ")" if (oper == "*" or oper == "/")
+      end
+      s << " " unless oper == "++" or oper == "."
+      s << oper unless ( oper == "&" and lang == FORTRAN )
+      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 == "-") 
+        s << "(" if (oper == "*" or oper == "/" or oper == "-")
+        s << op2.to_s
+        s << ")" if (oper == "*" or oper == "/" or oper == "-")
       end
       return s
     end
 
     private :to_s_base
-      
+
     def to_var
       op1 = nil
       op1 = @operand1.to_var if @operand1.respond_to?(:to_var)
@@ -93,7 +93,7 @@ module BOAST
         return Variable::new(res_exp, get_default_type)
       end
     end
- 
+
     def to_s
       op1 = nil
       op1 = @operand1.to_var if @operand1.respond_to?(:to_var)
@@ -114,9 +114,9 @@ module BOAST
 
     def pr
       s=""
-      s += indent
-      s += to_s
-      s += ";" if [C, CL, CUDA].include?( lang ) 
+      s << indent
+      s << to_s
+      s << ";" if [C, CL, CUDA].include?( lang )
       output.puts s
       return self
     end

data/lib/BOAST/Language/For.rb

@@ -13,7 +13,7 @@ module BOAST
 
     # returns the Boolean evaluation of the unroll attribute.
     def unroll?
-      return !!@unroll
+      return @unroll
     end
 
     # Sets the unroll attribute to val.
@@ -132,7 +132,7 @@ module BOAST
           else
             step = @step.to_i
           end
-          raise "Invalid bounds (not constants)!" if not ( first and last and step )
+          raise "Invalid bounds (not constants)!" unless ( first and last and step )
         ensure
           pop_env( :replace_constants )
         end
@@ -159,8 +159,8 @@ module BOAST
     def open
       @openmp.open if @openmp
       s=""
-      s += indent
-      s += to_s
+      s << indent
+      s << to_s
       output.puts s
       increment_indent_level      
       return self
@@ -188,8 +188,8 @@ module BOAST
     def close
       decrement_indent_level      
       s = ""
-      s += indent
-      s += end_string
+      s << indent
+      s << end_string
       output.puts s
       @openmp.close if @openmp
       return self