BOAST 0.99995 → 0.99996

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57c36ecbce4158a4dc2fb3a4649fa47805e0c8cc
-  data.tar.gz: 65cb304450d5eb10c63dbb15c888d24a94d0e566
+  metadata.gz: 40c21d4b9f3af7ba3e0a34a8a55b9a7d65329f8f
+  data.tar.gz: dd8c7914a2b7918295453dbeffd172a505014cf6
 SHA512:
-  metadata.gz: 9ad955b155dd5b59f68026a73c88954a0c353d0ff987160cc7a7bd952808e2ddabae3cd5888c9c957ecb37cae0b1f4922a5007b43cbe64daa53a69d56cd37246
-  data.tar.gz: ee864516ea19a35b6d39ef49ea01904e5b862c454399918a24d0f19dd4f233e7e0fab06051286e975cf58cc76ea3f1be83d8ae39b71eb31f26f702abb7582dac
+  metadata.gz: 2bbe1a51a60e2cd46ceaa611e45d51e294d893c3b2d528fd586fdbd89bdd1ba0b8a0c3189569989a0c2e5a532b16a71e02b3ce5835a44b0b238214d8cf9e4340
+  data.tar.gz: f661fa69d0309e6c6b2f294925c08b1c6ddf9f854f745d1b1bb8d1f79d6519d105b8f854eb8514c6f75e96bffbd181ff71ee6fd2028ef1f05f6a8f4bcfc126ce

data/BOAST.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'BOAST'
-  s.version = "0.99995"
+  s.version = "0.99996"
   s.author = "Brice Videau"
   s.email = "brice.videau@imag.fr"
   s.homepage = "https://forge.imag.fr/projects/boast/"
@@ -33,6 +33,7 @@ Gem::Specification.new do |s|
                 lib/BOAST/Print.rb
                 lib/BOAST/State.rb
                 lib/BOAST/Optimization.rb
+                lib/BOAST/OpenMP.rb
               )
   s.has_rdoc = true
   s.license = 'BSD'

data/lib/BOAST/For.rb

@@ -1,19 +1,28 @@
 module BOAST
 
   class For < ControlStructure
+    include OpenMP::Pragma
 
     attr_reader :iterator
     attr_reader :begin
     attr_reader :end
     attr_reader :step
 
-    def initialize(i, b, e, s=1, &block)
+    def initialize(i, b, e, options={}, &block)
+      default_options = {:step => 1}
+      default_options.update( options )
       @iterator = i
       @begin = b
       @end = e
-      @step = s
+      @step = default_options[:step]
       @operator = "<="
       @block = block
+      @openmp = default_options[:openmp]
+      if @openmp and @openmp.kind_of?(Hash) then
+        @openmp_clauses = @openmp
+      else
+        @openmp_clauses = {}
+      end
       begin
         push_env( :replace_constants => true )
         if @step.kind_of?(Variable) then
