From 99ca601432d1c372f14aaff30e3d37c8d71a2a78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Pawela?= Date: Wed, 6 Mar 2024 20:09:15 +0100 Subject: [PATCH] LightGraphsfix versions, switch to Graphs --- Project.toml | 20 ++++++++++---------- benchmarks/cplex_bench.jl | 2 +- benchmarks/cplex_bench_ref.jl | 2 +- docs/src/peps.md | 2 +- examples/truncation_BP.jl | 2 +- src/SpinGlassEngine.jl | 2 +- test/attic/zipper_var.jl | 2 +- test/experimental/mpo_size.jl | 2 +- test/experimental/truncate.jl | 2 +- test/experimental/truncate_small.jl | 2 +- test/experimental/zipper.jl | 2 +- test/runtests.jl | 2 +- 12 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Project.toml b/Project.toml index 24029bbf..154778a3 100644 --- a/Project.toml +++ b/Project.toml @@ -6,14 +6,13 @@ version = "1.0.0" [deps] CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba" DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae" +Graphs = "86223c79-3864-5bf0-83f7-82e725a168b6" LabelledGraphs = "605abd48-4d17-4660-b914-d4df33194460" -LightGraphs = "093fc24a-ae57-5d10-9952-331d41423f4d" LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" MKL = "33e6dc65-8f57-5167-99aa-e5a354878fb2" Memoization = "6fafb56a-5788-4b4e-91ca-c0cea6611c73" MetaGraphs = "626554b9-1ddb-594c-aa3c-2596fe9399a5" NNlib = "872c559c-99b0-510c-b3b7-b6c96a88d5cd" -NNlibCUDA = "a00861dc-f156-4864-bf3c-e6376f28a68d" ProgressMeter = "92933f4c-e287-5a05-a399-4b506db050ca" SpinGlassNetworks = "b7f6bd3e-55dc-4da6-96a9-ef9dbec6ac19" SpinGlassTensors = "7584fc6a-5a23-4eeb-8277-827aab0146ea" @@ -22,17 +21,18 @@ TensorCast = "02d47bb6-7ce6-556a-be16-bb1710789e2b" TensorOperations = "6aa20fa7-93e2-5fca-9bc0-fbd0db3c71a2" [compat] -DocStringExtensions = "0.8" -LabelledGraphs = "0.3" -LightGraphs = "1.3" -Memoization = "0.1.14" -MetaGraphs = "0.6" +CUDA = "4.4.1" +DocStringExtensions = "0.9" +Graphs = "1.9" +LabelledGraphs = "0.4.4" +Memoization = "0.2" +MetaGraphs = "0.7" SpinGlassNetworks = "1" SpinGlassTensors = "1" Statistics = "1.7.0" -TensorCast = "0.3, 0.4" -TensorOperations = "3.0.1" -julia = "1.8, 1.9" +TensorCast = "0.4" +TensorOperations = "4" +julia = "1.9, 1.10" [extras] Logging = "56ddb016-857b-54e1-b83d-db4d58db5568" diff --git a/benchmarks/cplex_bench.jl b/benchmarks/cplex_bench.jl index fcad023a..4468c2b5 100644 --- a/benchmarks/cplex_bench.jl +++ b/benchmarks/cplex_bench.jl @@ -1,5 +1,5 @@ using CPLEX, JuMP -using SpinGlassNetworks, LightGraphs +using SpinGlassNetworks, Graphs using LinearAlgebra using CSV, DataFrames diff --git a/benchmarks/cplex_bench_ref.jl b/benchmarks/cplex_bench_ref.jl index 52676b9b..5c22ea9d 100644 --- a/benchmarks/cplex_bench_ref.jl +++ b/benchmarks/cplex_bench_ref.jl @@ -1,6 +1,6 @@ using LinearAlgebra using CPLEX, JuMP -using SpinGlassNetworks, LightGraphs +using SpinGlassNetworks, Graphs function qubo(h::Vector, J::Matrix) b = [sum(J[i, :]) + sum(J[:, i]) for i ∈ 1:length(h)] diff --git a/docs/src/peps.md b/docs/src/peps.md index a887f951..61fa9fa6 100644 --- a/docs/src/peps.md +++ b/docs/src/peps.md @@ -12,7 +12,7 @@ PEPSNetwork using SpinGlassEngine, SpinGlassTensors, SpinGlassNetworks, SpinGlassPEPS using SpinGlassExhaustive using Logging -using LightGraphs +using Graphs using LinearAlgebra using TensorCast using MetaGraphs diff --git a/examples/truncation_BP.jl b/examples/truncation_BP.jl index ac409c0d..072f5e73 100644 --- a/examples/truncation_BP.jl +++ b/examples/truncation_BP.jl @@ -3,7 +3,7 @@ using SpinGlassEngine using SpinGlassNetworks using SpinGlassTensors using Logging -using LightGraphs +using Graphs using LinearAlgebra using TensorCast using MetaGraphs diff --git a/src/SpinGlassEngine.jl b/src/SpinGlassEngine.jl index 892c1620..51b83c10 100644 --- a/src/SpinGlassEngine.jl +++ b/src/SpinGlassEngine.jl @@ -11,7 +11,7 @@ using NNlib, NNlibCUDA using MetaGraphs using Memoization using LinearAlgebra, MKL -using LightGraphs +using Graphs using ProgressMeter using Statistics using DocStringExtensions diff --git a/test/attic/zipper_var.jl b/test/attic/zipper_var.jl index acc01fd7..4f2045e8 100644 --- a/test/attic/zipper_var.jl +++ b/test/attic/zipper_var.jl @@ -3,7 +3,7 @@ using SpinGlassEngine using SpinGlassNetworks using SpinGlassTensors using Logging -using LightGraphs +using Graphs using LinearAlgebra using TensorCast using MetaGraphs diff --git a/test/experimental/mpo_size.jl b/test/experimental/mpo_size.jl index c2352769..b713f872 100644 --- a/test/experimental/mpo_size.jl +++ b/test/experimental/mpo_size.jl @@ -3,7 +3,7 @@ using SpinGlassEngine using SpinGlassNetworks using SpinGlassTensors using Logging -using LightGraphs +using Graphs using LinearAlgebra using TensorCast using MetaGraphs diff --git a/test/experimental/truncate.jl b/test/experimental/truncate.jl index a6cdbbdf..80fa4a16 100644 --- a/test/experimental/truncate.jl +++ b/test/experimental/truncate.jl @@ -3,7 +3,7 @@ using SpinGlassEngine using SpinGlassNetworks using SpinGlassTensors using Logging -using LightGraphs +using Graphs using LinearAlgebra using TensorCast using MetaGraphs diff --git a/test/experimental/truncate_small.jl b/test/experimental/truncate_small.jl index 8c5c84c2..5311bc2e 100644 --- a/test/experimental/truncate_small.jl +++ b/test/experimental/truncate_small.jl @@ -3,7 +3,7 @@ using SpinGlassEngine using SpinGlassNetworks using SpinGlassTensors using Logging -using LightGraphs +using Graphs using LinearAlgebra using TensorCast using MetaGraphs diff --git a/test/experimental/zipper.jl b/test/experimental/zipper.jl index 8f5f2999..3aedfcf5 100644 --- a/test/experimental/zipper.jl +++ b/test/experimental/zipper.jl @@ -3,7 +3,7 @@ using SpinGlassEngine using SpinGlassNetworks using SpinGlassTensors using Logging -using LightGraphs +using Graphs using LinearAlgebra using TensorCast using MetaGraphs diff --git a/test/runtests.jl b/test/runtests.jl index 1a4adc95..e0b55580 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -3,7 +3,7 @@ using SpinGlassEngine using SpinGlassNetworks using SpinGlassTensors using Logging -using LightGraphs +using Graphs using LinearAlgebra using TensorCast using MetaGraphs