Skip to content

Commit 0fe91dc

Browse files
committed
Assorted NFC renames
1 parent 5124d45 commit 0fe91dc

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

src/array/darray.jl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ An `N`-dimensional domain over an array.
1212
struct ArrayDomain{N}
1313
indexes::NTuple{N, Any}
1414
end
15-
1615
include("../lib/domain-blocks.jl")
1716

1817

@@ -352,7 +351,7 @@ end
352351

353352
function stage(ctx::Context, d::Distribute)
354353
if isa(d.data, ArrayOp)
355-
# distributing a dsitributed array
354+
# distributing a distributed array
356355
x = cached_stage(ctx, d.data)
357356
if d.domainchunks == domainchunks(x)
358357
return x # already properly distributed

src/sch/Sch.jl

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1342,7 +1342,8 @@ function do_task(to_proc, task_desc)
13421342
thunk_id, est_time_util, est_alloc_util, est_occupancy,
13431343
scope, Tf, data,
13441344
send_result, persist, cache, meta,
1345-
options, propagated, ids, positions, ctx_vars, sch_handle, uid = task_desc
1345+
options, propagated, ids, positions,
1346+
ctx_vars, sch_handle, sch_uid = task_desc
13461347
ctx = Context(Processor[]; log_sink=ctx_vars.log_sink, profile=ctx_vars.profile)
13471348

13481349
from_proc = OSProc()
@@ -1379,7 +1380,7 @@ function do_task(to_proc, task_desc)
13791380
lock(TASK_SYNC) do
13801381
while true
13811382
# Get current time utilization for the selected processor
1382-
time_dict = get!(()->Dict{Processor,Ref{UInt64}}(), PROCESSOR_TIME_UTILIZATION, uid)
1383+
time_dict = get!(()->Dict{Processor,Ref{UInt64}}(), PROCESSOR_TIME_UTILIZATION, sch_uid)
13831384
real_time_util = get!(()->Ref{UInt64}(UInt64(0)), time_dict, to_proc)
13841385

13851386
# Get current allocation utilization and capacity
@@ -1484,6 +1485,7 @@ function do_task(to_proc, task_desc)
14841485
if meta
14851486
append!(fetched, data[2:end])
14861487
end
1488+
14871489
f = popfirst!(fetched)
14881490
@assert !(f isa Chunk) "Failed to unwrap thunk function"
14891491
fetched_args = Any[]
@@ -1519,8 +1521,8 @@ function do_task(to_proc, task_desc)
15191521
result_meta = try
15201522
# Set TLS variables
15211523
Dagger.set_tls!((
1522-
sch_uid=uid,
1523-
sch_handle=sch_handle,
1524+
sch_uid,
1525+
sch_handle,
15241526
processor=to_proc,
15251527
task_spec=task_desc,
15261528
))

0 commit comments

Comments
 (0)