Skip to content

Commit 9c5183f

Browse files
committed
Update config and deps of examples
1 parent 02f52bc commit 9c5183f

File tree

4 files changed

+111
-43
lines changed

4 files changed

+111
-43
lines changed

examples/example-paper-implicitglobalgrid/EXP_test_halo_thr_GPU.jl

Lines changed: 35 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -207,39 +207,43 @@ dz = 1.0
207207
P = GPUArray(P);
208208
halowidths = (1,1,1)
209209
if array_type == "CUDA"
210-
# (dim=3)
211-
dim = 3
212-
P2 = gpuzeros(eltype(P), size(P))
213-
buf = zeros(size(P, 1), size(P, 2), halowidths[dim])
214-
buf .= 0.0
215-
P2 .= 0.0
216-
ranges = [1:size(P, 1), 1:size(P, 2), 1:1]
217-
nthreads = (1, 1, 1)
218-
halosize = [(r[end] - r[1]) + 1 for r = ranges]
219-
nblocks = Tuple(ceil.(Int, halosize ./ nthreads))
220-
custream = stream();
221-
@define_eff_memory_throughput custom_benchmark=GPUBandwidthCUDA begin
222-
(nx * ny * 8) * MPI.Comm_size(MPI.COMM_WORLD) / :median_time
223-
end
224-
@perftest begin
225-
CUDA.@sync GG.read_h2d_async!(buf, P2, ranges, custream)
210+
@testset "CUDA" begin
211+
# (dim=3)
212+
dim = 3
213+
P2 = gpuzeros(eltype(P), size(P))
214+
buf = zeros(size(P, 1), size(P, 2), halowidths[dim])
215+
buf .= 0.0
216+
P2 .= 0.0
217+
ranges = [1:size(P, 1), 1:size(P, 2), 1:1]
218+
nthreads = (1, 1, 1)
219+
halosize = [(r[end] - r[1]) + 1 for r = ranges]
220+
nblocks = Tuple(ceil.(Int, halosize ./ nthreads))
221+
custream = stream();
222+
@define_eff_memory_throughput custom_benchmark=GPUBandwidthCUDA begin
223+
(nx * ny * 8) * MPI.Comm_size(MPI.COMM_WORLD) / :median_time
224+
end
225+
@perftest begin
226+
CUDA.@sync GG.read_h2d_async!(buf, P2, ranges, custream)
227+
end
226228
end
227229
elseif array_type == "AMDGPU"
228-
# (dim=3)
229-
dim = 3
230-
P2 = gpuzeros(eltype(P), size(P))
231-
buf = zeros(size(P, 1), size(P, 2), halowidths[dim])
232-
ranges = [1:size(P, 1), 1:size(P, 2), 1:1]
233-
nthreads = (1, 1, 1)
234-
halosize = [(r[end] - r[1]) + 1 for r = ranges]
235-
nblocks = Tuple(ceil.(Int, halosize ./ nthreads))
236-
rocstream = AMDGPU.HIPStream()
237-
@define_eff_memory_throughput custom_benchmark=GPUBandwidthROC begin
238-
(nx * ny * 8) * MPI.Comm_size(MPI.COMM_WORLD) / :median_time
239-
end
240-
@perftest begin
241-
GG.read_h2d_async!(buf, P2, ranges, rocstream)
242-
AMDGPU.synchronize()
230+
@testset "AMD" begin
231+
# (dim=3)
232+
dim = 3
233+
P2 = gpuzeros(eltype(P), size(P))
234+
buf = zeros(size(P, 1), size(P, 2), halowidths[dim])
235+
ranges = [1:size(P, 1), 1:size(P, 2), 1:1]
236+
nthreads = (1, 1, 1)
237+
halosize = [(r[end] - r[1]) + 1 for r = ranges]
238+
nblocks = Tuple(ceil.(Int, halosize ./ nthreads))
239+
rocstream = AMDGPU.HIPStream()
240+
@define_eff_memory_throughput custom_benchmark=GPUBandwidthROC begin
241+
(nx * ny * 8) * MPI.Comm_size(MPI.COMM_WORLD) / :median_time
242+
end
243+
@perftest begin
244+
GG.read_h2d_async!(buf, P2, ranges, rocstream)
245+
AMDGPU.synchronize()
246+
end
243247
end
244248
end
245249
finalize_global_grid(finalize_MPI=false);

