Remove Artifacts.toml from main project

mroavi · mroavi · commit 9fe279786bf9 · 2023-07-09T20:24:06.000+02:00
and, instead, add it to the test project.
The new Artifacts.toml includes problems for all 4 tasks,
which are MAR, MPE, MMAP, and PR.
diff --git a/Artifacts.toml b/Artifacts.toml
diff --git a/Project.toml b/Project.toml
@@ -4,7 +4,6 @@ authors = ["Jin-Guo Liu", "Martin Roa Villescas"]
 version = "0.1.0"
 
 [deps]
-Artifacts = "56f22d72-fd6d-98f1-02f0-08ddc0907c33"
 CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba"
 DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
@@ -16,7 +15,6 @@ TropicalGEMM = "a4ad3063-64a7-4bad-8738-34ed09bc0236"
 TropicalNumbers = "b3a74e9c-7526-4576-a4eb-79c0d4c32334"
 
 [compat]
-Artifacts = "1"
 CUDA = "4"
 DocStringExtensions = "0.8.6, 0.9"
 OMEinsum = "0.7"
diff --git a/benchmark/bench_map.jl b/benchmark/bench_map.jl
@@ -6,7 +6,8 @@ using Artifacts
 
 const SUITE = BenchmarkGroup()
 
-problem = read_uai_problem("Promedus_14")
+model_filepath, evid_filepath, sol_filepath = get_instance_filepaths("Promedus_14", "MAR")
+problem = uai_problem_from_file(model_filepath; uai_evid_filepath = evid_filepath, uai_mar_filepath = sol_filepath)
 
 optimizer = TreeSA(ntrials = 1, niters = 2, βs = 1:0.1:40)
 tn = TensorNetworkModel(problem; optimizer)
diff --git a/benchmark/bench_mar.jl b/benchmark/bench_mar.jl
@@ -8,7 +8,8 @@ using Artifacts
 
 const SUITE = BenchmarkGroup()
 
-problem = read_uai_problem("Promedus_14")
+model_filepath, evid_filepath, sol_filepath = get_instance_filepaths("Promedus_14", "MAR")
+problem = uai_problem_from_file(model_filepath; uai_evid_filepath = evid_filepath, uai_mar_filepath = sol_filepath)
 
 optimizer = TreeSA(ntrials = 1, niters = 5, βs = 0.1:0.1:100)
 tn1 = TensorNetworkModel(problem; optimizer)
diff --git a/benchmark/bench_mmap.jl b/benchmark/bench_mmap.jl
@@ -6,7 +6,8 @@ using Artifacts
 
 const SUITE = BenchmarkGroup()
 
-problem = read_uai_problem("Promedus_14")
+model_filepath, evid_filepath, sol_filepath = get_instance_filepaths("Promedus_14", "MAR")
+problem = uai_problem_from_file(model_filepath; uai_evid_filepath = evid_filepath, uai_mar_filepath = sol_filepath)
 optimizer = TreeSA(ntrials = 1, niters = 2, βs = 1:0.1:40)
 
 # Does not marginalize any var
diff --git a/src/Core.jl b/src/Core.jl
@@ -41,15 +41,6 @@ end
 $TYPEDSIGNATURES
 
 Set the evidence of an UAI instance.
-
-### Examples
-```jldoctest; setup=:(using TensorInference)
-julia> problem = read_uai_problem("Promedus_14"); problem.obsvars, problem.obsvals
-([42, 48, 27, 30, 29, 15, 124, 5, 148], [1, 1, 1, 1, 1, 1, 1, 1, 1])
-
-julia> set_evidence!(problem, 2=>0, 4=>1); problem.obsvars, problem.obsvals
-([2, 4], [0, 1])
-```
 """
 function set_evidence!(uai::UAIInstance, pairs::Pair{Int}...)
     empty!(uai.obsvars)
diff --git a/src/TensorInference.jl b/src/TensorInference.jl
@@ -2,7 +2,6 @@ module TensorInference
 
 using OMEinsum, LinearAlgebra
 using DocStringExtensions, TropicalNumbers
-using Artifacts
 # The Tropical GEMM support
 using TropicalGEMM
 using StatsBase
@@ -12,7 +11,7 @@ export RescaledArray
 export contraction_complexity, TreeSA, GreedyMethod, KaHyParBipartite, SABipartite, MergeGreedy, MergeVectors
 
 # read and load uai files
-export read_uai_file, read_td_file, read_uai_evid_file, read_uai_mar_file, read_uai_problem, uai_problem_from_file
+export read_uai_file, read_td_file, read_uai_evid_file, read_uai_mar_file, uai_problem_from_file
 export set_evidence!
 
 # marginals
diff --git a/src/utils.jl b/src/utils.jl
@@ -175,18 +175,6 @@ end
 """
 $(TYPEDSIGNATURES)
 
