Skip to content

Commit 0a652bd

Browse files
authored
Merge branch 'main' into update_formatter
2 parents 8a63cdf + 689aea2 commit 0a652bd

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "PointNeighbors"
22
uuid = "1c4d5385-0a27-49de-8e2c-43b175c8985c"
33
authors = ["Erik Faulhaber <erik.faulhaber@uni-koeln.de>"]
4-
version = "0.6.0"
4+
version = "0.6.1"
55

66
[deps]
77
Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"

src/cell_lists/full_grid.jl

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,9 @@ function max_points_per_cell(cells)
222222
return 100
223223
end
224224

225-
@inline function check_cell_bounds(cell_list::FullGridCellList, cell::Tuple)
225+
@inline function check_cell_bounds(cell_list::FullGridCellList{<:DynamicVectorOfVectors{<:Any,
226+
<:Array}},
227+
cell::Tuple)
226228
(; linear_indices) = cell_list
227229

228230
# Make sure that points are not added to the outer padding layer, which is needed
@@ -235,10 +237,10 @@ end
235237
end
236238
end
237239

238-
# On GPUs, we can't throw a proper error message because string interpolation is not allowed
239-
@inline function check_cell_bounds(cell_list::FullGridCellList{<:DynamicVectorOfVectors{<:Any,
240-
<:AbstractGPUArray}},
241-
cell::Tuple)
240+
# On GPUs, we can't throw a proper error message because string interpolation is not
241+
# allowed. Note that we cannot dispatch on `AbstractGPUArray`, as we are inside a kernel,
242+
# so the array types are something like `CuDeviceArray`, which is not an `AbstractGPUArray`.
243+
@inline function check_cell_bounds(cell_list::FullGridCellList, cell::Tuple)
242244
(; linear_indices) = cell_list
243245

244246
# Make sure that points are not added to the outer padding layer, which is needed

0 commit comments

Comments
 (0)