Skip to content

Commit d2f2fca

Browse files
authored
Merge pull request #47 from yuehhua/develop
Support linear algebra for FeaturedGraph and some refactoring
2 parents 7131803 + 8b1d213 commit d2f2fca

File tree

20 files changed

+408
-413
lines changed

20 files changed

+408
-413
lines changed

Manifest.toml

Lines changed: 70 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -8,30 +8,36 @@ version = "0.5.0"
88

99
[[AbstractTrees]]
1010
deps = ["Markdown"]
11-
git-tree-sha1 = "86d092c2599f1f7bb01668bf8eb3412f98d61e47"
11+
git-tree-sha1 = "33e450545eaf7699da1a6e755f9ea65f14077a45"
1212
uuid = "1520ce14-60c1-5f80-bbc7-55ef81b5835c"
13-
version = "0.3.2"
13+
version = "0.3.3"
1414

1515
[[Adapt]]
1616
deps = ["LinearAlgebra"]
17-
git-tree-sha1 = "c88cfc7f9c1f9f8633cddf0b56e86302b70f64c5"
17+
git-tree-sha1 = "fd04049c7dd78cfef0b06cdc1f0f181467655712"
1818
uuid = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
19-
version = "1.0.1"
19+
version = "1.1.0"
20+
21+
[[ArnoldiMethod]]
22+
deps = ["DelimitedFiles", "LinearAlgebra", "Random", "SparseArrays", "StaticArrays", "Test"]
23+
git-tree-sha1 = "2b6845cea546604fb4dca4e31414a6a59d39ddcd"
24+
uuid = "ec485272-7323-5ecc-a04f-4719b315124d"
25+
version = "0.0.4"
2026

2127
[[ArrayLayouts]]
2228
deps = ["FillArrays", "LinearAlgebra"]
23-
git-tree-sha1 = "bc779df8d73be70e4e05a63727d3a4dfb4c52b1f"
29+
git-tree-sha1 = "a504dca2ac7eda8761c8f7c1ed52427a1be75a3c"
2430
uuid = "4c555306-a7a7-4459-81d9-ec55ddd5c99a"
25-
version = "0.1.5"
31+
version = "0.2.6"
2632

2733
[[Base64]]
2834
uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
2935

3036
[[BinaryProvider]]
31-
deps = ["Libdl", "SHA"]
32-
git-tree-sha1 = "5b08ed6036d9d3f0ee6369410b830f8873d4024c"
37+
deps = ["Libdl", "Logging", "SHA"]
38+
git-tree-sha1 = "ecdec412a9abc8db54c0efc5548c64dfce072058"
3339
uuid = "b99e7846-7c00-51b0-8f62-c81ae34c0232"
34-
version = "0.5.8"
40+
version = "0.5.10"
3541

3642
[[CEnum]]
3743
git-tree-sha1 = "62847acab40e6855a9b5905ccb99c2b5cf6b3ebb"
@@ -82,9 +88,9 @@ version = "0.2.0"
8288

8389
[[CompilerSupportLibraries_jll]]
8490
deps = ["Libdl", "Pkg"]
85-
git-tree-sha1 = "067567a322fe466c5ec8d01413eee7127bd11699"
91+
git-tree-sha1 = "7c4f882c41faa72118841185afc58a2eb00ef612"
8692
uuid = "e66e0078-7015-5450-92f7-15fbd957f2ae"
87-
version = "0.3.1+0"
93+
version = "0.3.3+0"
8894

8995
[[CuArrays]]
9096
deps = ["AbstractFFTs", "Adapt", "CEnum", "CUDAapi", "CUDAdrv", "CUDAnative", "DataStructures", "GPUArrays", "Libdl", "LinearAlgebra", "MacroTools", "NNlib", "Printf", "Random", "Requires", "SparseArrays", "TimerOutputs"]
@@ -93,15 +99,15 @@ uuid = "3a865a2d-5b23-5a0f-bc46-62713ec82fae"
9399
version = "1.7.3"
94100

95101
[[DataAPI]]
96-
git-tree-sha1 = "674b67f344687a88310213ddfa8a2b3c76cc4252"
102+
git-tree-sha1 = "176e23402d80e7743fc26c19c681bfb11246af32"
97103
uuid = "9a962f9c-6df0-11e9-0e5d-c546b8b5ee8a"
98-
version = "1.1.0"
104+
version = "1.3.0"
99105

