diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..ba39cc5 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +Manifest.toml diff --git a/Manifest.toml b/Manifest.toml index 0fa8d98..b61d31b 100644 --- a/Manifest.toml +++ b/Manifest.toml @@ -1,202 +1,247 @@ # This file is machine-generated - editing it directly is not advised -[[AbstractAlgebra]] -deps = ["InteractiveUtils", "LinearAlgebra", "Markdown", "Random", "RandomExtensions", "SparseArrays", "Test"] -git-tree-sha1 = "11f56bb196abe983e0fe5c238c3a75d8a3c94f2a" +julia_version = "1.8.3" +manifest_format = "2.0" +project_hash = "6c23ceb5cdf3867e2403b7204cff44b5f2ba776c" + +[[deps.AbstractAlgebra]] +deps = ["GroupsCore", "InteractiveUtils", "LinearAlgebra", "MacroTools", "Markdown", "Random", "RandomExtensions", "SparseArrays", "Test"] +git-tree-sha1 = "7772df04fda9bc25a44c9ef61e9dc7c92bb35d86" uuid = "c3fe647b-3220-5bb0-a1ea-a7954cac585d" -version = "0.21.0" +version = "0.27.7" -[[Antic_jll]] +[[deps.Antic_jll]] deps = ["Artifacts", "FLINT_jll", "GMP_jll", "JLLWrappers", "Libdl", "MPFR_jll", "Pkg"] -git-tree-sha1 = "0b859770975d52aaf54309e75232acd43265535f" +git-tree-sha1 = "4b354e5ef3d0a235515bd1b27af9cee3fa1de62c" uuid = "e21ec000-9f72-519e-ba6d-10061e575a27" -version = "0.200.500+0" +version = "0.201.500+0" -[[Arb_jll]] +[[deps.Arb_jll]] deps = ["Artifacts", "FLINT_jll", "GMP_jll", "JLLWrappers", "Libdl", "MPFR_jll", "Pkg"] -git-tree-sha1 = "9b6e16d49e968d7bf1f9c42cdbde4a99bae5025a" +git-tree-sha1 = "a564158702b6a4d1fb53c3fa399e891d7599afa0" uuid = "d9960996-1013-53c9-9ba4-74a4155039c3" -version = "200.2000.0+0" +version = "200.2300.0+0" -[[ArgTools]] +[[deps.ArgTools]] uuid = "0dad84c5-d112-42e6-8d28-ef12dabb789f" +version = "1.1.1" -[[Artifacts]] +[[deps.Artifacts]] uuid = "56f22d72-fd6d-98f1-02f0-08ddc0907c33" -[[Base64]] +[[deps.Base64]] uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f" -[[BinaryProvider]] -deps = ["Libdl", "Logging", "SHA"] -git-tree-sha1 = "ecdec412a9abc8db54c0efc5548c64dfce072058" -uuid = "b99e7846-7c00-51b0-8f62-c81ae34c0232" -version = "0.5.10" - -[[Calcium_jll]] +[[deps.Calcium_jll]] deps = ["Antic_jll", "Arb_jll", "Artifacts", "FLINT_jll", "GMP_jll", "JLLWrappers", "Libdl", "MPFR_jll", "Pkg"] -git-tree-sha1 = "d0c304bc221b916bc54716367402a0cc66d13e14" +git-tree-sha1 = "37fd335ecca9bd6ab25a2a4d26b7b2f6fe64c246" uuid = "fcfa6d1b-d8ce-59d5-8c0a-c0d7f69e4f40" -version = "0.400.100+0" +version = "0.401.100+0" -[[Ccluster_jll]] +[[deps.Ccluster_jll]] deps = ["Arb_jll", "Artifacts", "FLINT_jll", "GMP_jll", "JLLWrappers", "Libdl", "MPFR_jll", "Pkg"] git-tree-sha1 = "b22e78188d77634d672399bc52012ccec139204b" uuid = "2795595f-8cd6-5168-9a44-49c628ee0ce1" version = "1.1.7+0" -[[Dates]] +[[deps.CompilerSupportLibraries_jll]] +deps = ["Artifacts", "Libdl"] +uuid = "e66e0078-7015-5450-92f7-15fbd957f2ae" +version = "0.5.2+0" + +[[deps.Dates]] deps = ["Printf"] uuid = "ade2ca70-3891-5945-98fb-dc099432e06a" -[[Downloads]] -deps = ["ArgTools", "LibCURL", "NetworkOptions"] +[[deps.Downloads]] +deps = ["ArgTools", "FileWatching", "LibCURL", "NetworkOptions"] uuid = "f43a241f-c20a-4ad4-852c-f6b1247861c6" +version = "1.6.0" -[[FLINT_jll]] -deps = ["Artifacts", "GMP_jll", "JLLWrappers", "Libdl", "MPFR_jll", "Pkg"] -git-tree-sha1 = "9d9471a849fc56747297984347f2cec803651fbb" +[[deps.FLINT_jll]] +deps = ["Artifacts", "GMP_jll", "JLLWrappers", "Libdl", "MPFR_jll", "OpenBLAS32_jll", "Pkg"] +git-tree-sha1 = "34e110fb9bdaf16164ef8541d3d219554d796b01" uuid = "e134572f-a0d5-539d-bddf-3cad8db41a82" -version = "200.800.0+1" +version = "200.900.1+0" + +[[deps.FileWatching]] +uuid = "7b1f6079-737a-58dc-b8bc-7a2ca5c1b5ee" -[[GMP_jll]] +[[deps.GMP_jll]] deps = ["Artifacts", "Libdl"] uuid = "781609d7-10c4-51f6-84f2-b8444358ff6d" +version = "6.2.1+2" -[[InteractiveUtils]] +[[deps.GroupsCore]] +deps = ["Markdown", "Random"] +git-tree-sha1 = "9e1a5e9f3b81ad6a5c613d181664a0efc6fe6dd7" +uuid = "d5909c97-4eac-4ecc-a3dc-fdd0858a4120" +version = "0.4.0" + +[[deps.InteractiveUtils]] deps = ["Markdown"] uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240" -[[JLLWrappers]] +[[deps.JLLWrappers]] deps = ["Preferences"] -git-tree-sha1 = "642a199af8b68253517b80bd3bfd17eb4e84df6e" +git-tree-sha1 = "abc9885a7ca2052a736a600f7fa66209f96506e1" uuid = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210" -version = "1.3.0" +version = "1.4.1" -[[LibCURL]] +[[deps.LibCURL]] deps = ["LibCURL_jll", "MozillaCACerts_jll"] uuid = "b27032c2-a3e7-50c8-80cd-2d36dbcbfd21" +version = "0.6.3" -[[LibCURL_jll]] +[[deps.LibCURL_jll]] deps = ["Artifacts", "LibSSH2_jll", "Libdl", "MbedTLS_jll", "Zlib_jll", "nghttp2_jll"] uuid = "deac9b47-8bc7-5906-a0fe-35ac56dc84c0" +version = "7.84.0+0" -[[LibGit2]] +[[deps.LibGit2]] deps = ["Base64", "NetworkOptions", "Printf", "SHA"] uuid = "76f85450-5226-5b5a-8eaa-529ad045b433" -[[LibSSH2_jll]] +[[deps.LibSSH2_jll]] deps = ["Artifacts", "Libdl", "MbedTLS_jll"] uuid = "29816b5a-b9ab-546f-933c-edad1886dfa8" +version = "1.10.2+0" -[[Libdl]] +[[deps.Libdl]] uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb" -[[LinearAlgebra]] -deps = ["Libdl"] +[[deps.LinearAlgebra]] +deps = ["Libdl", "libblastrampoline_jll"] uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" -[[LoadFlint]] -deps = ["BinaryProvider", "FLINT_jll", "GMP_jll", "Libdl", "MPFR_jll", "Pkg"] -git-tree-sha1 = "3ad37ed3a8fcb45455473618f1c8ea378aaaf57f" -uuid = "472f376f-f1cf-461b-9ac1-d103423be9b7" -version = "0.6.1" - -[[Logging]] +[[deps.Logging]] uuid = "56ddb016-857b-54e1-b83d-db4d58db5568" -[[MPFR_jll]] +[[deps.MPFR_jll]] deps = ["Artifacts", "GMP_jll", "Libdl"] uuid = "3a97d323-0669-5f0c-9066-3539efd106a3" +version = "4.1.1+1" + +[[deps.MacroTools]] +deps = ["Markdown", "Random"] +git-tree-sha1 = "42324d08725e200c23d4dfb549e0d5d89dede2d2" +uuid = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09" +version = "0.5.10" -[[Markdown]] +[[deps.Markdown]] deps = ["Base64"] uuid = "d6f4376e-aef5-505a-96c1-9c027394607a" -[[MbedTLS_jll]] +[[deps.MbedTLS_jll]] deps = ["Artifacts", "Libdl"] uuid = "c8ffd9c3-330d-5841-b78e-0817d7145fa1" +version = "2.28.0+0" -[[MozillaCACerts_jll]] +[[deps.MozillaCACerts_jll]] uuid = "14a3606d-f60d-562e-9121-12d972cd8159" +version = "2022.2.1" -[[Nemo]] -deps = ["AbstractAlgebra", "Antic_jll", "Arb_jll", "BinaryProvider", "Calcium_jll", "FLINT_jll", "InteractiveUtils", "Libdl", "LinearAlgebra", "LoadFlint", "Markdown", "Pkg", "Random", "RandomExtensions", "SHA", "Test"] -git-tree-sha1 = "abc86e808aea941c8581831a5515d551db9a85cd" +[[deps.Nemo]] +deps = ["AbstractAlgebra", "Antic_jll", "Arb_jll", "Calcium_jll", "FLINT_jll", "InteractiveUtils", "Libdl", "LinearAlgebra", "Markdown", "Pkg", "Random", "RandomExtensions", "SHA", "Test"] +git-tree-sha1 = "4befc1ccf452c4f00e97308287578c5f394aa059" uuid = "2edaba10-b0f1-5616-af89-8c11ac63239a" -version = "0.26.1" +version = "0.32.5" -[[NetworkOptions]] +[[deps.NetworkOptions]] uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908" +version = "1.2.0" -[[Pkg]] +[[deps.OpenBLAS32_jll]] +deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "9c6c2ed4b7acd2137b878eb96c68e63b76199d0f" +uuid = "656ef2d0-ae68-5445-9ca0-591084a874a2" +version = "0.3.17+0" + +[[deps.OpenBLAS_jll]] +deps = ["Artifacts", "CompilerSupportLibraries_jll", "Libdl"] +uuid = "4536629a-c528-5b80-bd46-f80d51c5b363" +version = "0.3.20+0" + +[[deps.Pkg]] deps = ["Artifacts", "Dates", "Downloads", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Serialization", "TOML", "Tar", "UUIDs", "p7zip_jll"] uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" +version = "1.8.0" -[[Preferences]] +[[deps.Preferences]] deps = ["TOML"] -git-tree-sha1 = "00cfd92944ca9c760982747e9a1d0d5d86ab1e5a" +git-tree-sha1 = "47e5f437cc0e7ef2ce8406ce1e7e24d44915f88d" uuid = "21216c6a-2e73-6563-6e65-726566657250" -version = "1.2.2" +version = "1.3.0" -[[Printf]] +[[deps.Printf]] deps = ["Unicode"] uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7" -[[REPL]] +[[deps.REPL]] deps = ["InteractiveUtils", "Markdown", "Sockets", "Unicode"] uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb" -[[Random]] -deps = ["Serialization"] +[[deps.Random]] +deps = ["SHA", "Serialization"] uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" -[[RandomExtensions]] +[[deps.RandomExtensions]] deps = ["Random", "SparseArrays"] git-tree-sha1 = "062986376ce6d394b23d5d90f01d81426113a3c9" uuid = "fb686558-2515-59ef-acaa-46db3789a887" version = "0.4.3" -[[SHA]] +[[deps.SHA]] uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce" +version = "0.7.0" -[[Serialization]] +[[deps.Serialization]] uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b" -[[Sockets]] +[[deps.Sockets]] uuid = "6462fe0b-24de-5631-8697-dd941f90decc" -[[SparseArrays]] +[[deps.SparseArrays]] deps = ["LinearAlgebra", "Random"] uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" -[[TOML]] +[[deps.TOML]] deps = ["Dates"] uuid = "fa267f1f-6049-4f14-aa54-33bafae1ed76" +version = "1.0.0" -[[Tar]] +[[deps.Tar]] deps = ["ArgTools", "SHA"] uuid = "a4e569a6-e804-4fa4-b0f3-eef7a1d5b13e" +version = "1.10.1" -[[Test]] +[[deps.Test]] deps = ["InteractiveUtils", "Logging", "Random", "Serialization"] uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40" -[[UUIDs]] +[[deps.UUIDs]] deps = ["Random", "SHA"] uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4" -[[Unicode]] +[[deps.Unicode]] uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5" -[[Zlib_jll]] +[[deps.Zlib_jll]] deps = ["Libdl"] uuid = "83775a58-1f1d-513f-b197-d71354ab007a" +version = "1.2.12+3" + +[[deps.libblastrampoline_jll]] +deps = ["Artifacts", "Libdl", "OpenBLAS_jll"] +uuid = "8e850b90-86db-534c-a0d3-1478176c7d93" +version = "5.1.1+0" -[[nghttp2_jll]] +[[deps.nghttp2_jll]] deps = ["Artifacts", "Libdl"] uuid = "8e850ede-7688-5339-a07c-302acd2aaf8d" +version = "1.48.0+0" -[[p7zip_jll]] +[[deps.p7zip_jll]] deps = ["Artifacts", "Libdl"] uuid = "3f19e933-33d8-53b3-aaab-bd5110c3b7a0" +version = "17.4.0+0" diff --git a/REQUIRE b/REQUIRE deleted file mode 100644 index 3765bb8..0000000 --- a/REQUIRE +++ /dev/null @@ -1,5 +0,0 @@ -julia 1.1 -Libdl -Printf -AbstractAlgebra -Nemo diff --git a/deps/build.jl b/deps/build.jl deleted file mode 100644 index 0b9a41f..0000000 --- a/deps/build.jl +++ /dev/null @@ -1,107 +0,0 @@ -#using Libdl -# -#oldwdir = pwd() -# -#@show CCLUSTER_VERSION = "v1.1.5" -# -#pkgdir = dirname(dirname(@__FILE__)) -#wdir = joinpath(pkgdir, "deps") -#vdir = joinpath(pkgdir, "local") -## NemoLibsDir = joinpath(pkgdir, "../../packages/Nemo/9nu4c/deps/usr") -#NemoLibsDir = Base.find_package("Nemo") -#NemoLibsDir = Base.Filesystem.dirname(NemoLibsDir) -#NemoLibsDir = Base.Filesystem.dirname(NemoLibsDir) -#NemoLibsDir = joinpath( NemoLibsDir, "deps/usr" ) -# -#if Sys.isapple() && !("CC" in keys(ENV)) -# ENV["CC"] = "clang" -# ENV["CXX"] = "clang++" -#end -# -#if !ispath(vdir) -# -# mkdir(vdir) -# -# if !ispath(joinpath(vdir, "lib")) -# mkdir(joinpath(vdir, "lib")) -# end -#else -# println("Deleting old $vdir") -# rm(vdir, force=true, recursive=true) -# mkdir(vdir) -# mkdir(joinpath(vdir, "lib")) -#end -# -#LDFLAGS = "-Wl,-rpath,$vdir/lib -Wl,-rpath,\$\$ORIGIN/../share/julia/site/v$(VERSION.major).$(VERSION.minor)/Nemo/local/lib" -#DLCFLAGS = "-fPIC -fno-common" -# -## INSTALL CCLUSTER #temp -# -#cd(wdir) -# -#function download_dll(url_string, location_string) -# try -# run(`curl -o $(location_string) -L $(url_string)`) -# catch -# download(url_string, location_string) -# end -#end -# -#cd(wdir) -# -#if !Sys.iswindows() -# println("Cloning Ccluster ... ") -# try -# run(`git clone https://github.com/rimbach/Ccluster.git`) -# cd(joinpath("$wdir", "Ccluster")) -# run(`git checkout $CCLUSTER_VERSION`) -# cd(wdir) -# catch -# if ispath(joinpath("$wdir", "Ccluster")) -# #open(`patch -R --forward -d arb -r -`, "r", open("../deps-PIE-ftbfs.patch")) -# cd(joinpath("$wdir", "Ccluster")) -# run(`git fetch`) -# run(`git checkout $CCLUSTER_VERSION`) -# cd(wdir) -# end -# end -## # open(`patch --forward -d arb -r -`, "r", open("../deps-PIE-ftbfs.patch")) -# println("DONE") -#end -# -#cd(wdir) -# -#if Sys.iswindows() -# if Int == Int32 -# println("No binaries for 32 bits windows yet ... ") -# else -# println("downloading binaries ... ") -# download_dll("https://github.com/rimbach/Ccluster/releases/download/v1.1.5/libccluster.dll", joinpath(vdir, "lib", "libccluster.dll")) -# try -# run(`ln -sf $NemoLibsDir\\bin\\libflint.dll $vdir\\lib\\libflint-15.dll`) -# catch -# cp(joinpath(NemoLibsDir, "bin", "libflint.dll"), joinpath(vdir, "lib", "libflint-15.dll"), remove_destination=true) -# end -# try -# run(`ln -sf $NemoLibsDir\\bin\\libarb.dll $vdir\\lib\\libarb-2.dll`) -# catch -# cp(joinpath(NemoLibsDir, "bin", "libarb.dll"), joinpath(vdir, "lib", "libarb-2.dll"), remove_destination=true) -# end -# end -# println("DONE") -#else -# println("Building Ccluster ... ") -# cd(joinpath("$wdir", "Ccluster")) -# withenv("LD_LIBRARY_PATH"=>"$vdir/lib", "LDFLAGS"=>LDFLAGS) do -# run(`./configure --prefix=$vdir --disable-static --enable-shared --disable-pthread --with-flint=$NemoLibsDir --with-arb=$NemoLibsDir`) -# run(`make library -j4`) -# run(`make install`) -# end -# println("DONE") -#end -# -#push!(Libdl.DL_LOAD_PATH, joinpath(vdir, "lib")) -# -#cd(oldwdir) - -#TODO diff --git a/local/lib/libccluster.so b/local/lib/libccluster.so deleted file mode 120000 index 369d815..0000000 --- a/local/lib/libccluster.so +++ /dev/null @@ -1 +0,0 @@ -libccluster.so.0.0.0 \ No newline at end of file diff --git a/local/lib/libccluster.so.0.0.0 b/local/lib/libccluster.so.0.0.0 deleted file mode 100755 index f490412..0000000 Binary files a/local/lib/libccluster.so.0.0.0 and /dev/null differ