Skip to content

Commit e0133b8

Browse files
willow-ahrenswillow-ahrens
committed
more rename
1 parent 85177ed commit e0133b8

21 files changed

+46
-46
lines changed

‎src/architecture.jl

+2-2
Original file line numberDiff line numberDiff line change
@@ -329,9 +329,9 @@ and copies the data in to it, according to the `device` trait.
329329
function bcast end
330330

331331
"""
332-
virtual_bcast(device, arr)
332+
bcast_send(device, arr)
333333
334334
If the virtual array is not on the given device, copy the array to that device. This
335335
function is used to move data to the device before a kernel is launched.
336336
"""
337-
function virtual_bcast end
337+
function bcast_send end

‎src/interface/abstract_arrays.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ FinchNotation.finch_leaf(x::VirtualAbstractArray) = virtual(x)
130130
virtual_fill_value(ctx, ::VirtualAbstractArray) = 0
131131
virtual_eltype(ctx, tns::VirtualAbstractArray) = tns.eltype
132132

133-
function virtual_bcast(ctx, vec::VirtualAbstractArray, device)
133+
function bcast_send(ctx, vec::VirtualAbstractArray, device)
134134
ex = freshen(ctx, vec.ex)
135135
push_preamble!(
136136
ctx,

‎src/lower.jl

+2-2
Original file line numberDiff line numberDiff line change
@@ -342,14 +342,14 @@ function lower_parallel_loop(ctx, root, ext::ParallelDimension, device::VirtualC
342342
)
343343

344344
for tns in setdiff(used_in_scope, decl_in_scope)
345-
virtual_bcast(ctx, resolve(ctx, tns), device)
345+
bcast_send(ctx, resolve(ctx, tns), device)
346346
end
347347

348348
virtual_parallel_region(ctx, device) do ctx_2
349349
subtask = get_task(ctx_2)
350350
tid = get_task_num(subtask)
351351
for tns in intersect(used_in_scope, decl_in_scope)
352-
virtual_bcast(ctx_2, resolve(ctx_2, tns), subtask)
352+
bcast_send(ctx_2, resolve(ctx_2, tns), subtask)
353353
end
354354
contain(ctx_2) do ctx_3
355355
open_scope(ctx_3) do ctx_4

‎src/tensors/fibers.jl

+6-6
Original file line numberDiff line numberDiff line change
@@ -139,12 +139,12 @@ function unfurl(ctx::AbstractCompiler, arr::VirtualFiber, ext, mode, proto)
139139
unfurl(ctx, VirtualSubFiber(arr.lvl, literal(1)), ext, mode, proto)
140140
end
141141

142-
function virtual_bcast(ctx::AbstractCompiler, fbr::VirtualFiber, arch)
143-
virtual_bcast_level(ctx, fbr.lvl, arch)
142+
function bcast_send(ctx::AbstractCompiler, fbr::VirtualFiber, arch)
143+
bcast_send_level(ctx, fbr.lvl, arch)
144144
end
145145

146-
function virtual_bcast(ctx::AbstractCompiler, fbr::VirtualSubFiber, arch)
147-
virtual_bcast_level(ctx, fbr.lvl, arch)
146+
function bcast_send(ctx::AbstractCompiler, fbr::VirtualSubFiber, arch)
147+
bcast_send_level(ctx, fbr.lvl, arch)
148148
end
149149

150150
struct HollowSubFiber{Lvl,Pos,Dirty} <: AbstractFiber{Lvl}
@@ -171,9 +171,9 @@ function lower(ctx::AbstractCompiler, fbr::VirtualHollowSubFiber, ::DefaultStyle
171171
end
172172
FinchNotation.finch_leaf(x::VirtualHollowSubFiber) = virtual(x)
173173

174-
function virtual_bcast(ctx::AbstractCompiler, fbr::VirtualHollowSubFiber, arch)
174+
function bcast_send(ctx::AbstractCompiler, fbr::VirtualHollowSubFiber, arch)
175175
return VirtualHollowSubFiber(
176-
virtual_bcast_level(ctx, fbr.lvl, arch), fbr.pos, fbr.dirty
176+
bcast_send_level(ctx, fbr.lvl, arch), fbr.pos, fbr.dirty
177177
)
178178
end
179179

‎src/tensors/levels/atomic_element_levels.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ function reassemble_level!(ctx, lvl::VirtualAtomicElementLevel, pos_start, pos_s
165165
lvl
166166
end
167167

168-
function virtual_bcast_level(ctx::AbstractCompiler, lvl::VirtualAtomicElementLevel, arch)
168+
function bcast_send_level(ctx::AbstractCompiler, lvl::VirtualAtomicElementLevel, arch)
169169
val_2 = freshen(ctx, :val)
170170
push_preamble!(
171171
ctx,

‎src/tensors/levels/dense_levels.jl

+2-2
Original file line numberDiff line numberDiff line change
@@ -201,8 +201,8 @@ function freeze_level!(ctx::AbstractCompiler, lvl::VirtualDenseLevel, pos)
201201
return lvl
202202
end
203203

204-
function virtual_bcast_level(ctx::AbstractCompiler, lvl::VirtualDenseLevel, arch)
205-
virtual_bcast_level(ctx, lvl.lvl, arch)
204+
function bcast_send_level(ctx::AbstractCompiler, lvl::VirtualDenseLevel, arch)
205+
bcast_send_level(ctx, lvl.lvl, arch)
206206
end
207207

208208
struct DenseTraversal

‎src/tensors/levels/dense_rle_levels.jl

+3-3
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ function virtual_level_resize!(ctx, lvl::VirtualRunListLevel, dims...)
295295
lvl
296296
end
297297

298-
function virtual_bcast_level(ctx::AbstractCompiler, lvl::VirtualRunListLevel, arch)
298+
function bcast_send_level(ctx::AbstractCompiler, lvl::VirtualRunListLevel, arch)
299299
ptr_2 = freshen(ctx, lvl.ptr)
300300
right_2 = freshen(ctx, lvl.right)
301301
push_preamble!(
@@ -314,8 +314,8 @@ function virtual_bcast_level(ctx::AbstractCompiler, lvl::VirtualRunListLevel, ar
314314
$(lvl.right) = $right_2
315315
end,
316316
)
317-
virtual_bcast_level(ctx, lvl.lvl, arch)
318-
virtual_bcast_level(ctx, lvl.buf, arch)
317+
bcast_send_level(ctx, lvl.lvl, arch)
318+
bcast_send_level(ctx, lvl.buf, arch)
319319
end
320320

321321
virtual_level_eltype(lvl::VirtualRunListLevel) = virtual_level_eltype(lvl.lvl)

‎src/tensors/levels/element_levels.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ function reassemble_level!(ctx, lvl::VirtualElementLevel, pos_start, pos_stop)
171171
lvl
172172
end
173173

174-
function virtual_bcast_level(ctx::AbstractCompiler, lvl::VirtualElementLevel, arch)
174+
function bcast_send_level(ctx::AbstractCompiler, lvl::VirtualElementLevel, arch)
175175
val_2 = freshen(ctx, :val)
176176
push_preamble!(
177177
ctx,

‎src/tensors/levels/mutex_levels.jl

+2-2
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ function thaw_level!(ctx::AbstractCompiler, lvl::VirtualMutexLevel, pos)
207207
return lvl
208208
end
209209

210-
function virtual_bcast_level(ctx::AbstractCompiler, lvl::VirtualMutexLevel, arch)
210+
function bcast_send_level(ctx::AbstractCompiler, lvl::VirtualMutexLevel, arch)
211211
#Add for seperation level too.
212212
atomics = freshen(ctx, :locksArray)
213213

@@ -224,7 +224,7 @@ function virtual_bcast_level(ctx::AbstractCompiler, lvl::VirtualMutexLevel, arch
224224
$(lvl.locks) = $atomics
225225
end,
226226
)
227-
virtual_bcast_level(ctx, lvl.lvl, arch)
227+
bcast_send_level(ctx, lvl.lvl, arch)
228228
end
229229

230230
function instantiate(ctx, fbr::VirtualSubFiber{VirtualMutexLevel}, mode)

‎src/tensors/levels/pattern_levels.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ struct VirtualPatternLevel <: AbstractVirtualLevel
9393
Tp
9494
end
9595

96-
function virtual_bcast_level(ctx::AbstractCompiler, lvl::VirtualPatternLevel, arch)
96+
function bcast_send_level(ctx::AbstractCompiler, lvl::VirtualPatternLevel, arch)
9797
end
9898

9999
is_level_injective(ctx, ::VirtualPatternLevel) = []

‎src/tensors/levels/separate_levels.jl

+2-2
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ virtual_level_size(ctx, lvl::VirtualSeparateLevel) = virtual_level_size(ctx, lvl
146146
virtual_level_eltype(lvl::VirtualSeparateLevel) = virtual_level_eltype(lvl.lvl)
147147
virtual_level_fill_value(lvl::VirtualSeparateLevel) = virtual_level_fill_value(lvl.lvl)
148148

149-
function virtual_bcast_level(ctx, lvl::VirtualSeparateLevel, arch)
149+
function bcast_send_level(ctx, lvl::VirtualSeparateLevel, arch)
150150

151151
# Need to move each pointer...
152152
val_2 = freshen(ctx, lvl.val)
@@ -163,7 +163,7 @@ function virtual_bcast_level(ctx, lvl::VirtualSeparateLevel, arch)
163163
$(lvl.val) = $val_2
164164
end,
165165
)
166-
virtual_bcast_level(ctx, lvl.lvl, arch)
166+
bcast_send_level(ctx, lvl.lvl, arch)
167167
end
168168

169169
function declare_level!(ctx, lvl::VirtualSeparateLevel, pos, init)

‎src/tensors/levels/shard_levels.jl

+2-2
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ virtual_level_size(ctx, lvl::VirtualShardLevel) = virtual_level_size(ctx, lvl.lv
212212
virtual_level_eltype(lvl::VirtualShardLevel) = virtual_level_eltype(lvl.lvl)
213213
virtual_level_fill_value(lvl::VirtualShardLevel) = virtual_level_fill_value(lvl.lvl)
214214

215-
function virtual_bcast_level(ctx, lvl::VirtualShardLevel, arch)
215+
function bcast_send_level(ctx, lvl::VirtualShardLevel, arch)
216216
val_2 = freshen(ctx, lvl.val)
217217
push_preamble!(
218218
ctx,
@@ -227,7 +227,7 @@ function virtual_bcast_level(ctx, lvl::VirtualShardLevel, arch)
227227
$(lvl.val) = $val_2
228228
end,
229229
)
230-
virtual_bcast_level(ctx, lvl.lvl, arch)
230+
bcast_send_level(ctx, lvl.lvl, arch)
231231
end
232232

233233
function declare_level!(ctx, lvl::VirtualShardLevel, pos, init)

‎src/tensors/levels/sparse_band_levels.jl

+2-2
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ end
241241
virtual_level_eltype(lvl::VirtualSparseBandLevel) = virtual_level_eltype(lvl.lvl)
242242
virtual_level_fill_value(lvl::VirtualSparseBandLevel) = virtual_level_fill_value(lvl.lvl)
243243

244-
function virtual_bcast_level(ctx::AbstractCompiler, lvl::VirtualSparseBandLevel, arch)
244+
function bcast_send_level(ctx::AbstractCompiler, lvl::VirtualSparseBandLevel, arch)
245245
tbl_2 = freshen(ctx, lvl.tbl)
246246
ofs_2 = freshen(ctx, lvl.ofs)
247247
push_preamble!(
@@ -260,7 +260,7 @@ function virtual_bcast_level(ctx::AbstractCompiler, lvl::VirtualSparseBandLevel,
260260
$(lvl.ofs) = $ofs_2
261261
end,
262262
)
263-
virtual_bcast_level(ctx, lvl.lvl, arch)
263+
bcast_send_level(ctx, lvl.lvl, arch)
264264
end
265265

266266
function declare_level!(ctx::AbstractCompiler, lvl::VirtualSparseBandLevel, pos, init)

‎src/tensors/levels/sparse_bytemap_levels.jl

+2-2
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ function lower(ctx::AbstractCompiler, lvl::VirtualSparseByteMapLevel, ::DefaultS
239239
end
240240
end
241241

242-
function virtual_bcast_level(ctx::AbstractCompiler, lvl::VirtualSparseByteMapLevel, arch)
242+
function bcast_send_level(ctx::AbstractCompiler, lvl::VirtualSparseByteMapLevel, arch)
243243
ptr_2 = freshen(ctx, lvl.ptr)
244244
tbl_2 = freshen(ctx, lvl.tbl)
245245
srt_2 = freshen(ctx, lvl.srt)
@@ -262,7 +262,7 @@ function virtual_bcast_level(ctx::AbstractCompiler, lvl::VirtualSparseByteMapLev
262262
$(lvl.srt) = $srt_2
263263
end,
264264
)
265-
virtual_bcast_level(ctx, lvl.lvl, arch)
265+
bcast_send_level(ctx, lvl.lvl, arch)
266266
end
267267

268268
Base.summary(lvl::VirtualSparseByteMapLevel) = "SparseByteMap($(summary(lvl.lvl)))"

‎src/tensors/levels/sparse_coo_levels.jl

+2-2
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ function freeze_level!(ctx::AbstractCompiler, lvl::VirtualSparseCOOLevel, pos_st
344344
return lvl
345345
end
346346

347-
function virtual_bcast_level(ctx::AbstractCompiler, lvl::VirtualSparseCOOLevel, arch)
347+
function bcast_send_level(ctx::AbstractCompiler, lvl::VirtualSparseCOOLevel, arch)
348348
ptr_2 = freshen(ctx, lvl.ptr)
349349
push_preamble!(
350350
ctx,
@@ -376,7 +376,7 @@ function virtual_bcast_level(ctx::AbstractCompiler, lvl::VirtualSparseCOOLevel,
376376
)
377377
idx_2
378378
end
379-
virtual_bcast_level(ctx, lvl.lvl, arch)
379+
bcast_send_level(ctx, lvl.lvl, arch)
380380
end
381381

382382
struct SparseCOOWalkTraversal

‎src/tensors/levels/sparse_dict_levels.jl

+2-2
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ function thaw_level!(ctx::AbstractCompiler, lvl::VirtualSparseDictLevel, pos_sto
385385
return lvl
386386
end
387387

388-
function virtual_bcast_level(ctx::AbstractCompiler, lvl::VirtualSparseDictLevel, arch)
388+
function bcast_send_level(ctx::AbstractCompiler, lvl::VirtualSparseDictLevel, arch)
389389
ptr_2 = freshen(ctx, lvl.ptr)
390390
idx_2 = freshen(ctx, lvl.idx)
391391
tbl_2 = freshen(ctx, lvl.tbl_2)
@@ -402,7 +402,7 @@ function virtual_bcast_level(ctx::AbstractCompiler, lvl::VirtualSparseDictLevel,
402402
$(lvl.tbl) = $tbl_2
403403
end,
404404
)
405-
virtual_bcast_level(ctx, lvl.lvl, arch)
405+
bcast_send_level(ctx, lvl.lvl, arch)
406406
end
407407

408408
function unfurl(

‎src/tensors/levels/sparse_list_levels.jl

+2-2
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ function thaw_level!(ctx::AbstractCompiler, lvl::VirtualSparseListLevel, pos_sto
313313
return lvl
314314
end
315315

316-
function virtual_bcast_level(ctx::AbstractCompiler, lvl::VirtualSparseListLevel, arch)
316+
function bcast_send_level(ctx::AbstractCompiler, lvl::VirtualSparseListLevel, arch)
317317
ptr_2 = freshen(ctx, lvl.ptr)
318318
idx_2 = freshen(ctx, lvl.idx)
319319
push_preamble!(
@@ -332,7 +332,7 @@ function virtual_bcast_level(ctx::AbstractCompiler, lvl::VirtualSparseListLevel,
332332
$(lvl.idx) = $idx_2
333333
end,
334334
)
335-
virtual_bcast_level(ctx, lvl.lvl, arch)
335+
bcast_send_level(ctx, lvl.lvl, arch)
336336
end
337337

338338
function unfurl(

‎src/tensors/levels/sparse_point_levels.jl

+2-2
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ function thaw_level!(ctx::AbstractCompiler, lvl::VirtualSparsePointLevel, pos_st
254254
return lvl
255255
end
256256

257-
function virtual_bcast_level(ctx::AbstractCompiler, lvl::VirtualSparsePointLevel, arch)
257+
function bcast_send_level(ctx::AbstractCompiler, lvl::VirtualSparsePointLevel, arch)
258258
ptr_2 = freshen(ctx, lvl.ptr)
259259
idx_2 = freshen(ctx, lvl.idx)
260260
push_preamble!(
@@ -270,7 +270,7 @@ function virtual_bcast_level(ctx::AbstractCompiler, lvl::VirtualSparsePointLevel
270270
$(lvl.idx) = $idx_2
271271
end,
272272
)
273-
virtual_bcast_level(ctx, lvl.lvl, arch)
273+
bcast_send_level(ctx, lvl.lvl, arch)
274274
end
275275

276276
function unfurl(

‎src/tensors/levels/sparse_rle_levels.jl

+3-3
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ function virtual_level_resize!(ctx, lvl::VirtualSparseRunListLevel, dims...)
303303
lvl
304304
end
305305

306-
function virtual_bcast_level(ctx::AbstractCompiler, lvl::VirtualSparseRunListLevel, arch)
306+
function bcast_send_level(ctx::AbstractCompiler, lvl::VirtualSparseRunListLevel, arch)
307307
ptr_2 = freshen(ctx, lvl.ptr)
308308
left_2 = freshen(ctx, lvl.left)
309309
right_2 = freshen(ctx, lvl.right)
@@ -326,8 +326,8 @@ function virtual_bcast_level(ctx::AbstractCompiler, lvl::VirtualSparseRunListLev
326326
$(lvl.right) = $right_2
327327
end,
328328
)
329-
virtual_bcast_level(ctx, lvl.lvl, arch)
330-
virtual_bcast_level(ctx, lvl.buf, arch)
329+
bcast_send_level(ctx, lvl.lvl, arch)
330+
bcast_send_level(ctx, lvl.buf, arch)
331331
end
332332

333333
virtual_level_eltype(lvl::VirtualSparseRunListLevel) = virtual_level_eltype(lvl.lvl)

‎src/tensors/levels/sparse_vbl_levels.jl

+2-2
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ function virtual_level_fill_value(lvl::VirtualSparseBlockListLevel)
289289
virtual_level_fill_value(lvl.lvl)
290290
end
291291

292-
function virtual_bcast_level(ctx::AbstractCompiler, lvl::VirtualSparseBlockListLevel, arch)
292+
function bcast_send_level(ctx::AbstractCompiler, lvl::VirtualSparseBlockListLevel, arch)
293293
ptr_2 = freshen(ctx, lvl.ptr)
294294
tbl_2 = freshen(ctx, lvl.tbl)
295295
ofs_2 = freshen(ctx, lvl.ofs)
@@ -312,7 +312,7 @@ function virtual_bcast_level(ctx::AbstractCompiler, lvl::VirtualSparseBlockListL
312312
$(lvl.ofs) = $ofs_2
313313
end,
314314
)
315-
virtual_bcast_level(ctx, lvl.lvl, arch)
315+
bcast_send_level(ctx, lvl.lvl, arch)
316316
end
317317

318318
function declare_level!(ctx::AbstractCompiler, lvl::VirtualSparseBlockListLevel, pos, init)

‎src/tensors/scalars.jl

+4-4
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ function virtualize(ctx, ex, ::Type{Scalar{Vf,Tv}}, tag) where {Vf,Tv}
4141
VirtualScalar(sym, Tv, Vf, tag, val)
4242
end
4343

44-
virtual_bcast(ctx, lvl::VirtualScalar, arch) = lvl
44+
bcast_send(ctx, lvl::VirtualScalar, arch) = lvl
4545

4646
virtual_size(ctx, ::VirtualScalar) = ()
4747

@@ -147,7 +147,7 @@ virtual_size(ctx, ::VirtualSparseScalar) = ()
147147
virtual_fill_value(ctx, tns::VirtualSparseScalar) = tns.Vf
148148
virtual_eltype(tns::VirtualSparseScalar, ctx) = tns.Tv
149149

150-
virtual_bcast(ctx, lvl::VirtualSparseScalar, arch) = lvl
150+
bcast_send(ctx, lvl::VirtualSparseScalar, arch) = lvl
151151

152152
function declare!(ctx, tns::VirtualSparseScalar, init)
153153
push_preamble!(
@@ -289,7 +289,7 @@ function lower_assign(ctx, tns::VirtualShortCircuitScalar, mode, op, rhs)
289289
:($(tns.val) = $lhs_2)
290290
end
291291

292-
virtual_bcast(ctx, lvl::VirtualShortCircuitScalar, arch) = lvl
292+
bcast_send(ctx, lvl::VirtualShortCircuitScalar, arch) = lvl
293293

294294
function short_circuit_cases(ctx, tns::VirtualShortCircuitScalar, op)
295295
[
@@ -359,7 +359,7 @@ virtual_size(ctx, ::VirtualSparseShortCircuitScalar) = ()
359359
virtual_fill_value(ctx, tns::VirtualSparseShortCircuitScalar) = tns.Vf
360360
virtual_eltype(tns::VirtualSparseShortCircuitScalar, ctx) = tns.Tv
361361

362-
virtual_bcast(ctx, lvl::VirtualSparseShortCircuitScalar, arch) = lvl
362+
bcast_send(ctx, lvl::VirtualSparseShortCircuitScalar, arch) = lvl
363363

364364
function declare!(ctx, tns::VirtualSparseShortCircuitScalar, init)
365365
push_preamble!(

0 commit comments

Comments
 (0)