Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allocation Tests #50

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

Allocation Tests #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4a51a00
added allocation tests
zsunberg Jul 11, 2024
9ff0c11
improved to ballocated?
zsunberg Jul 11, 2024
91e3ff9
Merge branch 'master' into alloc-tests
zsunberg Jul 11, 2024
7595fe6
more faffing around - testing for allocations does not seem to be rel…
zsunberg Jul 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,12 @@ StaticArrays = "0.9, 0.10, 0.11, 0.12, 1"
julia = "1"

[extras]
BenchmarkTools = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf"
DelimitedFiles = "8bb1440f-4735-579b-a4ab-409b98df4dab"
Interpolations = "a98d9a8b-a2ab-59e6-89dd-64a1c18fca59"
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[targets]
test = ["Test", "DelimitedFiles", "Random", "Interpolations", "Statistics"]
test = ["Test", "BenchmarkTools", "DelimitedFiles", "Random", "Interpolations", "Statistics"]
2 changes: 1 addition & 1 deletion bench/benchmark.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ function benchmark(GridType::Type, n_dims::Int; n_points_per_dim::Int=15, n_rand
return trial
end

verbosity = 1
verbosity = 2
for ndims in 1:6

println("\n##################################################")
Expand Down
39 changes: 24 additions & 15 deletions src/GridInterpolations.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,14 +164,21 @@ function interpolants(grid::RectangleGrid, x::AbstractVector)
weight = MVector{num_points, eltype(x)}(undef)
weight2 = MVector{num_points, eltype(x)}(undef)

# Note: these values are set explicitly because we have not verified that the logic below is independent of the initial values. See discussion in PR #47. These can be removed if it can be proved that the logic is independent of the initial values.
index .= 1
index2 .= 1
weight .= zero(eltype(weight))
weight2 .= zero(eltype(weight2))
# # Note: these values are set explicitly because we have not verified that the logic below is independent of the initial values. See discussion in PR #47. These can be removed if it can be proved that the logic is independent of the initial values.
for i in 1:num_points
@inbounds index[i] = 1
@inbounds index2[i] = 1
@inbounds weight[i] = zero(eltype(x))
@inbounds weight2[i] = zero(eltype(x))
end

# index = @MVector ones(Int, num_points)
# index2 = @MVector ones(Int, num_points)
# weight = @MVector zeros(eltype(x), num_points)
# weight2 = @MVector zeros(eltype(x), num_points)

weight[1] = one(eltype(weight))
weight2[1] = one(eltype(weight2))
@inbounds weight[1] = one(eltype(weight))
@inbounds weight2[1] = one(eltype(weight2))

l = 1
subblock_size = 1
Expand Down Expand Up @@ -288,16 +295,18 @@ function interpolants(grid::SimplexGrid, x::AbstractVector)
# get weight
for i = 1:(length(x_p)+1)
if i == 1
weight[i] = 1 - x_p[i]
@inbounds weight[i] = 1 - x_p[i]
elseif i == length(x_p) + 1
weight[i] = x_p[i-1]
@inbounds weight[i] = x_p[i-1]
else
weight[i] = x_p[i-1] - x_p[i]
@inbounds weight[i] = x_p[i-1] - x_p[i]
end
end

# get indices
fill!(index, 0)
for i in 1:length(index)
@inbounds index[i] = 0
end
i_index = 0
for i = 1:(length(x_p)+1)
siz = 1
Expand All @@ -310,17 +319,17 @@ function interpolants(grid::SimplexGrid, x::AbstractVector)
onHi = ((i_index & good_count) > 0)
good_count <<= 1
if onHi
index[i] += (ihi[k] - 1 - ct) * siz
@inbounds index[i] += (ihi[k] - 1 - ct) * siz
else
index[i] += (ilo[k] - 1 - ct) * siz
@inbounds index[i] += (ilo[k] - 1 - ct) * siz
end
siz = siz * cut_counts[k]
ct += cut_counts[k]
end
index[i] += 1
@inbounds index[i] += 1
end

weight = weight ./ sum(weight)
@inbounds weight = weight ./ sum(weight)

return SVector(index), SVector(weight)
end
Expand Down
1 change: 0 additions & 1 deletion test/REQUIRE
View file
Open in desktop

This file was deleted.

12 changes: 12 additions & 0 deletions test/runtests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ using Test
using LinearAlgebra
using Random
using DelimitedFiles
using BenchmarkTools
using StaticArrays

# use import otherwise Interpolations.interpolate conflicts with GridInterpolations.interpolate
import Interpolations: BSpline, Linear, OnGrid, Flat
Expand Down Expand Up @@ -261,14 +263,20 @@ function test_rect_implemented()
@test x == [5, 5]

@test interpolants(rgrid, [1, 1]) == ([1], [1.0])
@show @ballocated(interpolants($rgrid, $([1,1])))
@test @ballocated(interpolants($rgrid, $([1,1]))) == 0
@test interpolants(rgrid, [2, 5]) == ([3], [1.0])
@test @ballocated(interpolants($rgrid, $([2, 5]))) == 0

indices, weights = interpolants(rgrid, [1.5, 3])
@test indices == [1, 3]
@test isapprox(weights, [0.666667, 0.333333], rtol=1e-5)

@test interpolate(rgrid, [1, 2, 3, 4], [1, 1]) == 1.0
@test @ballocated(interpolate($rgrid, $([1, 2, 3, 4]), $([1, 1]))) == 0
@test maskedInterpolate(rgrid, [1, 2, 3, 4], [1, 1], BitArray([false, false, false, false])) == 1.0
@test @ballocated(maskedInterpolate($rgrid, $([1, 2, 3, 4]), $([1, 1]), $(BitArray([false, false, false, false])))) == 0

@test isnan(maskedInterpolate(rgrid, [1, 2, 3, 4], [1, 1], BitArray([true, false, false, false])))

@test isapprox(interpolate(rgrid, [1, 2, 3, 4], [1.5, 3]), 1.66666666, rtol=1e-5)
Expand Down Expand Up @@ -296,6 +304,8 @@ function test_simplex_implemented()
@test x == [5, 5]

indices, weights = interpolants(grid, [1, 1])
@test @ballocated(interpolants($grid, $([1, 1]))) == 0

full_weight_indices = findall(x -> x == 1, weights)
@test length(full_weight_indices) == 1
@test weights[full_weight_indices[1]] == 1.0
Expand All @@ -309,7 +319,9 @@ function test_simplex_implemented()
@test isapprox(weights[full_weight_indices[1]], 0.333333, rtol=1e-5) == true

@test interpolate(grid, [1, 2, 3, 4], [1, 1]) == 1.0
@test @ballocated(interpolate($grid, $([1, 2, 3, 4]), $([1, 1]))) == 0
@test maskedInterpolate(grid, [1, 2, 3, 4], [1, 1], BitArray([false, false, false, false])) == 1.0
@test @ballocated(maskedInterpolate($grid, $([1, 2, 3, 4]), $([1, 1]), $(BitArray([false, false, false, false])))) == 0
@test isnan(maskedInterpolate(grid, [1, 2, 3, 4], [1, 1], BitArray([true, false, false, false])))

@test isapprox(interpolate(grid, [1, 2, 3, 4], [1.5, 3]), 1.66666666, rtol=1e-5)
Expand Down
Loading