100106
[[DataStructures]]
101107
deps = ["InteractiveUtils", "OrderedCollections"]
102-
git-tree-sha1 = "5a431d46abf2ef2a4d5d00bd0ae61f651cf854c8"
108+
git-tree-sha1 = "be680f1ad03c0a03796aa3fda5a2180df7f83b46"
103109
uuid = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
104-
version = "0.17.10"
110+
version = "0.17.18"
105111

106112
[[Dates]]
107113
deps = ["Printf"]
@@ -127,23 +133,11 @@ version = "1.0.1"
127133
deps = ["Random", "Serialization", "Sockets"]
128134
uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b"
129135

130-
[[FFTW]]
131-
deps = ["AbstractFFTs", "FFTW_jll", "IntelOpenMP_jll", "Libdl", "LinearAlgebra", "MKL_jll", "Reexport"]
132-
git-tree-sha1 = "109d82fa4b00429f9afcce873e9f746f11f018d3"
133-
uuid = "7a1cc6ca-52ef-59f5-83cd-3a7055c09341"
134-
version = "1.2.0"
135-
136-
[[FFTW_jll]]
137-
deps = ["Libdl", "Pkg"]
138-
git-tree-sha1 = "ddb57f4cf125243b4aa4908c94d73a805f3cbf2c"
139-
uuid = "f5851436-0d7a-5f13-b9de-f02708fd171a"
140-
version = "3.3.9+4"
141-
142136
[[FillArrays]]
143137
deps = ["LinearAlgebra", "Random", "SparseArrays"]
144-
git-tree-sha1 = "85c6b57e2680fa28d5c8adc798967377646fbf66"
138+
git-tree-sha1 = "44f561e293987ffc84272cd3d2b14b0b93123d63"
145139
uuid = "1a297f60-69ca-5386-bcde-b61e274b549b"
146-
version = "0.8.5"
140+
version = "0.8.10"
147141

148142
[[FixedPointNumbers]]
149143
git-tree-sha1 = "4aaea64dd0c30ad79037084f8ca2b94348e65eaa"
@@ -158,9 +152,13 @@ version = "0.10.3"
158152

159153
[[ForwardDiff]]
160154
deps = ["CommonSubexpressions", "DiffResults", "DiffRules", "NaNMath", "Random", "SpecialFunctions", "StaticArrays"]
161-
git-tree-sha1 = "88b082d492be6b63f967b6c96b352e25ced1a34c"
155+
git-tree-sha1 = "869540e4367122fbffaace383a5bdc34d6e5e5ac"
162156
uuid = "f6369f11-7733-5829-9624-2563aa707210"
163-
version = "0.10.9"
157+
version = "0.10.10"
158+
159+
[[Future]]
160+
deps = ["Random"]
161+
uuid = "9fa8497b-333b-5362-9e8d-4d0656e87820"
164162

165163
[[GPUArrays]]
166164
deps = ["AbstractFFTs", "Adapt", "LinearAlgebra", "Printf", "Random", "Serialization"]
@@ -170,31 +168,30 @@ version = "2.0.1"
170168

171169
[[IRTools]]
172170
deps = ["InteractiveUtils", "MacroTools", "Test"]
173-
git-tree-sha1 = "1a4355e4b5b50be2311ebb644f34f3306dbd0410"
171+
git-tree-sha1 = "90ee39f9beaaa186e4968417ea2b8ed5673c91c0"
174172
uuid = "7869d1d1-7146-5819-86e3-90919afe41df"
175-
version = "0.3.1"
173+
version = "0.3.3"
176174

177-
[[IntelOpenMP_jll]]
178-
deps = ["Libdl", "Pkg"]
179-
git-tree-sha1 = "fb8e1c7a5594ba56f9011310790e03b5384998d6"
180-
uuid = "1d5cc7b8-4909-519e-a0f8-d0f5ad9712d0"
181-
version = "2018.0.3+0"
175+
[[Inflate]]
176+
git-tree-sha1 = "f5fc07d4e706b84f72d54eedcc1c13d92fb0871c"
177+
uuid = "d25df0c9-e2be-5dd7-82c8-3ad0b3e990b9"
178+
version = "0.1.2"
182179

183180
[[InteractiveUtils]]
184181
deps = ["Markdown"]
185182
uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
186183

187184
[[Juno]]
188185
deps = ["Base64", "Logging", "Media", "Profile"]
189-
git-tree-sha1 = "e1ba2a612645b3e07c773c3a208f215745081fe6"
186+
git-tree-sha1 = "a686b0cf235fa3e491b79b4783c2d2382292b436"
190187
uuid = "e5e0dc1b-0480-54bc-9374-aad01c23163d"
191-
version = "0.8.1"
188+
version = "0.8.2"
192189

