Merge branch 'master' into aws_ec2

Author: decarvalhojunior-fh

Project.toml

@@ -15,6 +15,7 @@ TOML = "fa267f1f-6049-4f14-aa54-33bafae1ed76"
 XMLDict = "228000da-037f-5747-90a9-8195ccbf91a5"
 
 [compat]
+AbstractTrees = "0.4"
 CpuId = "0.3"
 JSON = "0.21"
 Scratch = "1"

README.md

@@ -1,7 +1,7 @@
 # PlatformAware.jl
 
-[![TagBot](https://github.com/decarvalhojunior-fh/PlatformAware.jl/actions/workflows/TagBot.yml/badge.svg)](https://github.com/decarvalhojunior-fh/PlatformAware.jl/actions/workflows/TagBot.yml)
-[![CompatHelper](https://github.com/decarvalhojunior-fh/PlatformAware.jl/actions/workflows/CompatHelper.yml/badge.svg)](https://github.com/decarvalhojunior-fh/PlatformAware.jl/actions/workflows/CompatHelper.yml)
+[![TagBot](https://github.com/PlatformAwareProgramming/PlatformAware.jl/actions/workflows/TagBot.yml/badge.svg)](https://github.com/decarvalhojunior-fh/PlatformAware.jl/actions/workflows/TagBot.yml)
+[![CompatHelper](https://github.com/PlatformAwareProgramming/PlatformAware.jl/actions/workflows/CompatHelper.yml/badge.svg)](https://github.com/PlatformAwareProgramming/PlatformAware.jl/actions/workflows/CompatHelper.yml)
 
 
 _A package for improving the practice of **platform-aware programming** in Julia_.
@@ -230,9 +230,9 @@ Therefore, we suggest the following general guideline for package developers who
 3. Identify the target execution platforms to which you want to provide specialized methods for each kernel function. You can choose a set of execution platforms for all kernels, or you can select one or more platforms for each kernel independently. For helping your choice, look at the following information sources:
    - the [table of supported _platform **parameters**_](https://docs.google.com/spreadsheets/d/1n-c4b7RxUduaKV43XrTnt54w-SR1AXgVNI7dN2OkEUc/edit?usp=sharing), which will help you to know which assumptions _PlatformAware.jl_ already allow you to make about the target execution platorm;
    - the database of supported _platform **features**_, where the features of the models of processors and accelerators that are currently suported by _PlatformAware.jl_ are described:
-      - AMD [accelerators](https://github.com/decarvalhojunior-fh/PlatformAware.jl/blob/master/src/features/qualifiers/amd/db-accelerators.AMD.csv) and [processors](https://github.com/decarvalhojunior-fh/PlatformAware.jl/blob/master/src/features/qualifiers/amd/db-processors.AMD.csv);
-      - Intel [accelerators](https://github.com/decarvalhojunior-fh/PlatformAware.jl/blob/master/src/features/qualifiers/intel/db-accelerators.Intel.csv) and [processors](https://github.com/decarvalhojunior-fh/PlatformAware.jl/blob/master/src/features/qualifiers/intel/db-processors.Intel.csv);
-      - NVIDIA [accelerators](https://github.com/decarvalhojunior-fh/PlatformAware.jl/blob/master/src/features/qualifiers/nvidia/db-accelerators.NVIDIA.csv).
+      - AMD [accelerators](https://github.com/PlatformAwareProgramming/PlatformAware.jl/blob/master/src/features/qualifiers/amd/db-accelerators.AMD.csv) and [processors](https://github.com/PlatformAwareProgramming/PlatformAware.jl/blob/master/src/features/qualifiers/amd/db-processors.AMD.csv);
+      - Intel [accelerators](https://github.com/PlatformAwareProgramming/PlatformAware.jl/blob/master/src/features/qualifiers/intel/db-accelerators.Intel.csv) and [processors](https://github.com/PlatformAwareProgramming/PlatformAware.jl/blob/master/src/features/qualifiers/intel/db-processors.Intel.csv);
+      - NVIDIA [accelerators](https://github.com/PlatformAwareProgramming/PlatformAware.jl/blob/master/src/features/qualifiers/nvidia/db-accelerators.NVIDIA.csv).
 
 4. For each platform you select, define a set of assumptions about its features that will guide your implementation decisions. In fact, it is possible to define different assumptions for the same platform, leading to multiple implementations of a kernel for the same platform. For example, you might decide to implement different parallel algorithms to solve a problem according to the number of nodes and the interconnection characteristics of a cluster.
 
@@ -244,11 +244,11 @@ Therefore, we suggest the following general guideline for package developers who
 
 Contributions are very welcome, as are feature requests and suggestions.
 
-Please [open an issue](https://github.com/decarvalhojunior-fh/PlatformAware.jl) if you encounter any problems.
+Please [open an issue](https://github.com/PlatformAwareProgramming/PlatformAware.jl) if you encounter any problems.
 
 # License
 
-_PlatformAware.jl_ is licensed under the [MIT License](https://github.com/decarvalhojunior-fh/PlatformAware.jl/blob/master/LICENSE) 
+_PlatformAware.jl_ is licensed under the [MIT License](https://github.com/PlatformAwareProgramming/PlatformAware.jl/blob/master/LICENSE) 
 
 [build-img]: https://img.shields.io/github/workflow/status/JuliaEarth/ImageQuilting.jl/CI
-[build-url]: https://github.com/decarvalhojunior-fh/PlatformAware.jl/actions
+[build-url]: https://github.com/PlatformAwareProgramming/PlatformAware.jl/actions

src/PlatformAware.jl

@@ -52,19 +52,20 @@ end
 
 export 
     @platform,
+    @quantifier,
     @atleast,
     @atmost,
     @between,
     @just,
     @unlimited,
     @api,
-    PlatformFeature,
+    PlatformType,
     QuantifierFeature,
     QualifierFeature,
     Query,
     Yes,
     No,
-    Maintainer,
+    Provider,
     OnPremise,
     CloudProvider,
     MachineFamily,

src/features/default/Platform.toml

@@ -7,7 +7,6 @@
 
 [node]
 
-node_count = 1
 node_provider = "OnPremise"
 node_virtual = "No"
 node_dedicated = "Yes"  

src/features/detection.jl

@@ -11,11 +11,11 @@ function loadDBs!()
 
    database_path = @get_scratch!("database_path")
 
-   procdb_intel_url = "https://raw.githubusercontent.com/platform-aware-programming/PlatformAware.jl/master/src/features/qualifiers/intel/db-processors.Intel.csv"
-   procdb_amd_url   = "https://raw.githubusercontent.com/platform-aware-programming/PlatformAware.jl/master/src/features/qualifiers/amd/db-processors.AMD.csv"
-   accdb_intel_url  = "https://raw.githubusercontent.com/platform-aware-programming/PlatformAware.jl/master/src/features/qualifiers/intel/db-accelerators.Intel.csv"
-   accdb_amd_url    = "https://raw.githubusercontent.com/platform-aware-programming/PlatformAware.jl/master/src/features/qualifiers/amd/db-accelerators.AMD.csv"
-   accdb_nvidia_url = "https://raw.githubusercontent.com/platform-aware-programming/PlatformAware.jl/master/src/features/qualifiers/nvidia/db-accelerators.NVIDIA.csv"
+   procdb_intel_url = "https://raw.githubusercontent.com/PlatformAwareProgramming/PlatformAware.jl/master/src/features/qualifiers/intel/db-processors.Intel.csv"
+   procdb_amd_url   = "https://raw.githubusercontent.com/PlatformAwareProgramming/PlatformAware.jl/master/src/features/qualifiers/amd/db-processors.AMD.csv"
+   accdb_intel_url  = "https://raw.githubusercontent.com/PlatformAwareProgramming/PlatformAware.jl/master/src/features/qualifiers/intel/db-accelerators.Intel.csv"
+   accdb_amd_url    = "https://raw.githubusercontent.com/PlatformAwareProgramming/PlatformAware.jl/master/src/features/qualifiers/amd/db-accelerators.AMD.csv"
+   accdb_nvidia_url = "https://raw.githubusercontent.com/PlatformAwareProgramming/PlatformAware.jl/master/src/features/qualifiers/nvidia/db-accelerators.NVIDIA.csv"
 
 #   procdb_intel_fname = "/home/heron/Dropbox/Copy/ufc_mdcc_hpc/PlatformAware/PlatformAware.jl/src/features/qualifiers/intel/db-processors.Intel.csv" #joinpath(database_path,basename(procdb_intel_url))
 #   procdb_amd_fname = "/home/heron/Dropbox/Copy/ufc_mdcc_hpc/PlatformAware/PlatformAware.jl/src/features/qualifiers/amd/db-processors.AMD.csv" #joinpath(database_path,basename(procdb_amd_url))
@@ -433,9 +433,9 @@ function identifyProcessor()
          get!(cdict,c[:id],c[:value])
       end
       processor_core_count = parse(Int64,cdict["enabledcores"])
-      processor_core_threadscount = parse(Int64,cdict["threads"])
+      processor_core_threads_count = parse(Int64,cdict["threads"])
 
-      push!(l,(p["product"],processor_core_count, processor_core_threadscount,lc))
+      push!(l,(p["product"],processor_core_count, processor_core_threads_count,lc))
        
    end
 

src/features/features.jl

@@ -2,10 +2,10 @@
 # Licensed under the MIT License. See LICENCE in the project root.
 # ------------------------------------------------------------------
 
-abstract type PlatformFeature end
+abstract type PlatformType end
 
-abstract type QuantifierFeature <: PlatformFeature end
-abstract type QualifierFeature <: PlatformFeature end
+abstract type QuantifierFeature <: PlatformType end
+abstract type QualifierFeature <: PlatformType end
 
 @enum FeatureType qualifier=1 api_qualifier quantifier
 
@@ -22,6 +22,7 @@ global feature_type = Dict(
     :node_memory_bandwidth => quantifier,
     :node_memory_type => qualifier,
     :node_memory_frequency => quantifier,
+    :node_coworker_count => qualifier,
     :processor_count => quantifier,
     :processor_manufacturer => qualifier,
     :processor_microarchitecture => qualifier,
@@ -111,34 +112,39 @@ end
 function get_quantifier_from_number(n)
 
     if n>0
-
         magnitude = Dict(0 => "", 1 => "K", 2 => "M", 3 => "G", 4 => "T", 5 => "P", 6 => "E")
 
         l = log(2,n)
-        a = round(l)
+        a = floor(l)
         b = isinteger(l) ? a : a + 1;    
 
         # the following loop separates a and b in multiplier*magnitude (see the POPL's paper).
 
         # let A = 2^a
-        m=0
+        m1=0
         while a>9 
             # loop invariant: A = 2^a * 2^(10*m)
             a = a - 10
+            m1 = m1 + 1
+        end
+
+        m2=0
+        while b>9 
+            # loop invariant: A = 2^a * 2^(10*m)
             b = b - 10
-            m = m + 1
+            m2 = m2 + 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[m1]
+        b_str = "AtMost" * string(Integer(2^b)) * magnitude[m2]
     else
         a_str = "AtLeast0"
         b_str = "AtMost0"
     end
 
     a_type = getfield(@__MODULE__, Meta.parse(a_str))
     b_type = getfield(@__MODULE__, Meta.parse(b_str))
-    Tuple{a_type,b_type}
+    Tuple{a_type,b_type,n}
 end
 
 
@@ -165,15 +171,15 @@ function get_qualifier(feature)
     getfield(@__MODULE__, Meta.parse(feature))
 end
 
-function check_blank_feature(parameter_id, feature, default_platform_types)
+function check_blank_feature(parameter_id, feature, platform_feature_default)
     if (feature == "na")
-        default_platform_types[parameter_id]
+        platform_feature_default[parameter_id]
     elseif (feature == "unset")
-        default_platform_types[parameter_id]
+        platform_feature_default[parameter_id]
     elseif (feature == "unknown")
-        default_platform_types[parameter_id]
+        platform_feature_default[parameter_id]
     elseif (feature == "ignore")
-        default_platform_types[parameter_id]
+        platform_feature_default[parameter_id]
     else
         nothing
     end
@@ -203,7 +209,7 @@ function identifyAPI_oldversion(api_string)
 
  end
 
-function get_api_qualifier(api_string, default_platform_types)
+function get_api_qualifier(api_string, platform_feature_default)
 
     apis = split(api_string,';')
 
@@ -224,27 +230,27 @@ function get_api_qualifier(api_string, default_platform_types)
 
  end
 
-function loadFeaturesSection!(dict, actual_platform_arguments, default_platform_types)
+function loadFeaturesSection!(dict, platform_feature, platform_feature_default)
 
     if ("0" in keys(dict))
         dict = dict["0"]
     end
 
     for (parameter_id, feature) in dict
         p = Meta.parse(parameter_id)
-        v0 = check_blank_feature(p, feature, default_platform_types)
+        v0 = check_blank_feature(p, feature, platform_feature_default)
         v = if (isnothing(v0))
-                feature_type[p] == qualifier ? get_qualifier(feature) :  feature_type[p] == api_qualifier ? get_api_qualifier(feature, default_platform_types) : get_quantifier(feature) 
+                feature_type[p] == qualifier ? get_qualifier(feature) :  feature_type[p] == api_qualifier ? get_api_qualifier(feature, platform_feature_default) : get_quantifier(feature) 
             else
                 v0
             end
-        actual_platform_arguments[p]= v
+        platform_feature[p]= v
     end
 end
 
-function loadFeatures!(dict, default_platform_types, actual_platform_arguments)
+function loadFeatures!(dict, platform_feature_default, platform_feature)
     loadDBs!()
     for key in ["node", "processor", "accelerator", "memory", "storage", "interconnection"]
-        loadFeaturesSection!(dict[key], actual_platform_arguments, default_platform_types) 
+        loadFeaturesSection!(dict[key], platform_feature, platform_feature_default) 
     end
 end

src/features/qualifiers/amd/db-processors.AMD.csv

@@ -1,4 +1,4 @@
-,,processor_core_count,processor_clock,processor_core_threadscount,processor_isa,processor_simd,processor_microarchitecture,processor,processor_manufacturer,processor_tdp,processor_core_L1_size,processor_core_L2_size,processor_L3_size,node_memory_bandwidth,node_memory_type
+,,processor_core_count,processor_clock,processor_core_threads_count,processor_isa,processor_simd,processor_microarchitecture,processor,processor_manufacturer,processor_tdp,processor_core_L1_size,processor_core_L2_size,processor_L3_size,node_memory_bandwidth,node_memory_type
 AMD;Turion,TL64,2,2.2G,2,64-bit,MMX;Now3Dx;SSE;SSE2;SSE3,unset,AMDTurion_TL64,AMD,35,unset,1MB,unset,667M,DDR2
 AMD;Turion,TL60,2,2.0G,2,64-bit,MMX;Now3Dx;SSE;SSE2;SSE3,unset,AMDTurion_TL60,AMD,31,unset,1MB,unset,667M,DDR2
 AMD;Turion,TL56,2,1.8G,2,64-bit,MMX;Now3Dx;SSE;SSE2;SSE3,unset,AMDTurion_TL56,AMD,31,unset,unset,unset,unset,unset

src/features/qualifiers/common.jl

@@ -113,7 +113,16 @@ abstract type ISA_x86_64_v4 <: ISA_x86_64_v3 end
 
 abstract type ISA_IA_64 <: ProcessorISA end
 
-
 export ISA_x86_32, ISA_x86, ISA_x86_64, ISA_AMD_64, ISA_x86_64_v1, ISA_x86_64_v2, ISA_x86_64_v3, ISA_x86_64_v4, ISA_IA_64
 
 
+abstract type WorkerCount end
+abstract type NoCoworkers <: WorkerCount end
+abstract type PerNode <: WorkerCount end
+abstract type PerProcessor <: WorkerCount end
+abstract type PerCore <: WorkerCount end
+abstract type PerThread <: WorkerCount end
+abstract type PerVCPU <: WorkerCount end
+abstract type Unmapped <: WorkerCount end
+
+export PerNode, PerProcessor, PerCore, PerThread, PerVCPU

src/features/qualifiers/intel/db-processors.Intel.csv

@@ -1,4 +1,4 @@
-,,processor_core_count,processor_clock,processor_core_threadscount,processor_isa,processor_simd,processor_microarchitecture,processor,processor_manufacturer,processor_tdp,processor_core_L1_size,processor_core_L2_size,processor_L3_size
+,,processor_core_count,processor_clock,processor_core_threads_count,processor_isa,processor_simd,processor_microarchitecture,processor,processor_manufacturer,processor_tdp,processor_core_L1_size,processor_core_L2_size,processor_L3_size
 Intel;Xeon;W,3275M,28,2.50G,56,64-bit,AVX-512,CascadeLake,IntelXeon_W_3275M,Intel,205,unset,unset,unset
 Intel;Xeon;W,3265M,24,2.70G,48,64-bit,AVX-512,CascadeLake,IntelXeon_W_3265M,Intel,205,unset,unset,unset
 Intel;Xeon;W,3245M,16,3.20G,32,64-bit,AVX-512,CascadeLake,IntelXeon_W_3245M,Intel,205,unset,unset,unset

src/features/quantifiers/atleast.jl

@@ -4,7 +4,7 @@
 
 # automated declaration of at-least quantifier types
 
-abstract type AtLeast0 <: QuantifierFeature end                     
+abstract type AtLeast0 <: QuantifierFeature end; export AtLeast0                     
 
 let mul_super = 0
     mag_ = ""

src/features/quantifiers/atmost.jl

@@ -5,7 +5,7 @@
 
 # automated declaration of at-most quantifier types
 
-abstract type AtMostInf  <: QuantifierFeature end                     
+abstract type AtMostInf  <: QuantifierFeature end; export AtMostInf                     
 
 let mul_super = "Inf" ,
     mag_ = "" ;
@@ -15,13 +15,14 @@ let mul_super = "Inf" ,
             nm1 = Symbol("AtMost" * string(mul) * mag)
             nm2 = Symbol("AtMost" * string(mul_super) * mag_super)
             @eval abstract type $nm1 <: $nm2 end
+            @eval export $nm1
             mul_super = mul
         end
         mag_ = mag
     end
 end
 
-abstract type AtMost0 <: AtMost1n end
+abstract type AtMost0 <: AtMost1n end; export AtMost0
 
 
 

src/features/quantifiers/macros.jl

@@ -2,26 +2,52 @@
 # Licensed under the MIT License. See LICENCE in the project root.
 # ------------------------------------------------------------------
 
+macro quantifier(n)
+    get_quantifier(n)
+end
+
 macro atleast(n)
     N = n==:∞ || n==:inf ? "AtLeastInf" : "AtLeast" * string(n) 
-    Meta.parse("Tuple{" * N * ",AtMostInf}")
+    Meta.parse("Type{<:Tuple{$N,AtMostInf,X} where X}")
+end
+
+macro atleast(n,x)
+    N = n==:∞ || n==:inf ? "AtLeastInf" : "AtLeast" * string(n) 
+    esc(Meta.parse("Type{<:Tuple{$N,AtMostInf,$(x)}}"))
 end
 
 macro atmost(n)
     N = n==:∞ || n==:inf ? "AtMostInf" : "AtMost" * string(n);
-    Meta.parse("Tuple{AtLeast0," * N * "}")
+    Meta.parse("Type{<:Tuple{AtLeast0,$N,X} where X}")
+end
+
+macro atmost(n,x)
+    N = n==:∞ || n==:inf ? "AtMostInf" : "AtMost" * string(n);
+    Meta.parse("Type{<:Tuple{AtLeast0,$N,$(x)}}")
 end
 
 macro between(m,n)
     M = m==:∞ || n==:inf ? "AtLeastInf" : "AtLeast" * string(m)
     N = n==:∞ || n==:inf ? "AtMostInf" : "AtMost" * string(n)
-    Meta.parse("Tuple{" * M * "," * N * "}")
+    Meta.parse("Type{<:Tuple{$M,$N,X} where X}")
+end
+
+macro between(m,n,x)
+    M = m==:∞ || n==:inf ? "AtLeastInf" : "AtLeast" * string(m)
+    N = n==:∞ || n==:inf ? "AtMostInf" : "AtMost" * string(n)
+    Meta.parse("Type{<:Tuple{$M,$N,$(x)}}")
 end
 
 macro just(m)
     M = m==:∞ || m==:inf ? "AtLeastInf" : "AtLeast" * string(m)
     N = m==:∞ || m==:inf ? "AtMostInf" : "AtMost" * string(m)
-    Meta.parse("Tuple{" * M * "," * N * "}")
+    Meta.parse("Type{<:Tuple{$M,$N,X} where X}")
+end
+
+macro just(m,x)
+    M = m==:∞ || m==:inf ? "AtLeastInf" : "AtLeast" * string(m)
+    N = m==:∞ || m==:inf ? "AtMostInf" : "AtMost" * string(m)
+    Meta.parse("Type{<:Tuple{$M,$N,$(x)}}")
 end
 
 macro unrestricted()