examples/example-paper-implicitglobalgrid/Manifest.toml

Lines changed: 72 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,11 @@ git-tree-sha1 = "7fecfb1123b8d0232218e2da0c213004ff15358d"
188188
uuid = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf"
189189
version = "1.6.3"
190190

191+
[[deps.BitFlags]]
192+
git-tree-sha1 = "0691e34b3bb8be9307330f88d1a3c3f25466c24d"
193+
uuid = "d1d4a3ce-64b1-5f1a-9ba4-7e7e69966f35"
194+
version = "0.1.9"
195+
191196
[[deps.BitTwiddlingConvenienceFunctions]]
192197
deps = ["Static"]
193198
git-tree-sha1 = "f21cfd4950cb9f0587d5067e69405ad2acd27b87"
@@ -297,6 +302,12 @@ git-tree-sha1 = "b7231a755812695b8046e8471ddc34c8268cbad5"
297302
uuid = "da1fd8a2-8d9e-5ec2-8556-3022fb5608a2"
298303
version = "3.0.0"
299304

305+
[[deps.CodecZlib]]
306+
deps = ["TranscodingStreams", "Zlib_jll"]
307+
git-tree-sha1 = "962834c22b66e32aa10f7611c08c8ca4e20749a9"
308+
uuid = "944b1d66-785c-5afd-91f1-9de20f533193"
309+
version = "0.7.8"
310+
300311
[[deps.ColorSchemes]]
301312
deps = ["ColorTypes", "ColorVectorSpace", "Colors", "FixedPointNumbers", "PrecompileTools", "Random"]
302313
git-tree-sha1 = "b0fd3f56fa442f81e0a47815c92245acfaaa4e34"
@@ -365,6 +376,12 @@ weakdeps = ["InverseFunctions"]
365376
[deps.CompositionsBase.extensions]
366377
CompositionsBaseInverseFunctionsExt = "InverseFunctions"
367378

379+
[[deps.ConcurrentUtilities]]
380+
deps = ["Serialization", "Sockets"]
381+
git-tree-sha1 = "d9d26935a0bcffc87d2613ce14c527c99fc543fd"
382+
uuid = "f0e56b4a-5159-44fe-b623-3e5288b988bb"
383+
version = "2.5.0"
384+
368385
[[deps.Configurations]]
369386
deps = ["ExproniconLite", "OrderedCollections", "TOML"]
370387
git-tree-sha1 = "4358750bb58a3caefd5f37a4a0c5bfdbbf075252"
@@ -454,6 +471,12 @@ deps = ["ArgTools", "FileWatching", "LibCURL", "NetworkOptions"]
454471
uuid = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
455472
version = "1.6.0"
456473

474+
[[deps.ExceptionUnwrapping]]
475+
deps = ["Test"]
476+
git-tree-sha1 = "d36f682e590a83d63d1c7dbd287573764682d12a"
477+
uuid = "460bff9d-24e4-43bc-9d9f-a8973cb893f4"
478+
version = "0.1.11"
479+
457480
[[deps.ExprTools]]
458481
git-tree-sha1 = "27415f162e6028e81c72b82ef756bf321213b6ec"
459482
uuid = "e2ba6199-217a-4e67-a87a-7c52f15ade04"
@@ -469,13 +492,11 @@ deps = ["Pkg", "Requires", "UUIDs"]
469492
git-tree-sha1 = "d60eb76f37d7e5a40cc2e7c36974d864b82dc802"
470493
uuid = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549"
471494
version = "1.17.1"
495+
weakdeps = ["HTTP"]
472496

473497
[deps.FileIO.extensions]
474498
HTTPExt = "HTTP"
475499

476-
[deps.FileIO.weakdeps]
477-
HTTP = "cd3eb016-35fb-5094-929b-558a96fad6f3"
478-
479500
[[deps.FileWatching]]
480501
uuid = "7b1f6079-737a-58dc-b8bc-7a2ca5c1b5ee"
481502

