automated generation of quantifier types and some fixes/improvements

Author: decarvalhojunior-fh

Project.toml

@@ -6,6 +6,7 @@ version = "0.2.0"
 [deps]
 Artifacts = "56f22d72-fd6d-98f1-02f0-08ddc0907c33"
 CpuId = "adafc99b-e345-5852-983c-f28acb93d879"
+Downloads = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
 JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
 Scratch = "6c6a2e73-6563-6170-7368-637461726353"
 TOML = "fa267f1f-6049-4f14-aa54-33bafae1ed76"

src/PlatformAware.jl

@@ -10,6 +10,7 @@ using TOML
 using JSON
 using Artifacts
 using Scratch
+using Downloads
 
 # quantifiers
 include("quantifiers/atleast.jl")

src/awareness.jl

@@ -63,16 +63,16 @@ function try_download(url,fname)
       if (isfile(fname))
          cp(fname,fname * ".backup", force=true)
       end
-      download(url, fname)
+      Downloads.download(url, fname)
    catch e
-      print(stderr,"error downloading ", url, ".")
+      @info "error downloading $url."
       if (isfile(fname) || isfile(fname * ".backup"))
-         println(stderr," Using existing file ", fname)
+         @info " Using existing file $fname"
          if (!isfile(fname))
             cp(fname * ".backup", fname)
          end
       else
-         println(stderr," Check internet connection and try again.")
+         @info " Check internet connection and try again."
          rethrow(e)
       end
    end
@@ -864,18 +864,16 @@ function setup()
                                close(fn)
                           end 
             end
-      println()      
-      println("Platform.toml file was created in the current folder.")
-      println("You can move it to your preferred target.")
-      println("Platform.toml will be searched in the following locations:")
-      println("  1) A file path pointed by a PLATFORM_DESCRIPTION environment variable;")
-      println("  2) The current directory;")
-      println("  3) The /etc directory.")
+      @info "Platform.toml file was created in the current folder."
+      @info "You can move it to your preferred target."
+      @info "Platform.toml will be searched in the following locations:"
+      @info "  1) A file path pointed by a PLATFORM_DESCRIPTION environment variable;"
+      @info "  2) The current directory;"
+      @info "  3) The /etc directory."
    else
       TOML.print(stdout, platform_features)
-      println(stderr)
-      println(stderr, "Platform description file already exists in the current folder (Platform.toml).")
-      println(stderr, "You must delete or move it before creating a new one.")
+      @info "Platform description file already exists in the current folder (Platform.toml)."
+      @info "You must delete or move it before creating a new one."
    end
 
 end

src/features.jl

@@ -70,7 +70,7 @@ function readPlatormDescription()
     # read the platform description file (default to the current directory)
     filename = get(ENV,"PLATFORM_DESCRIPTION","Platform.toml")
 
-    println("reading platform description at " * filename);
+    @info "reading platform description at $filename"
 
     platform_description_toml =   
          try
@@ -85,9 +85,9 @@ function readPlatormDescription()
                 close(io)
                 contents
             catch
-                println(stderr,"The platform description file (Platform.toml) was not found.")
-                println(stderr,"Using default platform features (calling default kernels).")
-                println(stderr,"A Platform.toml file may be created by calling PlatformAware.setup()")
+                @info "The platform description file (Platform.toml) was not found."
+                @info "Using default platform features (calling default kernels)."
+                @info "A Platform.toml file may be created by calling PlatformAware.setup()"
 
                 io = joinpath(artifact"default_platform_description", "DefaultPlatform.toml")                
                 read(io,String)
@@ -99,25 +99,31 @@ end
 
 function get_quantifier_from_number(n)
 
-    magnitude = Dict(0 => "", 1 => "K", 2 => "M", 3 => "G", 4 => "T", 5 => "P", 6 => "E")
+    if n>0
 
