Merge branch 'bg/refactoring' of https://github.com/iitis/SpinGlassPE…

…PS.jl into bg/refactoring
euro-hpc-pl · Nov 24, 2020 · 2762d34 · 2762d34
2 parents 97ad0f7 + a7c58c0
commit 2762d34
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/ising.jl b/src/ising.jl
@@ -96,7 +96,7 @@ function ising_graph(instance::Union{String, Dict}, L::Int, β::Number=1)
     if typeof(instance) == String
         ising = CSV.File(instance, types=[Int, Int, Float64], comment = "#")
     else
-        ising = [ (first(c), last(c), J) for (c, J) ∈ instance ] 
+        ising = [ (i, j, J) for ((i, j), J) ∈ instance ] 
     end
 
     ig = MetaGraph(L, 0.0)

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -13,7 +13,7 @@ function reshape_row(A::AbstractArray{T}, dims::Tuple) where {T <: Number}
 end 
 
 my_tests = []
-if CUDA.functional() && CUDA.has_cutensor() && false
+if CUDA.functional() && CUDA.has_cutensor()
     push!(my_tests,
     "cuda/base.jl",
     "cuda/contractions.jl",
@@ -23,10 +23,10 @@ end
 
 push!(my_tests,
     "base.jl",
-    "contractions.jl",
-    "compressions.jl",
-    "ising.jl",
-    "search.jl"
+   "contractions.jl",
+   "compressions.jl",
+   "ising.jl",
+   "search.jl"
 )
 
 for my_test in my_tests