@@ -517,6 +538,12 @@ git-tree-sha1 = "5bfe837129bf49e2e049b4f1517546055cc16a93"
517538
uuid = "096a3bc2-3ced-46d0-87f4-dd12716f4bfc"
518539
version = "0.3.0"
519540

541+
[[deps.HTTP]]
542+
deps = ["Base64", "CodecZlib", "ConcurrentUtilities", "Dates", "ExceptionUnwrapping", "Logging", "LoggingExtras", "MbedTLS", "NetworkOptions", "OpenSSL", "PrecompileTools", "Random", "SimpleBufferStream", "Sockets", "URIs", "UUIDs"]
543+
git-tree-sha1 = "5e6fe50ae7f23d171f44e311c2960294aaa0beb5"
544+
uuid = "cd3eb016-35fb-5094-929b-558a96fad6f3"
545+
version = "1.10.19"
546+
520547
[[deps.HashArrayMappedTries]]
521548
git-tree-sha1 = "2eaa69a7cab70a52b9687c8bf950a5a93ec895ae"
522549
uuid = "076d061b-32b6-4027-95e0-9a2c6f6d7e74"
@@ -775,6 +802,12 @@ version = "0.3.29"
775802
[[deps.Logging]]
776803
uuid = "56ddb016-857b-54e1-b83d-db4d58db5568"
777804

805+
[[deps.LoggingExtras]]
806+
deps = ["Dates", "Logging"]
807+
git-tree-sha1 = "f00544d95982ea270145636c181ceda21c4e2575"
808+
uuid = "e6f89c97-d47a-5376-807f-9c37f3926c36"
809+
version = "1.2.0"
810+
778811
[[deps.LoopVectorization]]
779812
deps = ["ArrayInterface", "CPUSummary", "CloseOpenIntervals", "DocStringExtensions", "HostCPUFeatures", "IfElse", "LayoutPointers", "LinearAlgebra", "OffsetArrays", "PolyesterWeave", "PrecompileTools", "SIMDTypes", "SLEEFPirates", "Static", "StaticArrayInterface", "ThreadingUtilities", "UnPack", "VectorizationBase"]
780813
git-tree-sha1 = "a9fc7883eb9b5f04f46efb9a540833d1fad974b3"
@@ -852,6 +885,12 @@ version = "0.1.11"
852885
deps = ["Base64"]
853886
uuid = "d6f4376e-aef5-505a-96c1-9c027394607a"
854887

888+
[[deps.MbedTLS]]
889+
deps = ["Dates", "MbedTLS_jll", "MozillaCACerts_jll", "NetworkOptions", "Random", "Sockets"]
890+
git-tree-sha1 = "c067a280ddc25f196b5e7df3877c6b226d390aaf"
891+
uuid = "739be429-bea8-5141-9913-cc70e7f3736d"
892+
version = "1.1.9"
893+
855894
[[deps.MbedTLS_jll]]
856895
deps = ["Artifacts", "Libdl"]
857896
uuid = "c8ffd9c3-330d-5841-b78e-0817d7145fa1"
@@ -937,6 +976,18 @@ git-tree-sha1 = "ab6596a9d8236041dcd59b5b69316f28a8753592"
937976
uuid = "fe0851c0-eecd-5654-98d4-656369965a5c"
938977
version = "5.0.9+0"
939978

979+
[[deps.OpenSSL]]
980+
deps = ["BitFlags", "Dates", "MozillaCACerts_jll", "NetworkOptions", "OpenSSL_jll", "Sockets"]
981+
git-tree-sha1 = "1d1aaa7d449b58415f97d2839c318b70ffb525a0"
982+
uuid = "4d8831e6-92b7-49fb-bdf8-b643e874388c"
983+
version = "1.6.1"
984+
985+
[[deps.OpenSSL_jll]]
986+
deps = ["Artifacts", "JLLWrappers", "Libdl"]
987+
git-tree-sha1 = "c9cbeda6aceffc52d8a0017e71db27c7a7c0beaf"
988+
uuid = "458c3c95-2e84-50aa-8efc-19380b2a3a95"
989+
version = "3.5.5+0"
990+
940991
[[deps.OpenSpecFun_jll]]
941992
deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl"]
942993
git-tree-sha1 = "1346c9208249809840c91b26703912dff463d335"
@@ -955,12 +1006,10 @@ uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0"
9551006
version = "2.8.3"
9561007

