Skip to content

Commit c3a5db5

Browse files
authored
Merge pull request #354 from JuliaParallel/jps/split-out-logging
Split out logging as TimespanLogging.jl
2 parents d8f8e04 + f6b19f6 commit c3a5db5

27 files changed

+612
-179
lines changed

.buildkite/pipeline.yml

Lines changed: 28 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
sandbox.jl: "true"
66
os: linux
77
arch: x86_64
8+
command: "julia --project -e 'using Pkg; Pkg.develop(;path=\"lib/TimespanLogging\")'"
89
.bench: &bench
910
if: build.message =~ /\[run benchmarks\]/
1011
agents:
@@ -22,8 +23,8 @@ steps:
2223
version: "1.7"
2324
- JuliaCI/julia-test#v1:
2425
julia_args: "--threads=1"
25-
# - JuliaCI/julia-coverage#v1:
26-
# codecov: true
26+
- JuliaCI/julia-coverage#v1:
27+
codecov: true
2728
- label: Julia 1.8
2829
timeout_in_minutes: 60
2930
<<: *test
@@ -32,8 +33,8 @@ steps:
3233
version: "1.8"
3334
- JuliaCI/julia-test#v1:
3435
julia_args: "--threads=1"
35-
# - JuliaCI/julia-coverage#v1:
36-
# codecov: true
36+
- JuliaCI/julia-coverage#v1:
37+
codecov: true
3738
- label: Julia nightly
3839
timeout_in_minutes: 60
3940
<<: *test
@@ -42,8 +43,8 @@ steps:
4243
version: "1.9-nightly"
4344
- JuliaCI/julia-test#v1:
4445
julia_args: "--threads=1"
45-
# - JuliaCI/julia-coverage#v1:
46-
# codecov: true
46+
- JuliaCI/julia-coverage#v1:
47+
codecov: true
4748
- label: Julia 1.7 (macOS)
4849
timeout_in_minutes: 60
4950
<<: *test
@@ -56,8 +57,26 @@ steps:
5657
version: "1.7"
5758
- JuliaCI/julia-test#v1:
5859
julia_args: "--threads=1"
59-
# - JuliaCI/julia-coverage#v1:
60-
# codecov: true
60+
- JuliaCI/julia-coverage#v1:
61+
codecov: true
62+
- label: Julia 1.7 - TimespanLogging
63+
timeout_in_minutes: 60
64+
<<: *test
65+
plugins:
66+
- JuliaCI/julia#v1:
67+
version: "1.7"
68+
- JuliaCI/julia-coverage#v1:
69+
codecov: true
70+
command: "julia --project -e 'using Pkg; Pkg.develop(;path=\"lib/TimespanLogging\"); Pkg.test(\"TimespanLogging\")'"
71+
- label: Julia 1.7 - DaggerWebDash
72+
timeout_in_minutes: 60
73+
<<: *test
74+
plugins:
75+
- JuliaCI/julia#v1:
76+
version: "1.7"
77+
- JuliaCI/julia-coverage#v1:
78+
codecov: true
79+
command: "julia -e 'using Pkg; Pkg.develop(;path=pwd()); Pkg.develop(;path=\"lib/TimespanLogging\"); Pkg.develop(;path=\"lib/DaggerWebDash\"); include(\"lib/DaggerWebDash/test/runtests.jl\")'"
6180
- label: Benchmarks
6281
timeout_in_minutes: 120
6382
<<: *bench
@@ -69,7 +88,7 @@ steps:
6988
command: "julia -e 'using Pkg; Pkg.add(\"BenchmarkTools\"); Pkg.develop(;path=pwd())'; JULIA_PROJECT=\"$PWD\" julia --project benchmarks/benchmark.jl"
7089
env:
7190
JULIA_NUM_THREADS: "4"
72-
BENCHMARK: "cpu,cpu+dagger"
91+
BENCHMARK: "nmf:raw,dagger"
7392
BENCHMARK_PROCS: "4:4"
7493
BENCHMARK_SCALE: "5:5:50"
7594
artifacts:

Manifest.toml

