artifacts

Author: decarvalhojunior-fh

DefaultPlatform.toml

@@ -4,6 +4,7 @@ authors = ["Francisco Heron de Carvalho Junior <heron@dc.ufc.br> and contributor
 version = "0.1.0"
 
 [deps]
+Artifacts = "56f22d72-fd6d-98f1-02f0-08ddc0907c33"
 CpuId = "adafc99b-e345-5852-983c-f28acb93d879"
 JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
 TOML = "fa267f1f-6049-4f14-aa54-33bafae1ed76"

Project.toml

@@ -8,6 +8,7 @@ using CpuId
 using XMLDict
 using TOML
 using JSON
+using Artifacts
 
 # quantifiers
 include("quantifiers/atleast.jl")

src/PlatformAware.jl

@@ -23,16 +23,16 @@
    return d
  end
 
-global package_path = pkgdir(@__MODULE__)
+global database_path = joinpath(pkgdir(@__MODULE__), "src","platforms")
 
 @sync begin
 
- Threads.@spawn global processor_dict_intel = readDB(package_path * "/src/platforms/intel/db-processors.Intel.csv")
- Threads.@spawn global processor_dict_amd = readDB(package_path * "/src/platforms/amd/db-processors.AMD.csv")
+ Threads.@spawn global processor_dict_intel = readDB(joinpath(database_path,"intel","db-processors.Intel.csv"))
+ Threads.@spawn global processor_dict_amd = readDB(joinpath(database_path,"amd","db-processors.AMD.csv"))
 
- Threads.@spawn global accelerator_dict_intel = readDB(package_path * "/src/platforms/intel/db-accelerators.Intel.csv")
- Threads.@spawn global accelerator_dict_amd = readDB(package_path * "/src/platforms/amd/db-accelerators.AMD.csv")
- Threads.@spawn global accelerator_dict_nvidia = readDB(package_path * "/src/platforms/nvidia/db-accelerators.NVIDIA.csv")
+ Threads.@spawn global accelerator_dict_intel = readDB(joinpath(database_path,"intel","db-accelerators.Intel.csv"))
+ Threads.@spawn global accelerator_dict_amd = readDB(joinpath(database_path,"amd/db-accelerators.AMD.csv"))
+ Threads.@spawn global accelerator_dict_nvidia = readDB(joinpath(database_path,"nvidia","db-accelerators.NVIDIA.csv"))
 
 end
 
@@ -750,7 +750,6 @@ function setup()
       println("  1) A file path pointed by a PLATFORM_DESCRIPTION environment variable;")
       println("  2) The current directory;")
       println("  3) The /etc/conf directory.")
-      println("In the interactive environment, you may call PlatformAware.reload!() to reflect changes.")
    else
       TOML.print(stdout, platform_features)
       println(stderr)

src/awareness.jl

@@ -88,10 +88,9 @@ function readPlatormDescription()
                 println(stderr,"The platform description file (Platform.toml) was not found.")
                 println(stderr,"Using default platform settings (calling only default kernels).")
                 println(stderr,"A Platform.toml file may be created by calling PlatformAware.setup(). Do it !")
-                default_platorm_file = pkgdir(@__MODULE__) * "/DefaultPlatform.toml"
-                io = open(default_platorm_file)
+
+                io = joinpath(artifact"default_platform_description", "DefaultPlatform.toml")                
                 contents = read(io,String)
-                close(io)
                 contents
             end
          end

src/features.jl

@@ -8,7 +8,7 @@ mutable struct PlatformFeatures
     actual_platform_arguments_all
     actual_platform_arguments    
     function PlatformFeatures()
-        new(IdDict(),IdDict(),IdDict(),IdDict())
+        new(Dict(),Dict(),Dict(),Dict())
     end
 end
 
@@ -76,7 +76,7 @@ defT =[
     :storage_interface => StorageInterface
 ]
 
-state.default_platform_types_all = IdDict(defT...)
+state.default_platform_types_all = Dict(defT...)
 state.default_platform_types = copy(state.default_platform_types_all)
 
 function load!()