-    l = log(2,n)
-    a = round(l)
-    b = isinteger(l) ? a : a + 1;    
+        magnitude = Dict(0 => "", 1 => "K", 2 => "M", 3 => "G", 4 => "T", 5 => "P", 6 => "E")
 
-    # the following loop separates a and b in multiplier*magnitude (see the POPL's paper).
+        l = log(2,n)
+        a = round(l)
+        b = isinteger(l) ? a : a + 1;    
 
-    # let A = 2^a
-    m=0
-    while a>9 
-        # loop invariant: A = 2^a * 2^(10*m)
-        a = a - 10
-        b = b - 10
-        m = m + 1
-    end
+        # the following loop separates a and b in multiplier*magnitude (see the POPL's paper).
+
+        # let A = 2^a
+        m=0
+        while a>9 
+            # loop invariant: A = 2^a * 2^(10*m)
+            a = a - 10
+            b = b - 10
+            m = m + 1
+        end
 
-    a_str = "AtLeast" * string(Integer(2^a)) * magnitude[m]
-    b_str = "AtMost" * string(Integer(2^b)) * magnitude[m]
+        a_str = "AtLeast" * string(Integer(2^a)) * magnitude[m]
+        b_str = "AtMost" * string(Integer(2^b)) * magnitude[m]
+    else
+        a_str = "AtLeast0"
+        b_str = "AtMost0"
+    end
 
     a_type = getfield(@__MODULE__, Meta.parse(a_str))
     b_type = getfield(@__MODULE__, Meta.parse(b_str))

src/identification.jl

@@ -195,10 +195,10 @@ macro platform(t,f)
     elseif (t == :parameter && getaddparameter())
         platform_parameter_macro!(f)
     elseif (t == :parameter && !getaddparameter())
-        println("cannot add parameters after including the first kernel method")
+        @info "cannot add parameters after including the first kernel method"
     else
-        println("usage: platform [default | aware] <function declaration>")
-        println("       platform parameter :(<parameter name>)")
+        @info "usage: platform [default | aware] <function declaration>"
+        @info "       platform parameter :(<parameter name>)"
     end
  end
 

src/platforms/common.jl

@@ -4,16 +4,16 @@
 
 
 # OpenCL 
-abstract type OpenCL <: AcceleratorBackend end
-abstract type OpenCL_1_0 <: OpenCL end
+abstract type OpenCL_API <: AcceleratorBackend end
+abstract type OpenCL_1_0 <: OpenCL_API end
 abstract type OpenCL_1_1 <: OpenCL_1_0 end
 abstract type OpenCL_1_2 <: OpenCL_1_1 end
 abstract type OpenCL_2_0 <: OpenCL_1_2 end
 abstract type OpenCL_2_1 <: OpenCL_2_0 end
 abstract type OpenCL_2_2 <: OpenCL_2_1 end
 abstract type OpenCL_3 <: OpenCL_2_2 end
 
-export OpenCL, OpenCL_1_0, OpenCL_1_1, OpenCL_1_2, OpenCL_2_0, OpenCL_2_1, OpenCL_2_2, OpenCL_3
+export OpenCL_API, OpenCL_1_0, OpenCL_1_1, OpenCL_1_2, OpenCL_2_0, OpenCL_2_1, OpenCL_2_2, OpenCL_3
 
 # SIMD extensions
 

src/quantifiers/atleast.jl

@@ -2,24 +2,30 @@
 # Licensed under the MIT License. See LICENCE in the project root.
 # ------------------------------------------------------------------
 