193190
[[LLVM]]
194191
deps = ["CEnum", "Libdl", "Printf", "Unicode"]
195-
git-tree-sha1 = "b6b86801ae2f2682e0a4889315dc76b68db2de71"
192+
git-tree-sha1 = "72fc0a39d5899091ff2d4cdaa64cb5e4862cf813"
196193
uuid = "929cbde3-209d-540e-8aea-75f648917ca0"
197-
version = "1.3.4"
194+
version = "1.5.2"
198195

199196
[[LibGit2]]
200197
deps = ["Printf"]
@@ -203,19 +200,19 @@ uuid = "76f85450-5226-5b5a-8eaa-529ad045b433"
203200
[[Libdl]]
204201
uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
205202

203+
[[LightGraphs]]
204+
deps = ["ArnoldiMethod", "DataStructures", "Distributed", "Inflate", "LinearAlgebra", "Random", "SharedArrays", "SimpleTraits", "SparseArrays", "Statistics"]
205+
git-tree-sha1 = "6f85a35d2377cb2db1bc448ed0d6340d2bb1ea64"
206+
uuid = "093fc24a-ae57-5d10-9952-331d41423f4d"
207+
version = "1.3.3"
208+
206209
[[LinearAlgebra]]
207210
deps = ["Libdl"]
208211
uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
209212

210213
[[Logging]]
211214
uuid = "56ddb016-857b-54e1-b83d-db4d58db5568"
212215

213-
[[MKL_jll]]
214-
deps = ["IntelOpenMP_jll", "Libdl", "Pkg"]
215-
git-tree-sha1 = "720629cc8cbd12c146ca01b661fd1a6cf66e2ff4"
216-
uuid = "856f044c-d86e-5d09-b602-aeab76dc8ba7"
217-
version = "2019.0.117+2"
218-
219216
[[MacroTools]]
220217
deps = ["Markdown", "Random"]
221218
git-tree-sha1 = "f7d2e3f654af75f01ec49be82c231c382214223a"
@@ -259,10 +256,9 @@ uuid = "efe28fd5-8261-553b-a9e1-b2916fc3738e"
259256
version = "0.5.3+3"
260257

261258
[[OrderedCollections]]
262-
deps = ["Random", "Serialization", "Test"]
263-
git-tree-sha1 = "c4c13474d23c60d20a67b217f1d7f22a40edf8f1"
259+
git-tree-sha1 = "12ce190210d278e12644bcadf5b21cbdcf225cd3"
264260
uuid = "bac558e1-5e72-5ebc-8fee-abe8a469f55d"
265-
version = "1.1.0"
261+
version = "1.2.0"
266262

