From 7332e6c3ea388c29a42d75e0a805667f649e79f4 Mon Sep 17 00:00:00 2001 From: kalmarek Date: Mon, 20 Jan 2020 01:19:50 +0100 Subject: [PATCH] add external logging and Makefile --- Makefile | 22 +++++++++++++ Manifest.toml | 80 ++++++++++++++++++++++++++++++++++++---------- Project.toml | 1 + runcomputations.jl | 29 +++++++++++++---- 4 files changed, 109 insertions(+), 23 deletions(-) create mode 100644 Makefile diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..c3ae702 --- /dev/null +++ b/Makefile @@ -0,0 +1,22 @@ +GROUPS334 = 24_24_54_G_0 14_24_48_G_1 16_24_54_G_0 26_26_48_G_4 16_18_48_G_0 24_26_48_G_1 14_24_54_G_2 24_26_54_G_0 18_18_54_G_0 14_16_54_G_2 26_26_48_G_5 16_26_48_G_0 26_26_40_G_0 14_26_54_G_2 18_26_54_G_0 14_26_48_G_1 14_14_54_G_0 14_14_54_G_4 16_18_54_G_0 14_24_48_G_0 14_26_54_G_4 14_16_48_G_1 14_24_40_G_0 16_24_48_G_1 14_14_48_G_4 14_24_54_G_0 14_14_48_G_5 18_26_48_G_0 14_14_40_G_0 14_26_40_G_0 16_16_48_G_0 14_18_54_G_0 16_24_54_G_2 18_24_48_G_0 14_16_54_G_0 16_24_48_G_0 16_16_48_G_1 16_26_54_G_2 14_26_54_G_6 16_16_40_G_0 16_16_54_G_0 26_26_48_G_1 26_26_48_G_0 14_18_54_G_2 16_26_48_G_1 18_26_54_G_2 14_14_40_G_4 14_26_40_G_4 14_26_54_G_0 14_16_48_G_0 14_18_48_G_0 14_14_48_G_0 24_24_48_G_0 14_26_48_G_5 16_26_54_G_0 16_26_40_G_0 18_26_40_G_0 26_26_40_G_4 24_26_40_G_0 18_18_40_G_0 24_24_48_G_1 14_26_48_G_4 18_24_40_G_0 16_24_40_G_0 24_26_54_G_2 14_16_40_G_0 18_18_48_G_0 14_18_40_G_0 16_18_40_G_0 18_24_54_G_0 24_26_48_G_0 18_24_54_G_2 24_24_40_G_0 14_14_48_G_1 14_26_48_G_0 16_18_54_G_2 + +GROUPS344 = 24_48_54_G_0 26_48_54_G_2 24_54_54_G_8 18_54_54_G_8 24_40_48_G_0 14_48_48_G_1 16_48_48_G_0 26_40_40_G_0 26_48_48_G_0 24_40_40_G_0 18_48_54_G_0 24_40_54_G_0 24_54_54_G_0 16_48_54_G_0 14_40_40_G_0 16_48_54_G_2 16_40_54_G_0 16_40_40_G_0 16_54_54_G_0 16_54_54_G_8 14_54_54_G_0 18_40_54_G_0 14_40_54_G_0 14_48_54_G_0 14_54_54_G_8 16_48_48_G_1 18_54_54_G_0 18_48_48_G_0 14_54_54_G_2 18_40_48_G_0 16_40_48_G_0 18_40_40_G_0 24_40_54_G_2 26_40_54_G_0 16_54_54_G_2 18_40_54_G_2 26_40_48_G_0 14_48_54_G_2 18_54_54_G_2 14_40_48_G_0 18_48_54_G_2 16_40_54_G_2 26_40_54_G_2 14_40_54_G_2 24_54_54_G_2 26_48_54_G_0 24_48_48_G_1 24_48_54_G_2 26_48_48_G_1 14_48_48_G_0 24_48_48_G_0 + +GROUPS444 = 48_54_54_G_2 48_48_48_G_1 40_40_48_G_0 48_54_54_G_8 48_54_54_G_0 40_40_40_G_0 48_48_54_G_0 40_48_54_G_0 40_48_48_G_0 40_54_54_G_2 48_48_48_G_0 40_40_54_G_0 40_54_54_G_0 40_48_54_G_2 40_54_54_G_8 + +JULIA = /opt/bin/julia + +.PHONY: allgroups groups334 groups344 groups444 $(GROUPS334) $(GROUPS344) $(GROUPS444) + +allgroups: groups334 groups344 groups444 + +groups334: $(GROUPS334) + +groups344: $(GROUPS344) + +groups444: $(GROUPS444) + +$(GROUPS334) $(GROUPS344) $(GROUPS444): + @echo "Checking property (T) for" $@ + @mkdir -p log2 + $(JULIA) --project=. runcomputations.jl $@ &>> log2/$@.log diff --git a/Manifest.toml b/Manifest.toml index 9e7c612..f6e795f 100644 --- a/Manifest.toml +++ b/Manifest.toml @@ -57,6 +57,18 @@ git-tree-sha1 = "f641eb0a4f00c343bbc32346e1217b86f3ce9dad" uuid = "49dc2e85-a5d0-5ad3-a950-438e2897f1b9" version = "0.5.1" +[[CodecBzip2]] +deps = ["BinaryProvider", "Libdl", "TranscodingStreams"] +git-tree-sha1 = "5db086e510c11b4c87d05067627eadb2dc079995" +uuid = "523fee87-0ab8-5b00-afb7-3ecf72e48cfd" +version = "0.6.0" + +[[CodecZlib]] +deps = ["BinaryProvider", "Libdl", "TranscodingStreams"] +git-tree-sha1 = "05916673a2627dd91b4969ff8ba6941bc85a960e" +uuid = "944b1d66-785c-5afd-91f1-9de20f533193" +version = "0.6.0" + [[CommonSubexpressions]] deps = ["Test"] git-tree-sha1 = "efdaf19ab11c7889334ca247ff4c9f7c322817b0" @@ -71,9 +83,9 @@ version = "2.2.0" [[DataStructures]] deps = ["InteractiveUtils", "OrderedCollections"] -git-tree-sha1 = "a1b652fb77ae8ca7ea328fa7ba5aa151036e5c10" +git-tree-sha1 = "b7720de347734f4716d1815b00ce5664ed6bbfd4" uuid = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8" -version = "0.17.6" +version = "0.17.9" [[Dates]] deps = ["Printf"] @@ -84,25 +96,25 @@ deps = ["Mmap"] uuid = "8bb1440f-4735-579b-a4ab-409b98df4dab" [[DiffResults]] -deps = ["Compat", "StaticArrays"] -git-tree-sha1 = "34a4a1e8be7bc99bc9c611b895b5baf37a80584c" +deps = ["StaticArrays"] +git-tree-sha1 = "da24935df8e0c6cf28de340b958f6aac88eaa0cc" uuid = "163ba53b-c6d8-5494-b064-1a9d43ac40c5" -version = "0.0.4" +version = "1.0.2" [[DiffRules]] deps = ["NaNMath", "Random", "SpecialFunctions"] -git-tree-sha1 = "f734b5f6bc9c909027ef99f6d91d5d9e4b111eed" +git-tree-sha1 = "10dca52cf6d4a62d82528262921daf63b99704a2" uuid = "b552c78f-8df3-52c6-915a-8e097449b14b" -version = "0.1.0" +version = "1.0.0" [[Distributed]] deps = ["Random", "Serialization", "Sockets"] uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b" [[ErrorfreeArithmetic]] -git-tree-sha1 = "a2b7d5a7962e5bfaab0e2e87c9cde7d3087f4e2c" +git-tree-sha1 = "cf883b07b5cf0783de9af6a0a3bc60cdce372c49" uuid = "90fa49ef-747e-5e6f-a989-263ba693cf1a" -version = "0.4.0" +version = "0.4.1" [[FastRounding]] deps = ["ErrorfreeArithmetic", "Test"] @@ -112,15 +124,15 @@ version = "0.2.0" [[FileIO]] deps = ["Pkg"] -git-tree-sha1 = "80c17c711c41416eb0ac68347dc036be68b37682" +git-tree-sha1 = "74585bf1f7ed7259e166011e89f49363d7fa89a6" uuid = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549" -version = "1.2.0" +version = "1.2.1" [[ForwardDiff]] deps = ["CommonSubexpressions", "DiffResults", "DiffRules", "NaNMath", "Random", "SpecialFunctions", "StaticArrays"] -git-tree-sha1 = "da46ac97b17793eba44ff366dc6cb70f1238a738" +git-tree-sha1 = "88b082d492be6b63f967b6c96b352e25ced1a34c" uuid = "f6369f11-7733-5829-9624-2563aa707210" -version = "0.10.7" +version = "0.10.9" [[GroupRings]] deps = ["AbstractAlgebra", "LinearAlgebra", "Markdown", "SparseArrays"] @@ -144,6 +156,18 @@ git-tree-sha1 = "d3ea5532668bf9bdd5e8d5f16571e0b520cbbb9f" uuid = "f67ccb44-e63f-5c2f-98bd-6dc0ccc4ba2f" version = "0.12.5" +[[HTTP]] +deps = ["Base64", "Dates", "IniFile", "MbedTLS", "Sockets"] +git-tree-sha1 = "5c49dab19938b119fe204fd7d7e8e174f4e9c68b" +uuid = "cd3eb016-35fb-5094-929b-558a96fad6f3" +version = "0.8.8" + +[[IniFile]] +deps = ["Test"] +git-tree-sha1 = "098e4d2c533924c921f9f9847274f2ad89e018b8" +uuid = "83e8ac13-25f8-5344-8a64-a9f2b223428f" +version = "0.5.0" + [[InteractiveUtils]] deps = ["Markdown"] uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240" @@ -166,6 +190,12 @@ git-tree-sha1 = "b34d7cef7b337321e97d22242c3c2b91f476748e" uuid = "682c06a0-de6a-54ab-a142-c8b1cf79cde6" version = "0.21.0" +[[JSONSchema]] +deps = ["BinaryProvider", "HTTP", "JSON"] +git-tree-sha1 = "b0a7f9328967df5213691d318a03cf70ea8c76b1" +uuid = "7d188eb4-7ad8-530c-ae41-71a32a6d4692" +version = "0.2.0" + [[JuMP]] deps = ["Calculus", "DataStructures", "ForwardDiff", "LinearAlgebra", "MathOptInterface", "NaNMath", "Random", "SparseArrays", "Statistics"] git-tree-sha1 = "ba7f96010ed290d77d5c941c32e5df107ca688a4" @@ -196,10 +226,10 @@ deps = ["Base64"] uuid = "d6f4376e-aef5-505a-96c1-9c027394607a" [[MathOptInterface]] -deps = ["BenchmarkTools", "LinearAlgebra", "OrderedCollections", "SparseArrays", "Test", "Unicode"] -git-tree-sha1 = "78427dcc212e0c0ad9658049bc56a50303ad9737" +deps = ["BenchmarkTools", "CodecBzip2", "CodecZlib", "JSON", "JSONSchema", "LinearAlgebra", "MutableArithmetics", "OrderedCollections", "SparseArrays", "Test", "Unicode"] +git-tree-sha1 = "d52d0671560f209b8a4604e7267d1f76ceae1f23" uuid = "b8f27783-ece8-5eb3-8dc8-9495eed66fee" -version = "0.9.7" +version = "0.9.9" [[MathProgBase]] deps = ["Compat"] @@ -207,9 +237,21 @@ git-tree-sha1 = "3bf2e534e635df810e5f4b4f1a8b6de9004a0d53" uuid = "fdba3010-5040-5b88-9595-932c9decdf73" version = "0.7.7" +[[MbedTLS]] +deps = ["BinaryProvider", "Dates", "Libdl", "Random", "Sockets"] +git-tree-sha1 = "85f5947b53c8cfd53ccfa3f4abae31faa22c2181" +uuid = "739be429-bea8-5141-9913-cc70e7f3736d" +version = "0.7.0" + [[Mmap]] uuid = "a63ad114-7e13-5084-954f-fe012c677804" +[[MutableArithmetics]] +deps = ["LinearAlgebra", "SparseArrays", "Test"] +git-tree-sha1 = "aceb69c03688ec90a31ecad9d4fb60db8d472856" +uuid = "d8a4904e-b15c-11e9-3269-09a3773c0cb0" +version = "0.2.1" + [[NaNMath]] git-tree-sha1 = "928b8ca9b2791081dc71a51c55347c27c618760f" uuid = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3" @@ -321,6 +363,12 @@ uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2" deps = ["Distributed", "InteractiveUtils", "Logging", "Random"] uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40" +[[TranscodingStreams]] +deps = ["Random", "Test"] +git-tree-sha1 = "7c53c35547de1c5b9d46a4797cf6d8253807108c" +uuid = "3bb67fe8-82b1-5028-8e26-92a6c54297fa" +version = "0.9.5" + [[URIParser]] deps = ["Test", "Unicode"] git-tree-sha1 = "6ddf8244220dfda2f17539fa8c9de20d6c575b69" diff --git a/Project.toml b/Project.toml index bbdafad..73399ed 100644 --- a/Project.toml +++ b/Project.toml @@ -2,5 +2,6 @@ AbstractAlgebra = "c3fe647b-3220-5bb0-a1ea-a7954cac585d" GroupRings = "0befed6a-bd73-11e8-1e41-a1190947c2f5" Groups = "5d8bd718-bd84-11e8-3b40-ad14f4a32557" +Logging = "56ddb016-857b-54e1-b83d-db4d58db5568" PropertyT = "03b72c93-0167-51e2-8a1e-eb4ff1fb940d" SCS = "c946c3f1-0d1f-5ce8-9dea-7daa1f7e2d13" diff --git a/runcomputations.jl b/runcomputations.jl index 3507bed..656b14b 100644 --- a/runcomputations.jl +++ b/runcomputations.jl @@ -1,3 +1,4 @@ +using Logging using PropertyT using PropertyT.LinearAlgebra @@ -21,7 +22,7 @@ include(joinpath("src", "FPGroups_GAP.jl")) include(joinpath("src", "groupparse.jl")) include(joinpath("src", "utils.jl")) -const HALFRADIUS = 3 +const HALFRADIUS = 1 using SCS with_SCS(iters=30_000, acceleration=10) = with_optimizer(SCS.Optimizer, @@ -32,13 +33,27 @@ with_SCS(iters=30_000, acceleration=10) = with_optimizer(SCS.Optimizer, acceleration_lookback=acceleration, warm_start=true) -groups = parse_grouppresentations("data/presentations_4_4_4.txt") -groups = parse_grouppresentations("data/presentations_3_3_4.txt") +groups334 = parse_grouppresentations("data/presentations_3_3_4.txt") +groups344 = parse_grouppresentations("data/presentations_3_4_4.txt") +groups444 = parse_grouppresentations("data/presentations_4_4_4.txt") -for (group_name, G) in groups - @info "" group_name +groups = merge(groups334, groups344, groups444) - check_propertyT(groups[group_name], "log/$(group_name)_r$HALFRADIUS", - HALFRADIUS, Inf, AutomaticStructure, with_SCS(50_000, 50)) +@assert length(ARGS) == 1 +let GROUP = ARGS[1] + @assert haskey(groups, GROUP) + group_name = "log2/$(GROUP)_r$(HALFRADIUS)" + open(joinpath(group_name, "full.log"), "a+") do logfile + logger = SimpleLogger(logfile) + global_logger(logger) + + @info "" group_name + check_propertyT(groups[GROUP], group_name, + HALFRADIUS, Inf, AutomaticStructure, with_SCS(100_000, 50)) + + check_propertyT(groups[GROUP], group_name, + HALFRADIUS, Inf, AutomaticStructure, with_SCS(1_000_000, 0)) + end + true # to keep make happy end