Lines changed: 294 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,294 @@
1+
# This file is machine-generated - editing it directly is not advised
2+
3+
julia_version = "1.7.2"
4+
manifest_format = "2.0"
5+
6+
[[deps.ArgTools]]
7+
uuid = "0dad84c5-d112-42e6-8d28-ef12dabb789f"
8+
9+
[[deps.Artifacts]]
10+
uuid = "56f22d72-fd6d-98f1-02f0-08ddc0907c33"
11+
12+
[[deps.Base64]]
13+
uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
14+
15+
[[deps.ChainRulesCore]]
16+
deps = ["Compat", "LinearAlgebra", "SparseArrays"]
17+
git-tree-sha1 = "80ca332f6dcb2508adba68f22f551adb2d00a624"
18+
uuid = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
19+
version = "1.15.3"
20+
21+
[[deps.ChangesOfVariables]]
22+
deps = ["ChainRulesCore", "LinearAlgebra", "Test"]
23+
git-tree-sha1 = "38f7a08f19d8810338d4f5085211c7dfa5d5bdd8"
24+
uuid = "9e997f8a-9a97-42d5-a9f1-ce6bfc15e2c0"
25+
version = "0.1.4"
26+
27+
[[deps.ColorTypes]]
28+
deps = ["FixedPointNumbers", "Random"]
29+
git-tree-sha1 = "eb7f0f8307f71fac7c606984ea5fb2817275d6e4"
30+
uuid = "3da002f7-5984-5a60-b8a6-cbb66c0b333f"
31+
version = "0.11.4"
32+
33+
[[deps.Colors]]
34+
deps = ["ColorTypes", "FixedPointNumbers", "Reexport"]
35+
git-tree-sha1 = "417b0ed7b8b838aa6ca0a87aadf1bb9eb111ce40"
36+
uuid = "5ae59095-9a9b-59fe-a467-6f913c188581"
37+
version = "0.12.8"
38+
39+
[[deps.Compat]]
40+
deps = ["Base64", "Dates", "DelimitedFiles", "Distributed", "InteractiveUtils", "LibGit2", "Libdl", "LinearAlgebra", "Markdown", "Mmap", "Pkg", "Printf", "REPL", "Random", "SHA", "Serialization", "SharedArrays", "Sockets", "SparseArrays", "Statistics", "Test", "UUIDs", "Unicode"]
41+
git-tree-sha1 = "9be8be1d8a6f44b96482c8af52238ea7987da3e3"
42+
uuid = "34da2185-b29b-5c13-b0c7-acf172513d20"
43+
version = "3.45.0"
44+
45+
[[deps.CompilerSupportLibraries_jll]]
46+
deps = ["Artifacts", "Libdl"]
47+
uuid = "e66e0078-7015-5450-92f7-15fbd957f2ae"
48+
49+
[[deps.ContextVariablesX]]
50+
deps = ["Compat", "Logging", "UUIDs"]
51+
git-tree-sha1 = "8ccaa8c655bc1b83d2da4d569c9b28254ababd6e"
52+
uuid = "6add18c4-b38d-439d-96f6-d6bc489c04c5"
53+
version = "0.1.2"
54+
55+
[[deps.DataAPI]]
56+
git-tree-sha1 = "fb5f5316dd3fd4c5e7c30a24d50643b73e37cd40"
57+
uuid = "9a962f9c-6df0-11e9-0e5d-c546b8b5ee8a"
58+
version = "1.10.0"
59+
60+
[[deps.DataStructures]]
61+
deps = ["Compat", "InteractiveUtils", "OrderedCollections"]
62+
git-tree-sha1 = "d1fff3a548102f48987a52a2e0d114fa97d730f0"
63+
uuid = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
64+
version = "0.18.13"
65+
66+
[[deps.Dates]]
67+
deps = ["Printf"]
68+
uuid = "ade2ca70-3891-5945-98fb-dc099432e06a"
69+
70+
[[deps.DelimitedFiles]]
71+
deps = ["Mmap"]
72+
uuid = "8bb1440f-4735-579b-a4ab-409b98df4dab"
73+
74+
[[deps.Distributed]]
75+
deps = ["Random", "Serialization", "Sockets"]
76+
uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b"
77+
78+
[[deps.DocStringExtensions]]
79+
deps = ["LibGit2"]
80+
git-tree-sha1 = "5158c2b41018c5f7eb1470d558127ac274eca0c9"
81+
uuid = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
82+
version = "0.9.1"
83+
84+
[[deps.Downloads]]
85+
deps = ["ArgTools", "LibCURL", "NetworkOptions"]
86+
uuid = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
87+
88+
[[deps.FixedPointNumbers]]
89+
deps = ["Statistics"]
90+
git-tree-sha1 = "335bfdceacc84c5cdf16aadc768aa5ddfc5383cc"
91+
uuid = "53c48c17-4a7d-5ca2-90c5-79b7896eea93"
92+
version = "0.8.4"
93+
94+
[[deps.InteractiveUtils]]
95+
deps = ["Markdown"]
96+
uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
97+
98+
[[deps.InverseFunctions]]
99+
deps = ["Test"]
100+
git-tree-sha1 = "b3364212fb5d870f724876ffcd34dd8ec6d98918"
101+
uuid = "3587e190-3f89-42d0-90ee-14403ec27112"
102+
version = "0.1.7"
103+
104+
[[deps.IrrationalConstants]]
105+
git-tree-sha1 = "7fd44fd4ff43fc60815f8e764c0f352b83c49151"
106+
uuid = "92d709cd-6900-40b7-9082-c6be49f344b6"
107+
version = "0.1.1"
108+
109+
[[deps.LibCURL]]
110+
deps = ["LibCURL_jll", "MozillaCACerts_jll"]
111+
uuid = "b27032c2-a3e7-50c8-80cd-2d36dbcbfd21"
112+
113+
[[deps.LibCURL_jll]]
114+
deps = ["Artifacts", "LibSSH2_jll", "Libdl", "MbedTLS_jll", "Zlib_jll", "nghttp2_jll"]
115+
uuid = "deac9b47-8bc7-5906-a0fe-35ac56dc84c0"
116+
117+
[[deps.LibGit2]]
118+
deps = ["Base64", "NetworkOptions", "Printf", "SHA"]
119+
uuid = "76f85450-5226-5b5a-8eaa-529ad045b433"
120+
121+
[[deps.LibSSH2_jll]]
122+
deps = ["Artifacts", "Libdl", "MbedTLS_jll"]
123+
uuid = "29816b5a-b9ab-546f-933c-edad1886dfa8"
124+
125+
[[deps.Libdl]]
126+
uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
127+
128+
[[deps.LinearAlgebra]]
129+
deps = ["Libdl", "libblastrampoline_jll"]
130+
uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
131+
132+
[[deps.LogExpFunctions]]
133+
deps = ["ChainRulesCore", "ChangesOfVariables", "DocStringExtensions", "InverseFunctions", "IrrationalConstants", "LinearAlgebra"]
134+
git-tree-sha1 = "361c2b088575b07946508f135ac556751240091c"
135+
uuid = "2ab3a3ac-af41-5b50-aa03-7779005ae688"
136+
version = "0.3.17"
137+
138+
[[deps.Logging]]
139+
uuid = "56ddb016-857b-54e1-b83d-db4d58db5568"
140+
141+
[[deps.MacroTools]]
142+
deps = ["Markdown", "Random"]
143+
git-tree-sha1 = "3d3e902b31198a27340d0bf00d6ac452866021cf"
144+
uuid = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09"
145+
version = "0.5.9"
146+
147+
[[deps.Markdown]]
148+
deps = ["Base64"]
149+
uuid = "d6f4376e-aef5-505a-96c1-9c027394607a"
150+
151+
[[deps.MbedTLS_jll]]
152+
deps = ["Artifacts", "Libdl"]
153+
uuid = "c8ffd9c3-330d-5841-b78e-0817d7145fa1"
154+
155+
[[deps.MemPool]]
156+
deps = ["DataStructures", "Distributed", "Mmap", "Random", "Serialization", "Sockets"]
157+
git-tree-sha1 = "303f55cede4947d0acb325ac0bd7595fbcad6b99"
158+
uuid = "f9f48841-c794-520a-933b-121f7ba6ed94"
159+
version = "0.4.2"
160+
161+
[[deps.Missings]]
162+
deps = ["DataAPI"]
163+
git-tree-sha1 = "bf210ce90b6c9eed32d25dbcae1ebc565df2687f"
164+
uuid = "e1d29d7a-bbdc-5cf2-9ac0-f12de2c33e28"
165+
version = "1.0.2"
166+
167+
[[deps.Mmap]]
168+
uuid = "a63ad114-7e13-5084-954f-fe012c677804"
169+
170+
[[deps.MozillaCACerts_jll]]
171+
uuid = "14a3606d-f60d-562e-9121-12d972cd8159"
172+
173+
[[deps.NetworkOptions]]
174+
uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908"
175+
176+
[[deps.OpenBLAS_jll]]
177+
deps = ["Artifacts", "CompilerSupportLibraries_jll", "Libdl"]
178+
uuid = "4536629a-c528-5b80-bd46-f80d51c5b363"
179+
180+
[[deps.OrderedCollections]]
181+
git-tree-sha1 = "85f8e6578bf1f9ee0d11e7bb1b1456435479d47c"
182+
uuid = "bac558e1-5e72-5ebc-8fee-abe8a469f55d"
183+
version = "1.4.1"
184+
185+
[[deps.Pkg]]
186+
deps = ["Artifacts", "Dates", "Downloads", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Serialization", "TOML", "Tar", "UUIDs", "p7zip_jll"]
187+
uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
188+
189+
[[deps.Printf]]
190+
deps = ["Unicode"]
191+
uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7"
192+
193+
[[deps.Profile]]
194+
deps = ["Printf"]
195+
uuid = "9abbd945-dff8-562f-b5e8-e1ebf5ef1b79"
196+
197+
[[deps.REPL]]
198+
deps = ["InteractiveUtils", "Markdown", "Sockets", "Unicode"]
199+
uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
200+
201+
[[deps.Random]]
202+
deps = ["SHA", "Serialization"]
203+
uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
204+
205+
[[deps.Reexport]]
206+
git-tree-sha1 = "45e428421666073eab6f2da5c9d310d99bb12f9b"
207+
uuid = "189a3867-3050-52da-a836-e630ba90ab69"
208+
version = "1.2.2"
209+
210+
[[deps.Requires]]
211+
deps = ["UUIDs"]
212+
git-tree-sha1 = "838a3a4188e2ded87a4f9f184b4b0d78a1e91cb7"
213+
uuid = "ae029012-a4dd-5104-9daa-d747884805df"
214+
version = "1.3.0"
215+
216+
[[deps.SHA]]
217+
uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce"
218+
219+
[[deps.Serialization]]
220+
uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
221+
222+
[[deps.SharedArrays]]
223+
deps = ["Distributed", "Mmap", "Random", "Serialization"]
224+
uuid = "1a1011a3-84de-559e-8e89-a11a2f7dc383"
225+
226+
[[deps.Sockets]]
227+
uuid = "6462fe0b-24de-5631-8697-dd941f90decc"
228+
229+
[[deps.SortingAlgorithms]]
230+
deps = ["DataStructures"]
231+
git-tree-sha1 = "b3363d7460f7d098ca0912c69b082f75625d7508"
232+
uuid = "a2af1166-a08f-5f64-846c-94a0d3cef48c"
233+
version = "1.0.1"
234+
235+
[[deps.SparseArrays]]
236+
deps = ["LinearAlgebra", "Random"]
237+
uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
238+
239+
[[deps.Statistics]]
240+
deps = ["LinearAlgebra", "SparseArrays"]
241+
uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
242+
243+
[[deps.StatsAPI]]
244+
deps = ["LinearAlgebra"]
245+
git-tree-sha1 = "2c11d7290036fe7aac9038ff312d3b3a2a5bf89e"
246+
uuid = "82ae8749-77ed-4fe6-ae5f-f523153014b0"
247+
version = "1.4.0"
248+
249+
[[deps.StatsBase]]
250+
deps = ["DataAPI", "DataStructures", "LinearAlgebra", "LogExpFunctions", "Missings", "Printf", "Random", "SortingAlgorithms", "SparseArrays", "Statistics", "StatsAPI"]
251+
git-tree-sha1 = "0005d75f43ff23688914536c5e9d5ac94f8077f7"
252+
uuid = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
253+
version = "0.33.20"
254+
255+
[[deps.TOML]]
256+
deps = ["Dates"]
257+
uuid = "fa267f1f-6049-4f14-aa54-33bafae1ed76"
258+
259+
[[deps.Tar]]
260+
deps = ["ArgTools", "SHA"]
261+
uuid = "a4e569a6-e804-4fa4-b0f3-eef7a1d5b13e"
262+
263+
[[deps.Test]]
264+
deps = ["InteractiveUtils", "Logging", "Random", "Serialization"]
265+
uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
266+
267+
[[deps.TimespanLogging]]
268+
deps = ["Distributed", "Profile"]
269+
path = "lib/TimespanLogging"
270+
uuid = "a526e669-04d3-4846-9525-c66122c55f63"
271+
version = "0.1.0"
272+
273+
[[deps.UUIDs]]
274+
deps = ["Random", "SHA"]
275+
uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
276+
277+
[[deps.Unicode]]
278+
uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"
279+
280+
[[deps.Zlib_jll]]
281+
deps = ["Libdl"]
282+
uuid = "83775a58-1f1d-513f-b197-d71354ab007a"
283+
284+
[[deps.libblastrampoline_jll]]
285+
deps = ["Artifacts", "Libdl", "OpenBLAS_jll"]
286+
uuid = "8e850b90-86db-534c-a0d3-1478176c7d93"
287+
288+
[[deps.nghttp2_jll]]
289+
deps = ["Artifacts", "Libdl"]
290+
uuid = "8e850ede-7688-5339-a07c-302acd2aaf8d"
291+
292+
[[deps.p7zip_jll]]
293+
deps = ["Artifacts", "Libdl"]
294+
uuid = "3f19e933-33d8-53b3-aaab-bd5110c3b7a0"

Project.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ SharedArrays = "1a1011a3-84de-559e-8e89-a11a2f7dc383"
1717
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
1818
Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
1919
StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
20+
TimespanLogging = "a526e669-04d3-4846-9525-c66122c55f63"
2021
UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
2122

2223
[compat]
@@ -26,6 +27,7 @@ MacroTools = "0.5"
2627
MemPool = "0.4"
2728
Requires = "1"
2829
StatsBase = "0.28, 0.29, 0.30, 0.31, 0.32, 0.33"
30+
TimespanLogging = "0.1"
2931
julia = "1.7"
3032

3133
[extras]

0 commit comments

Comments
 (0)