267263
[[Pkg]]
268264
deps = ["Dates", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"]
@@ -302,6 +298,16 @@ uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce"
302298
[[Serialization]]
303299
uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
304300

301+
[[SharedArrays]]
302+
deps = ["Distributed", "Mmap", "Random", "Serialization"]
303+
uuid = "1a1011a3-84de-559e-8e89-a11a2f7dc383"
304+
305+
[[SimpleTraits]]
306+
deps = ["InteractiveUtils", "MacroTools"]
307+
git-tree-sha1 = "2ee666b24ab8be6a922f9d6c11a86e1a703a7dda"
308+
uuid = "699a6c99-e7fa-54fc-8d76-47d257e15c1d"
309+
version = "0.9.2"
310+
305311
[[Sockets]]
306312
uuid = "6462fe0b-24de-5631-8697-dd941f90decc"
307313

@@ -317,15 +323,15 @@ uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
317323

318324
[[SpecialFunctions]]
319325
deps = ["OpenSpecFun_jll"]
320-
git-tree-sha1 = "e19b98acb182567bcb7b75bb5d9eedf3a3b5ec6c"
326+
git-tree-sha1 = "d8d8b8a9f4119829410ecd706da4cc8594a1e020"
321327
uuid = "276daf66-3868-5448-9aa4-cd146d93841b"
322-
version = "0.10.0"
328+
version = "0.10.3"
323329

324330
[[StaticArrays]]
325331
deps = ["LinearAlgebra", "Random", "Statistics"]
326-
git-tree-sha1 = "5a3bcb6233adabde68ebc97be66e95dcb787424c"
332+
git-tree-sha1 = "5c06c0aeb81bef54aed4b3f446847905eb6cbda0"
327333
uuid = "90137ffa-7385-5640-81b9-e52037218182"
328-
version = "0.12.1"
334+
version = "0.12.3"
329335

330336
[[Statistics]]
331337
deps = ["LinearAlgebra", "SparseArrays"]
@@ -343,9 +349,9 @@ uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
343349

344350
[[TimerOutputs]]
345351
deps = ["Printf"]
346-
git-tree-sha1 = "311765af81bbb48d7bad01fb016d9c328c6ede03"
352+
git-tree-sha1 = "f458ca23ff80e46a630922c555d838303e4b9603"
347353
uuid = "a759f4b9-e2f1-59dc-863e-4aeb61b1ea8f"
348-
version = "0.5.3"
354+
version = "0.5.6"
349355

350356
[[TranscodingStreams]]
351357
deps = ["Random", "Test"]
@@ -362,21 +368,21 @@ uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"
362368

363369
[[ZipFile]]
364370
deps = ["Libdl", "Printf", "Zlib_jll"]
365-
git-tree-sha1 = "8748302cfdec02c4ae9c97b112cf10003f7f767f"
371+
git-tree-sha1 = "254975fef2fc526583bb9b7c9420fe66ffe09f2f"
366372
uuid = "a5390f91-8eb1-5f08-bee0-b1d1ffed6cea"
367-
version = "0.9.1"
373+
version = "0.9.2"
368374

369375
[[Zlib_jll]]
370376
deps = ["Libdl", "Pkg"]
371-
git-tree-sha1 = "fd36a6739e256527287c5444960d0266712cd49e"
377+
git-tree-sha1 = "64b39656c75e67f85b4ac2b336c54674a39f599d"
372378
uuid = "83775a58-1f1d-513f-b197-d71354ab007a"
373-
version = "1.2.11+8"
379+
version = "1.2.11+11"
374380

375381
[[Zygote]]
376-
deps = ["ArrayLayouts", "DiffRules", "FFTW", "FillArrays", "ForwardDiff", "IRTools", "InteractiveUtils", "LinearAlgebra", "MacroTools", "NNlib", "NaNMath", "Random", "Requires", "SpecialFunctions", "Statistics", "ZygoteRules"]
377-
git-tree-sha1 = "9688fce24bd8a9468fed12f3d5206099a39054dc"
382+
deps = ["AbstractFFTs", "ArrayLayouts", "DiffRules", "FillArrays", "ForwardDiff", "Future", "IRTools", "InteractiveUtils", "LinearAlgebra", "MacroTools", "NNlib", "NaNMath", "Random", "Requires", "SpecialFunctions", "Statistics", "ZygoteRules"]
383+
git-tree-sha1 = "707ceea58e2bd0ff3077ab13a92f8355181d3ee4"
378384
uuid = "e88e6eb3-aa80-5325-afca-941959d7151f"
379-
version = "0.4.12"
385+
version = "0.4.20"
380386

381387
[[ZygoteRules]]
382388
deps = ["MacroTools"]

Project.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
1111
FillArrays = "1a297f60-69ca-5386-bcde-b61e274b549b"
1212
Flux = "587475ba-b771-5e3f-ad9e-33799f191a9c"
1313
IRTools = "7869d1d1-7146-5819-86e3-90919afe41df"
14+
LightGraphs = "093fc24a-ae57-5d10-9952-331d41423f4d"
1415
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
1516
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
1617
Requires = "ae029012-a4dd-5104-9daa-d747884805df"
@@ -28,17 +29,17 @@ DataStructures = "~0.17"
2829
FillArrays = "^0.8.5"
2930
Flux = "~0.10"
3031
IRTools = "~0.3"
32+
LightGraphs = "1.3"
3133
Requires = "^1.0.0"
3234
StaticArrays = "^0.12.1"
3335
Zygote = "~0.4"
3436
ZygoteRules = "~0.2"
3537
julia = "1.4"
3638

3739
[extras]
38-
LightGraphs = "093fc24a-ae57-5d10-9952-331d41423f4d"
3940
MetaGraphs = "626554b9-1ddb-594c-aa3c-2596fe9399a5"
4041
SimpleWeightedGraphs = "47aef6b3-ad0c-573a-a1e2-d07658019622"
4142
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
4243

4344
[targets]
44-
test = ["Test", "LightGraphs", "SimpleWeightedGraphs", "MetaGraphs"]
45+
test = ["Test", "SimpleWeightedGraphs", "MetaGraphs"]

0 commit comments

Comments
 (0)