-#
-#abstract type AtLeast0 end                     # 0
-#
-#multiplier_super = 0
-#magnitude_ = ""
-#for magnitude in ['n', 'u', 'm', ' ', 'K', 'M', 'G', 'T', 'P', 'E']
-#    for multiplier in [1, 2, 4, 8, 16, 32, 64, 128, 256, 512]
-#        magnitude_super = multiplier == 1 ? magnitude_ : magnitude   
-#        code = "abstract type AtLeast" * string(multiplier) * magnitude * " <: AtLeast" * string(multiplier_super) * magnitude_super * " end"        
-#        eval(Meta.parse(code))
-#        multiplier_super = multiplier
-#    end
-#    magnitude_ = magnitude
-#end
-#
-#abstract type AtLeastInf <: AtLeast512E end
+# automated declaration of at-least quantifier types
 
+abstract type AtLeast0 end                     
 
+let mul_super = 0
+    mag_ = ""
+    for mag in ["n", "u", "m", "", "K", "M", "G", "T", "P", "E"]
+        for mul in [1, 2, 4, 8, 16, 32, 64, 128, 256, 512]
+            mag_super = mul == 1 ? mag_ : mag   
+            nm1 = Symbol("AtLeast" * string(mul) * mag)
+            nm2 = Symbol("AtLeast" * string(mul_super) * mag_super)
+            @eval abstract type $nm1 <: $nm2 end
+            @eval export $nm1
+            mul_super = mul
+        end
+        mag_ = mag
+    end
+end
+
+abstract type AtLeastInf <: AtLeast512E end
+
+
+
+#=
 # abstract quantities of resources (magnitude order)
 
 abstract type AtLeast0 end                     # 0
@@ -136,4 +142,6 @@ abstract type AtLeast512E <: AtLeast256E end   # 2^69
 
 # ...
 
-abstract type AtLeastInf <: AtLeast512E end    # ∞
+abstract type AtLeastInf <: AtLeast512E end    # ∞
+
+=#

src/quantifiers/atmost.jl

@@ -2,28 +2,33 @@
 # Licensed under the MIT License. See LICENCE in the project root.
 # ------------------------------------------------------------------
 
-#abstract type AtMostInf end                     # 0
 
-#multiplier_super = "Inf"
-#magnitude_ = ""
-#for magnitude in reverse(['n', 'u', 'm', ' ', 'K', 'M', 'G', 'T', 'P', 'E'])
-#    for multiplier in reverse([1, 2, 4, 8, 16, 32, 64, 128, 256, 512])
-#        magnitude_super = multiplier == 512 ? magnitude_ : magnitude   
-#        code = "abstract type AtMost" * string(multiplier) * magnitude * " <: AtMost" * string(multiplier_super) * magnitude_super * " end"        
-#        eval(Meta.parse(code)); println(code)
-#        multiplier_super = multiplier
-#    end
-#    magnitude_ = magnitude
-#end
-#
-#abstract type AtMost0 <: AtMost1n end
+# automated declaration of at-most quantifier types
+
+abstract type AtMostInf end                     
+
+let mul_super = "Inf" ,
+    mag_ = "" ;
+    for mag in reverse(["n", "u", "m", "", "K", "M", "G", "T", "P", "E"])
+        for mul in reverse([1, 2, 4, 8, 16, 32, 64, 128, 256, 512])
+            mag_super = mul==512 ? mag_ : mag
+            nm1 = Symbol("AtMost" * string(mul) * mag)
+            nm2 = Symbol("AtMost" * string(mul_super) * mag_super)
+            @eval abstract type $nm1 <: $nm2 end
+            mul_super = mul
+        end
+        mag_ = mag
+    end
+end
+
+abstract type AtMost0 <: AtMost1n end
 
 
-# abstract quantities of resources (magnitude order)
 
-abstract type AtMostInf end                             # ∞
 
-# ...
+#=
+
+abstract type AtMostInf end                             # ∞
 
 abstract type AtMost512E <: AtMostInf end               # 2^69
 abstract type AtMost256E <: AtMost512E end              # 2^68
@@ -137,3 +142,6 @@ abstract type AtMost1n <: AtMost2n end                  # 2^-30
 
 abstract type AtMost0 <: AtMost1n end                   # 0
 
+=#
+
+