-Read a UAI problem from an artifact.
-"""
-function read_uai_problem(problem::AbstractString; eltype = Float64)::UAIInstance
-    uai_filepath = joinpath(artifact"MAR_prob", problem * ".uai")
-    uai_evid_filepath = joinpath(artifact"MAR_prob", problem * ".uai.evid")
-    uai_mar_filepath = joinpath(artifact"MAR_sol", problem * ".uai.MAR")
-    return uai_problem_from_file(uai_filepath; uai_evid_filepath, uai_mar_filepath, eltype)
-end
-
-"""
-$(TYPEDSIGNATURES)
-
 Read a UAI problem from a file.
 """
 function uai_problem_from_file(uai_filepath::String; uai_evid_filepath::String = "", uai_mar_filepath::String = "", eltype = Float64)::UAIInstance
diff --git a/test/Artifacts.toml b/test/Artifacts.toml
@@ -1,34 +1,6 @@
-[MAR_prob]
-git-tree-sha1 = "4dd2447ab2b8eeb8fbfc35d0c7416b5f01ff9711"
+[uai2014]
+git-tree-sha1 = "5d2c17ee6ad8e89f046b370e865780dea89e4268"
 
-    [[MAR_prob.download]]
-    sha256 = "857f8b6706dad46698c6e90a1804e1b40633d87f6eb3d82b5f29929bb6f5155a"
-    url = "https://personal.utdallas.edu/~vibhav.gogate/uai14-competition/files/MAR_prob.tar.gz"
-
-[MAR_sol]
-git-tree-sha1 = "8a86826145efa6b7d7d9c837acd80e33d1368f37"
-
-    [[MAR_sol.download]]
-    sha256 = "d8616ebfc1ab538c2957919f8bb47bd9c1fb86392dd025585cde041bc4e0e934"
-    url = "https://personal.utdallas.edu/~vibhav.gogate/uai14-competition/files/MAR_sol.tar.gz"
-
-[MMAP_UAI2014]
-git-tree-sha1 = "869778bbf5214cbff2169ecc2f3e67e2cb1b6a7a"
-
-    [[MMAP_UAI2014.download]]
-    sha256 = "0080c4851e23c17a42262cdaf4cb1a7aa4b80674435756d0d1ade76d80b9f33f"
-    url = "https://personal.utdallas.edu/~vibhav.gogate/uai14-competition/files/MMAP_UAI2014.tar.gz"
-
-[PR_prob]
-git-tree-sha1 = "a9baff14cc5f64a5d95920928581e2b4eb82acd3"
-
-    [[PR_prob.download]]
-    sha256 = "20b38d43a0718ab555988f041069380a30bbb68881e60d07ebf004054eb9f14f"
-    url = "https://personal.utdallas.edu/~vibhav.gogate/uai14-competition/files/PR_prob.tar.gz"
-
-[PR_sol]
-git-tree-sha1 = "e6643155c4ee433d20ddb7e58441b33b35ecacb8"
-
-    [[PR_sol.download]]
-    sha256 = "86b37c0e7c83f6ff162c88d48250e0bf2b7dd73d44441074ae93a81986238436"
-    url = "https://personal.utdallas.edu/~vibhav.gogate/uai14-competition/files/PR_sol.tar.gz"
+    [[uai2014.download]]
+    sha256 = "22dff6d2b27f5e78b315e4c756c24a0fb9e476c8e814a2546d7f61822426b08a"
+    url = "https://github.com/mroavi/uai-2014-inference-competition/raw/main/uai2014.tar.gz"
diff --git a/test/cuda.jl b/test/cuda.jl
@@ -5,7 +5,8 @@ CUDA.allowscalar(false)
 
 @testset "gradient-based tensor network solvers" begin
     ################# Load problem ####################
-    instance = read_uai_problem("Promedus_14")
+    model_filepath, evid_filepath, sol_filepath = get_instance_filepaths("Promedus_14", "MAR")
+    instance = uai_problem_from_file(model_filepath; uai_evid_filepath = evid_filepath, uai_mar_filepath = sol_filepath)
 
     # does not optimize over open vertices
     tn = TensorNetworkModel(instance; optimizer = TreeSA(ntrials = 1, niters = 2, βs = 1:0.1:40))
@@ -22,7 +23,8 @@ end
 
 @testset "map" begin
     ################# Load problem ####################
-    instance = read_uai_problem("Promedus_14")
+    model_filepath, evid_filepath, sol_filepath = get_instance_filepaths("Promedus_14", "MAR")
+    instance = uai_problem_from_file(model_filepath; uai_evid_filepath = evid_filepath, uai_mar_filepath = sol_filepath)
 
     # does not optimize over open vertices
     tn = TensorNetworkModel(instance; optimizer = TreeSA(ntrials = 1, niters = 2, βs = 1:0.1:40))
@@ -37,7 +39,8 @@ end
 
 @testset "mmap" begin
     ################# Load problem ####################
-    instance = read_uai_problem("Promedus_14")
+    model_filepath, evid_filepath, sol_filepath = get_instance_filepaths("Promedus_14", "MAR")
+    instance = uai_problem_from_file(model_filepath; uai_evid_filepath = evid_filepath, uai_mar_filepath = sol_filepath)
 
     optimizer = TreeSA(ntrials = 1, niters = 2, βs = 1:0.1:40)
     tn_ref = TensorNetworkModel(instance; optimizer)
diff --git a/test/inference.jl b/test/inference.jl
@@ -12,7 +12,8 @@ using TensorInference
 end
 
 @testset "cached, rescaled contract" begin
-    problem = read_uai_problem("Promedus_14")
+    model_filepath, evid_filepath, sol_filepath = get_instance_filepaths("Promedus_14", "MAR")
+    problem = uai_problem_from_file(model_filepath; uai_evid_filepath = evid_filepath, uai_mar_filepath = sol_filepath)
     ref_sol = problem.reference_marginals
     optimizer = TreeSA(ntrials = 1, niters = 5, βs = 0.1:0.1:100)
     tn = TensorNetworkModel(problem; optimizer)
@@ -36,7 +37,7 @@ end
 function get_problems(problem_set::String)
     # Capture the problem names that belong to the current problem_set
     regex = Regex("($(problem_set)_\\d*)(\\.uai)\$")
-    return readdir(artifact"MAR_prob"; sort = false) |>
+    return readdir(joinpath(artifact"uai2014", "MAR"); sort = false) |>
            x -> map(y -> match(regex, y), x) |> # apply regex
                 x -> filter(!isnothing, x) |> # filter out `nothing` values
                      x -> map(first, x) # get the first capture of each element
@@ -65,7 +66,8 @@ end
             for problem in problems
                 @info "Testing: $problem"
                 @testset "$(problem)" begin
-                    problem = read_uai_problem(problem)
+                    model_filepath, evid_filepath, sol_filepath = get_instance_filepaths(problem, "MAR")
+                    problem = uai_problem_from_file(model_filepath; uai_evid_filepath = evid_filepath, uai_mar_filepath = sol_filepath)
                     ref_sol = problem.reference_marginals
                     obsvars = problem.obsvars
 
diff --git a/test/maxprob.jl b/test/maxprob.jl
@@ -4,7 +4,8 @@ using TensorInference
 
 @testset "map" begin
     ################# Load problem ####################
-    instance = read_uai_problem("Promedus_14")
+    model_filepath, evid_filepath, sol_filepath = get_instance_filepaths("Promedus_14", "MAR")
+    instance = uai_problem_from_file(model_filepath; uai_evid_filepath = evid_filepath, uai_mar_filepath = sol_filepath)
 
     # does not optimize over open vertices
     tn = TensorNetworkModel(instance; optimizer = TreeSA(ntrials = 3, niters = 2, βs = 1:0.1:80))
diff --git a/test/mmap.jl b/test/mmap.jl
@@ -9,7 +9,8 @@ end
 
 @testset "mmap" begin
     ################# Load problem ####################
-    instance = read_uai_problem("Promedus_14")
+    model_filepath, evid_filepath, sol_filepath = get_instance_filepaths("Promedus_14", "MAR")
+    instance = uai_problem_from_file(model_filepath; uai_evid_filepath = evid_filepath, uai_mar_filepath = sol_filepath)
 
     optimizer = TreeSA(ntrials = 1, niters = 2, βs = 1:0.1:40)
     tn_ref = TensorNetworkModel(instance; optimizer)
diff --git a/test/runtests.jl b/test/runtests.jl
@@ -1,5 +1,7 @@
 using Test, TensorInference, Documenter, Pkg
 
+include("utils.jl")
+
 artifacts_toml = "Artifacts.toml"
 artifacts = Pkg.Artifacts.select_downloadable_artifacts(artifacts_toml)
 for name in keys(artifacts)
@@ -17,6 +19,7 @@ end
 @testset "MMAP" begin
     include("mmap.jl")
 end
+
 @testset "MMAP" begin
     include("sampling.jl")
 end
diff --git a/test/utils.jl b/test/utils.jl
@@ -0,0 +1,17 @@
+using Artifacts
+
+"""
+Helper function to obtain the filepaths for an instance's model, evidence, and
+solution files within the uai2014 artifact, corresponding to the provided
+task.
+
+# Arguments
+- `problem_name::String`: The name of the problem or instance.
+- `task::String`: The task type. Supported tasks are "MAR", "MPE", "MMAP", and "PR".
+"""
+function get_instance_filepaths(problem_name::AbstractString, task::AbstractString)
+  model_filepath = joinpath(artifact"uai2014", task, problem_name * ".uai")
+  evid_filepath = joinpath(artifact"uai2014", task, problem_name * ".uai.evid")
+  sol_filepath = joinpath(artifact"uai2014", task, problem_name * ".uai." * task)
+  return model_filepath, evid_filepath, sol_filepath
+end
