Merge pull request #25 from PlatformAwareProgramming/aws_ec2

AWS EC2 Support

Author: decarvalhojunior-fh

Project.toml

@@ -7,6 +7,8 @@ version = "0.4.0"
 AbstractTrees = "1520ce14-60c1-5f80-bbc7-55ef81b5835c"
 CpuId = "adafc99b-e345-5852-983c-f28acb93d879"
 Downloads = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
+HTTP = "cd3eb016-35fb-5094-929b-558a96fad6f3"
+InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
 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 Scratch
 using Downloads
+using InteractiveUtils
 
 include("utils.jl")
 

src/features/detection.jl

@@ -2,58 +2,7 @@
 # Licensed under the MIT License. See LICENCE in the project root.
 # ------------------------------------------------------------------
 
- function readDB(filename)
-
-   d = Vector()
-   i=0
-   for ls in readlines(filename)
-      if i>0
-         l = split(ls,',')
-         ks = split(l[1],';')
-         d2 = d
-         for k in ks
-            next_d = nothing
-            for (key,value) in d
-               if (k == key)
-                  next_d = value      
-               end
-            end
-            if (isnothing(next_d))
-               next_d = Vector()
-               push!(d,(k,next_d))
-            end
-            d = next_d
-         end
-         push!(d,(l[2],tuple(l[2:length(l)]...)))
-         d = d2
-      end
-      i = i + 1
-   end
 
-   return d
- end
-
- function lookupDB(db, key)
-
-   d = db
-
-   while typeof(d) <: Vector
-
-      ks = d
-
-      found = false
-      for (k,v) in ks 
-         if (occursin(k,key))
-            d = v; found = true
-            break
-         end
-      end
-      if !found return nothing end
-   end
-
-   return d
-
-end
 
 const processor_dict = Ref{Vector}()
 const accelerator_dict = Ref{Vector}()
@@ -777,13 +726,8 @@ function identityInterconnection()
    return interconnection_features
 end
 
-# TODO
 function identifyNode()
 
-   println(stderr, "fail.")
-   println(stderr, "=> Note: detection of node features (cluster and cloud computing) not yet implemented. Using default features.")
-   println(stderr, "         You can setup node features manually.")
-
    node_features = Dict()
 
    node_features["node_count"] = 1
@@ -793,7 +737,13 @@ function identifyNode()
    node_features["node_machinefamily"] = "unset"
    node_features["node_machinetype"] = "unset"
    node_features["node_vcpus_count"] = "unset"
-
+   
+   for p in subtypes(CloudProvider)
+      print(stderr, string(p) * "?")
+      ok = getNodeFeatures(p, node_features)
+      if (isnothing(ok)) print(stderr, "No") else print(stderr, "Yes") end; print(stderr, ", ")
+   end
+   print(stderr, "... ok")
    return node_features
 end