9571008
[[deps.PerfTest]]
958-
deps = ["BenchmarkTools", "Configurations", "CountFlops", "CpuId", "Dates", "JLD2", "JSON", "LinearAlgebra", "MLStyle", "MacroTools", "Pkg", "Printf", "Revise", "STREAMBenchmark", "Suppressor", "TOML", "Test", "UnicodePlots"]
959-
git-tree-sha1 = "ec6629197969f11c533089ea6b58fa27de24e2f2"
960-
repo-rev = "master"
961-
repo-url = "https://github.com/JuliaPerf/PerfTest.jl.git"
1009+
deps = ["BenchmarkTools", "Configurations", "CountFlops", "CpuId", "Dates", "HTTP", "JLD2", "JSON", "LibGit2", "LinearAlgebra", "MLStyle", "MacroTools", "Pkg", "Printf", "Revise", "STREAMBenchmark", "Suppressor", "TOML", "Test", "UnicodePlots"]
1010+
path = "../.."
9621011
uuid = "1dca261b-fc56-4a8c-a7e2-9798d8a75978"
963-
version = "0.1.0"
1012+
version = "0.1.5"
9641013
weakdeps = ["MPI"]
9651014

9661015
[deps.PerfTest.extensions]
@@ -1120,6 +1169,11 @@ version = "1.4.9"
11201169
[[deps.Serialization]]
11211170
uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
11221171

1172+
[[deps.SimpleBufferStream]]
1173+
git-tree-sha1 = "f305871d2f381d21527c770d4788c06c097c9bc1"
1174+
uuid = "777ac1f9-54b0-4bf8-805c-2214025038e7"
1175+
version = "1.2.0"
1176+
11231177
[[deps.Sockets]]
11241178
uuid = "6462fe0b-24de-5631-8697-dd941f90decc"
11251179

@@ -1319,6 +1373,16 @@ version = "0.1.6"
13191373
[deps.Tracy.weakdeps]
13201374
TracyProfiler_jll = "0c351ed6-8a68-550e-8b79-de6f926da83c"
13211375

1376+
[[deps.TranscodingStreams]]
1377+
git-tree-sha1 = "0c45878dcfdcfa8480052b6ab162cdd138781742"
1378+
uuid = "3bb67fe8-82b1-5028-8e26-92a6c54297fa"
1379+
version = "0.11.3"
1380+
1381+
[[deps.URIs]]
1382+
git-tree-sha1 = "bef26fb046d031353ef97a82e3fdb6afe7f21b1a"
1383+
uuid = "5c2747f8-b7ea-4ff2-ba2e-563bfd36b1d4"
1384+
version = "1.6.1"
1385+
13221386
[[deps.UUIDs]]
13231387
deps = ["Random", "SHA"]
13241388
uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"

examples/example-paper-implicitglobalgrid/perftest_config.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@ enabled = false
88
[general]
99
recursive = true
1010
save_results = true
11-
autoflops = true
11+
autoflops = false
1212
suppress_output = true
1313
plotting = true
1414
save_folder = ".perftests"
1515
max_saved_results = 20
16-
verbose = false
16+
verbose = true
1717
logs_enabled = true
1818
safe_formulas = false
1919

2020
[regression]
21-
enabled = true
21+
enabled = false
2222
default_threshold = 0.9
2323
use_bencher = false
2424
custom_file = ""

src/transform/configuration.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ PRECOMPILATION_CONFIG = Dict(
243243
"safe_formulas" => false,
244244
),
245245
"regression" => Dict(
246-
"enabled" => true,
246+
"enabled" => false,
247247
"custom_file" => "",
248248
"default_threshold" => 0.9,
249249
"use_bencher" => false,

0 commit comments

Comments
 (0)