Merge branch 'lp/fix-tests' of https://github.com/euro-hpc-pl/SpinGla…

…ssEngine.jl into lp/fix-tests
euro-hpc-pl · Apr 7, 2024 · bd59d6c · bd59d6c
2 parents 500a3ac + fc88048
commit bd59d6c
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 36 deletions.
diff --git a/test/chimera_overlap_python.jl b/test/chimera_overlap_python.jl
@@ -2,10 +2,6 @@ using SpinGlassNetworks
 using SpinGlassTensors
 using SpinGlassEngine
 
-function my_brute_force(ig::IsingGraph; num_states::Int)
-    brute_force(ig, onGPU ? :GPU : :CPU, num_states=num_states)
-end
-
 m = 4
 n = 4
 t = 8

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -57,6 +57,10 @@ push!(my_tests,
     # "experimental/gauges.jl"
 )
 
+function my_brute_force(ig::IsingGraph; num_states::Int)
+    brute_force(ig, onGPU ? :GPU : :CPU, num_states=num_states)
+end
+
 @time begin
     for my_test ∈ my_tests
         include(my_test)

diff --git a/test/search_chimera_droplets.jl b/test/search_chimera_droplets.jl
@@ -4,10 +4,6 @@ using SpinGlassEngine
 
 using SpinGlassExhaustive
 
-function my_brute_force(ig::IsingGraph; num_states::Int)
-    brute_force(ig, onGPU ? :GPU : :CPU, num_states=num_states)
-end
-
 function bench(instance::String)
     m, n, t = 16, 16, 8
 

diff --git a/test/search_pegasus_droplets.jl b/test/search_pegasus_droplets.jl
@@ -4,10 +4,6 @@ using SpinGlassEngine
 
 using SpinGlassExhaustive
 
-function my_brute_force(ig::IsingGraph; num_states::Int)
-    brute_force(ig, onGPU ? :GPU : :CPU, num_states=num_states)
-end
-
 function bench(instance::String)
     m, n, t = 3, 3, 3
 

diff --git a/test/search_pegasus_nodiag_square_cross.jl b/test/search_pegasus_nodiag_square_cross.jl
@@ -1,8 +1,6 @@
 using SpinGlassExhaustive
 
-function my_brute_force(ig::IsingGraph; num_states::Int)
-    brute_force(ig, onGPU ? :GPU : :CPU, num_states=num_states)
-end
+
 
 function bench(instance::String)
     m, n, t = 4, 4, 24

diff --git a/test/search_pegasus_square_cross.jl b/test/search_pegasus_square_cross.jl
@@ -1,9 +1,5 @@
 using SpinGlassExhaustive
 
-function my_brute_force(ig::IsingGraph; num_states::Int)
-    brute_force(ig, onGPU ? :GPU : :CPU, num_states=num_states)
-end
-
 function bench(instance::String)
     m, n, t = 2, 2, 24
 

diff --git a/test/search_square_double_node_basic.jl b/test/search_square_double_node_basic.jl
@@ -1,10 +1,6 @@
 using SpinGlassEngine
 
-# function my_brute_force(ig::IsingGraph; num_states::Int)
-#     brute_force(ig, onGPU ? :GPU : :CPU, num_states=num_states)
-# end
-
-function run_test(instance, m, n, t)
+function run_test_square_double_node(instance, m, n, t)
     β = 2
     bond_dim = 16
     δp = 1e-10
@@ -80,12 +76,12 @@ end
 
 instance = "$(@__DIR__)/instances/pegasus_nondiag/3x2x1.txt"
 m, n, t = 3, 2, 1
-run_test(instance, m, n, t)
+run_test_square_double_node(instance, m, n, t)
 
 # instance = "$(@__DIR__)/instances/chimera_droplets/128power/001.txt"
 # m, n, t = 4, 4, 1
 # run_test(instance, m, n, t)
 
 instance = "$(@__DIR__)/instances/pathological/pegasus_nd_3_4_1.txt"
 m, n, t = 3, 4, 1
-run_test(instance, m, n, t)
+run_test_square_double_node(instance, m, n, t)
diff --git a/test/search_square_lattice.jl b/test/search_square_lattice.jl
@@ -1,9 +1,5 @@
 using SpinGlassExhaustive
 
-function my_brute_force(ig::IsingGraph; num_states::Int)
-    brute_force(ig, onGPU ? :GPU : :CPU, num_states=num_states)
-end
-
 function bench(instance::String)
     m, n, t = 5, 5, 4
 

diff --git a/test/search_squarecross_double_node_basic.jl b/test/search_squarecross_double_node_basic.jl
@@ -1,11 +1,7 @@
 using SpinGlassEngine
 using Test
 
-# function my_brute_force(ig::IsingGraph; num_states::Int)
-#     brute_force(ig, onGPU ? :GPU : :CPU, num_states=num_states)
-# end
-
-function run_test(instance, m, n, t)
+function run_test_squarecross_double_node(instance, m, n, t)
     β = 2
     bond_dim = 16
     δp = 1e-10
@@ -84,4 +80,4 @@ end
 
 instance = "$(@__DIR__)/instances/pathological/pegasus_3_4_1.txt"
 m, n, t = 3, 4, 1
-run_test(instance, m, n, t)
+run_test_squarecross_double_node(instance, m, n, t)