@@ -33,12 +42,16 @@ module BOAST
 
     @@c_strings = {
       :for => '"for (#{i} = #{b}; #{i} #{o} #{e}; #{i} += #{s}) {"',
-      :end => '"}"'
+      :end => '"}"',
+      :openmp_for => '"#pragma omp for #{c}"',
+      :openmp_end => '""'
     }
 
     @@f_strings = {
       :for => '"do #{i} = #{b}, #{e}, #{s}"',
-      :end => '"end do"'
+      :end => '"end do"',
+      :openmp_for => '"!$omp do #{c}"',
+      :openmp_end => '"!$omp end do #{c}"'
     }
 
     @@strings = {
@@ -50,6 +63,8 @@ module BOAST
 
     eval token_string_generator( * %w{for i b e s o})
     eval token_string_generator( * %w{end})
+    eval token_string_generator( * %w{openmp_for c})
+    eval token_string_generator( * %w{openmp_end c})
 
     def to_s
       s = for_string(@iterator, @begin, @end, @step, @operator)
@@ -100,6 +115,7 @@ module BOAST
     end
 
     def open
+      output.puts openmp_for_string(openmp_clauses_to_s) if @openmp
       s=""
       s += indent
       s += to_s
@@ -123,7 +139,7 @@ module BOAST
       s += indent
       s += end_string
       output.puts s
-      return self
+      output.puts openmp_end_string(openmp_end_clauses_to_s) if @openmp and openmp_end_string(openmp_end_clauses_to_s) != ""
     end
 
   end

data/lib/BOAST/OpenMP.rb

@@ -0,0 +1,186 @@
+module BOAST
+
+  module OpenMP
+
+    module Pragma
+
+      def openmp_pragma_to_s
+        s = ""
+        if lang == FORTRAN then
+          s += "!$omp"
+        elsif lang == C then
+          s += "#pragma omp"
+        else
+          raise "Language does not support OpenMP!"
+        end
+        return s
+      end
+
+      def openmp_clauses_to_s
+        s = ""
+        if @openmp_clauses[:if] then
+          s += " if(#{@openmp_clauses[:if]})"
+        end
+        if @openmp_clauses[:num_threads] then
+          s += " num_threads(#{@openmp_clauses[:num_threads]})"
+        end
+        if @openmp_clauses[:default] then
+          s += " default(#{@openmp_clauses[:default]})"
+        end
+        if @openmp_clauses[:private] then
+          s += " private(#{[@openmp_clauses[:private]].flatten.join(", ")})"
+        end
+        if @openmp_clauses[:firstprivate] then
+          s += " firstprivate(#{[@openmp_clauses[:firstprivate]].flatten.join(", ")})"
+        end
+        if @openmp_clauses[:lastprivate] then
+          s += " lastprivate(#{[@openmp_clauses[:lastprivate]].flatten.join(", ")})"
+        end
+        if lang == C then
+          if @openmp_clauses[:copyprivate] then
+            s += " copyprivate(#{[@openmp_clauses[:copyprivate]].flatten.join(", ")})"
+          end
+          if @openmp_clauses[:nowait] then
+            s += " nowait"
+          end
+        end
+        if @openmp_clauses[:shared] then
+          s += " shared(#{[@openmp_clauses[:shared]].flatten.join(", ")})"
+        end
+        if @openmp_clauses[:copyin] then
+          s += " copyin(#{[@openmp_clauses[:copyin]].flatten.join(", ")})"
+        end
+        if @openmp_clauses[:reduction] then
+          options[:reduction].each { |identifier, list|
+            s += " reduction(#{identifier}: #{list.join(", ")})"
+          }
+        end
+        if @openmp_clauses[:schedule] then
+          s += " schedule(#{@openmp_clauses[:schedule].join(", ")})"
+        end
+        if @openmp_clauses[:collapse] then
+          s += " collapse(#{@openmp_clauses[:collapse]})"
+        end
+        if @openmp_clauses[:ordered] then
+          s += " ordered"
+        end
+        return s
+      end
+
+      def openmp_end_clauses_to_s
+        s = ""
+        if lang == FORTRAN then
+          if @openmp_clauses[:copyprivate] then
+            s += " copyprivate(#{[@openmp_clauses[:copyprivate]].flatten.join(", ")})"
+          end
+          if @openmp_clauses[:nowait] then
+            s += " nowait"
+          end
+        end
+        return s
+      end
+
+    end
+
+    module_function
+    def functorize(klass)
+      name = klass.name.split('::').last
+      s = <<EOF
+    def #{name}(*args,&block)
+       #{name}::new(*args,&block)
+    end
+
+    module_function :#{name}
+EOF
+      eval s
+    end
+  
+    def var_functorize(klass)
+      name = klass.name.split('::').last
+      s = <<EOF
+    def #{name}(*args,&block)
+       Variable::new(args[0],#{name},*args[1..-1], &block)
+    end
+
+    module_function :#{name}
+EOF
+      eval s
+    end
+
+    module Functor
+
+      def self.extended(mod)
+        BOAST::OpenMP::functorize(mod)
+      end
+
+    end
+
+    class ControlStructure
+      include PrivateStateAccessor
+      include Inspectable
+      include OpenMP::Pragma
+
+      def self.inherited(child)
+        child.extend Functor
+      end
+
+      def self.token_string_generator(name, *args)
+        s = <<EOF
+      def #{name}_string(#{args.join(",")})
+        return eval @@strings[get_lang][:#{name}] 
+      end
+EOF
+      end
+
+    end
+
+    class Parallel < ControlStructure
+
+      def initialize(options = {}, &block)
+        @openmp_clauses = options
+        @block = block
+      end
+      @@c_strings = {
+        :parallel => '"#pragma omp parallel #{c}\n{"',
+        :end => '"}"',
+      }
+
+      @@f_strings = {
+        :parallel => '"!$omp parallel #{c}"',
+        :end => '"!$omp end parallel #{c}"',
+      }
+
+      @@strings = {
+        C => @@c_strings,
+        FORTRAN => @@f_strings
+      }
+
+      eval token_string_generator( * %w{parallel c})
+      eval token_string_generator( * %w{end c})
+
+      def to_s
+        return parallel_string(openmp_clauses_to_s)
+      end
+
+      def open
+        output.puts to_s
+      end
+
+      def pr(*args)
+        open
+        if @block then
+          @block.call(*args)
+          close
+        end
+        return self
+      end
+
+      def close
+        output.puts end_string(openmp_end_clauses_to_s) 
+      end
+
+    end
+
+  end
+
+end

data/lib/BOAST.rb

@@ -12,6 +12,7 @@ require 'BOAST/FuncCall.rb'
 require 'BOAST/Procedure.rb'
 require 'BOAST/Algorithm.rb'
 require 'BOAST/ControlStructure.rb'
+require 'BOAST/OpenMP.rb'
 require 'BOAST/If.rb'
 require 'BOAST/For.rb'
 require 'BOAST/Case.rb'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: BOAST
 version: !ruby/object:Gem::Version
-  version: '0.99995'
+  version: '0.99996'
 platform: ruby
 authors:
 - Brice Videau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-27 00:00:00.000000000 Z
+date: 2014-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: narray
@@ -76,6 +76,7 @@ files:
 - lib/BOAST/If.rb
 - lib/BOAST/Index.rb
 - lib/BOAST/Inspectable.rb
+- lib/BOAST/OpenMP.rb
 - lib/BOAST/Operators.rb
 - lib/BOAST/Optimization.rb
 - lib/BOAST/Parens.rb