BOAST 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12d3019064fc0609d6be8218867a2e5f96d36be8
-  data.tar.gz: 7c461ebad9ad23314f8fc531d89a680008422828
+  metadata.gz: 53cb9d1326b52f2ff8125f0e5a3e3c7423f4ccc1
+  data.tar.gz: 4f945e013c4b177f9a86363ad0896e84a7bc5dc4
 SHA512:
-  metadata.gz: c92be2673de5ac581c069c91641beb11327bbf64c406b1af262c78c942763395c3f28b256b6cc395fdee83841e8e90688d4eff114fb22238cb8d451b47c08385
-  data.tar.gz: 496596256bb9a9ab2f29257001327a40a49484c2c8bc0d965f6d4c66a1634c2b95ca2c5bff6b121b4f2cb705a0a77f291cb0489d11b30fafdbae7886a10584ad
+  metadata.gz: f5f93853b1709fbddce9fa34316a05e8314c9f3716ac3adb6da40dc64b36be806af8ce3542ad565e80aeb0edb5205312a80b19af110ee4156ffd337c15f6f9f9
+  data.tar.gz: ead3cd7fcebd87cfd9e088003b3155e44e807be24f4706f92ce7519a7717f8681877db8da6a90c09c0cd60a48a99bdd4c75c83ba2daa0dbe2fe43915cb363012

data/BOAST.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'BOAST'
-  s.version = "2.0.1"
+  s.version = "2.0.2"
   s.author = "Brice Videau"
   s.email = "brice.videau@imag.fr"
   s.homepage = "https://github.com/Nanosim-LIG/boast"

data/lib/BOAST/Language/Expression.rb

@@ -2,6 +2,12 @@ module BOAST
 
   module_function
 
+  class Empty
+    def self.empty_binding
+      return binding
+    end
+  end
+
   # @!parse module Functors; functorize Expression; end
   class Expression
     include PrivateStateAccessor

data/lib/BOAST/Language/FuncCall.rb

@@ -48,13 +48,13 @@ module BOAST
     def to_s_fortran
       s = ""
       s += @prefix if @prefix
-      s += "#{func_name}(#{@args.join(", ")})"
+      s += "#{func_name}(#{@args.collect(&:to_s).join(", ")})"
     end
 
     def to_s_c
       s = ""
       s += @prefix if @prefix
-      s += "#{func_name}(#{@args.join(", ")})"
+      s += "#{func_name}(#{@args.collect(&:to_s).join(", ")})"
     end
 
     private :to_s_fortran, :to_s_c

data/lib/BOAST/Language/Index.rb

@@ -69,7 +69,7 @@ module BOAST
             dim = dims[indx]
             s = "#{indxs[indx]}"
             s += " - (#{dim.start})" unless 0.equal?(dim.start)
-            ind = eval(s)
+            ind = Empty.empty_binding.eval(s)
             ind = ind.to_i
             const = const[ind]
           }

data/lib/BOAST/Language/OpenMP.rb

@@ -32,7 +32,7 @@ EOF
 EOF
         when :option_list
           s += <<EOF
-        return " (\#{[c].flatten.join(", ")})"
+        return " (\#{[c].flatten.collect(&:to_s).join(", ")})"
 EOF
         when :simple
           s += <<EOF
@@ -40,13 +40,13 @@ EOF
 EOF
         when :list
 s += <<EOF
-        return " #{name}(\#{[c].flatten.join(", ")})"
+        return " #{name}(\#{[c].flatten.collect(&:to_s).join(", ")})"
 EOF
         when :multilist
 s += <<EOF
         s = ""
         c.each { |id, list|
-          s += " #{name}(\#{id}: \#{[list].flatten.join(", ")})"
+          s += " #{name}(\#{id}: \#{[list].flatten.collect(&:to_s).join(", ")})"
         }
         return s
 EOF

data/lib/BOAST/Language/Variable.rb

@@ -159,12 +159,12 @@ module BOAST
           return copy(name+"."+m.to_s, :vector_length => m.to_s[1..-1].length) if lang == CL
           return copy("#{name}(#{existing_set.index(required_set[0])+1})", :vector_length => 1) if lang == FORTRAN
           return copy("#{name}[#{existing_set.index(required_set[0])}]", :vector_length => 1) if lang == C
-          super
+          return super
         else
-          super
+          return super
         end
       else
-        super
+        return super
       end
     end
 
@@ -393,9 +393,7 @@ module BOAST
       s += " #{@name}"
       if dimension? and use_vla? and lang != FORTRAN  then
         s += "["
-        s += @dimension.reverse.collect { |d|
-          d.to_s
-        }.join("][")
+        s += @dimension.reverse.collect(&:to_s).join("][")
         s += "]"
       end
       return s
@@ -501,9 +499,7 @@ module BOAST
       if __vla_array? then
         s += " #{@name}["
         s += "__restrict__ " if __restrict?
-        s += @dimension.reverse.collect { |d|
-          d.to_s
-        }.join("][")
+        s += @dimension.reverse.collect(&:to_s).join("][")
         s += "]"
       else
         s += " *" if __pointer?(device)
@@ -520,7 +516,7 @@ module BOAST
         end
         if __dimension?(device) then
           s +="[("
-          s += @dimension.collect{ |d| d.to_s }.reverse.join(")*(")
+          s += @dimension.collect(&:to_s).reverse.join(")*(")
           s +=")]"
         end 
       end
@@ -579,7 +575,7 @@ module BOAST
     end
 
     def alloc_c( dims, align = get_address_size)
-      ds = dims.collect { |d| d.to_s }.reverse.join(")*(")
+      ds = dims.collect(&:to_s).reverse.join(")*(")
       if align > (OS.bits/8) then
         # check alignment is a power of 2
         raise "Invalid alignment #{align}!" if align & (align - 1) != 0

data/lib/BOAST/Runtime/NonRegression.rb

@@ -25,6 +25,9 @@ module BOAST
           next
         end
         if param.dimension then
+          outputs[indx].each { |elem|
+            raise "Error! #{elem}" if elem.nan?
+          }
           diff = (outputs[indx] - ref_outputs[indx]).abs
           if epsilon then
             diff.each { |elem|
@@ -33,6 +36,7 @@ module BOAST
           end
           res[param.name] = diff.max
         else
+          raise "Error: #{param.name} is NaN!" if outputs[indx].nan?
           raise "Error: #{param.name} different from ref: #{outputs[indx]} != #{ref_outputs[indx]} !" if epsilon and (outputs[indx] - ref_outputs[indx]).abs > epsilon
           res[param.name] = (outputs[indx] - ref_outputs[indx]).abs
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: BOAST
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Brice Videau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-07 00:00:00.000000000 Z
+date: 2017-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: narray