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.

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

DirectCR-RSSA #346

Open
wants to merge 43 commits into
base: master
Choose a base branch
from
Open

DirectCR-RSSA #346

wants to merge 43 commits into from

Conversation

Vilin97
Copy link
Contributor

@Vilin97 Vilin97 commented Sep 11, 2023

A new spatial SSA called DirectCRRSSA uses RSSA-style sampling to sample the site+jump. It is about 20% faster than DirectCRDirect, at least on the problem in the test/spatial/ABC.jl (5 sites in a line, 3 species, 2 reactions).

using BenchmarkTools
@btime solve(jump_problems[1], SSAStepper()) # NSM with a `CartesianGrid`, 52ms
@btime solve(jump_problems[2], SSAStepper()) # NSM with a `Graph`, 49ms
@btime solve(jump_problems[3], SSAStepper()) # DirectCRDirect with  a `CartesianGrid`, 51ms
@btime solve(jump_problems[4], SSAStepper()) # DirectCRRSSA with a `CartesianGrid`, 42ms

@Vilin97 Vilin97 requested a review from isaacsas September 11, 2023 04:39
@github-actions
Copy link
Contributor

Pull Request Test Coverage Report for Build 6141985002

  • 172 of 181 (95.03%) changed or added relevant lines in 8 files are covered.
  • 12 unchanged lines in 5 files lost coverage.
  • Overall coverage decreased (-0.1%) to 89.759%

Changes Missing Coverage Covered Lines Changed/Added Lines %
src/spatial/bracketing.jl 35 38 92.11%
src/spatial/rssacrdirect.jl 105 111 94.59%
Files with Coverage Reduction New Missed Lines %
src/aggregators/prioritytable.jl 1 86.86%
src/extended_jump_array.jl 1 80.52%
src/coupling.jl 2 78.18%
src/spatial/spatial_massaction_jump.jl 3 85.45%
src/spatial/directcrdirect.jl 5 87.65%
Totals Coverage Status
Change from base Build 6133295964: -0.1%
Covered Lines: 2419
Relevant Lines: 2695

💛 - Coveralls

src/spatial/hop_rates.jl Outdated Show resolved Hide resolved
@Vilin97 Vilin97 marked this pull request as ready for review September 12, 2023 01:29
@Vilin97 Vilin97 changed the title [WIP] CR-RSSA DirectCR-RSSA Sep 12, 2023
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There was a very hard-to-find bug in the ordering of arguments in generate_jumps!. I fixed it here and in NSM.jl.

@coveralls
Copy link

coveralls commented Sep 12, 2023

Pull Request Test Coverage Report for Build 6180696485

  • 155 of 161 (96.27%) changed or added relevant lines in 8 files are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage increased (+0.3%) to 90.175%

Changes Missing Coverage Covered Lines Changed/Added Lines %
src/spatial/bracketing.jl 23 24 95.83%
src/spatial/directcrrssa.jl 106 111 95.5%
Totals Coverage Status
Change from base Build 6167199515: 0.3%
Covered Lines: 2423
Relevant Lines: 2687

💛 - Coveralls

Copy link
Member

@isaacsas isaacsas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs rebasing too it appears.

Comment on lines +8 to +16
function LowHigh(low::T, high::T; do_copy = true) where {T}
if do_copy
return new{T}(deepcopy(low), deepcopy(high))
else
return new{T}(low, high)
end
end
LowHigh(pair::Tuple{T,T}; kwargs...) where {T} = LowHigh(pair[1], pair[2]; kwargs...)
LowHigh(low_and_high::T; kwargs...) where {T} = LowHigh(low_and_high, low_and_high; kwargs...)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does switching to using a branch have performance implications? We create these structures a lot right in the scalar case right? I'm not sure if Julia will remove it during compilation.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Even if it's not optimized away, it shouldn't be expensive, right? I am not good at reading low level code but it seems that it does get optimized away in the end.

# Old struct without branching
struct LowHighOld{T}
    low::T
    high::T

    function LowHighOld(low::T, high::T) where {T}
        new{T}(deepcopy(low), deepcopy(high))
    end
end

# New struct with branching
struct LowHighNew{T}
    low::T
    high::T

    function LowHighNew(low::T, high::T; do_copy=true) where {T}
        if do_copy
            return new{T}(deepcopy(low), deepcopy(high))
        else
            return new{T}(low, high)
        end
    end
end

# Test values
low_value = 10
high_value = 20

# Code introspection to see if the branch is removed in scalar cases
@code_llvm debuginfo=:none LowHighOld(low_value, high_value)

@code_llvm debuginfo=:none LowHighNew(low_value, high_value; do_copy=true)

The output of the code introspection is as follows:

define void @julia_LowHighOld_2364([2 x i64]* noalias nocapture noundef nonnull sret([2 x i64]) 
align 8 dereferenceable(16) %0, {}* noundef nonnull readonly %1, i64 signext %2, i64 signext %3) #0 {
top:
  %newstruct.sroa.0.0..sroa_idx = getelementptr inbounds [2 x i64], [2 x i64]* %0, i64 0, i64 0 
  store i64 %2, i64* %newstruct.sroa.0.0..sroa_idx, align 8
  %newstruct.sroa.2.0..sroa_idx1 = getelementptr inbounds [2 x i64], [2 x i64]* %0, i64 0, i64 1  store i64 %3, i64* %newstruct.sroa.2.0..sroa_idx1, align 8
  ret void
}

define void @julia_LowHighNew_2366([2 x i64]* noalias nocapture noundef nonnull sret([2 x i64]) 
align 8 dereferenceable(16) %0, [1 x i8]* nocapture noundef nonnull readonly align 1 dereferenceable(1) %1, {}* noundef nonnull readonly %2, i64 signext %3, i64 signext %4) #0 {
top:
  %.sroa.025.0..sroa_idx = getelementptr inbounds [2 x i64], [2 x i64]* %0, i64 0, i64 0        
  store i64 %3, i64* %.sroa.025.0..sroa_idx, align 8
  %.sroa.2.0..sroa_idx26 = getelementptr inbounds [2 x i64], [2 x i64]* %0, i64 0, i64 1
  store i64 %4, i64* %.sroa.2.0..sroa_idx26, align 8
  ret void
}

src/spatial/hop_rates.jl Outdated Show resolved Hide resolved
src/spatial/hop_rates.jl Outdated Show resolved Hide resolved
src/spatial/hop_rates.jl Outdated Show resolved Hide resolved

# SSAs
for alg in [DirectCRDirect(), DirectCRRSSA()]
push!(jump_problems, JumpProblem(prob, alg, majumps, hopping_constants = hopping_constants, spatial_system = grids[1], save_positions = (false, false), rng = rng))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
push!(jump_problems, JumpProblem(prob, alg, majumps, hopping_constants = hopping_constants, spatial_system = grids[1], save_positions = (false, false), rng = rng))
push!(jump_problems, JumpProblem(prob, alg, majumps; hopping_constants, spatial_system = grids[1], save_positions = (false, false), rng))

src/spatial/directcrrssa.jl Outdated Show resolved Hide resolved
Comment on lines +139 to +145
jump = sample_jump_direct(rx_rates.high, hop_rates.high, site, spatial_system, rng)
time_delta += randexp(rng)
if accept_jump(p, u, jump)
p.next_jump_time = t + time_delta / groupsum(rt)
p.next_jump = jump
break
end
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this handle if there is no next jump?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To be honest, I do not rembmer any of the logic by now. Do we have a test for what you are asking? If not, we should, for all SSAs.

src/spatial/directcrrssa.jl Show resolved Hide resolved
src/spatial/directcrrssa.jl Show resolved Hide resolved
src/spatial/directcrrssa.jl Show resolved Hide resolved
Copy link
Contributor Author

@Vilin97 Vilin97 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Addressed comments.

@Vilin97
Copy link
Contributor Author

Vilin97 commented Aug 21, 2024

What do I need to do to get rid of the format and the spell check CI failures? @isaacsas

@isaacsas
Copy link
Member

isaacsas commented Aug 22, 2024

For spell check fix the listed spelling errors I guess. Haven’t ever used it or seen it before.

For formatting use JuliaFormatter to format the repo and add to the PR.

@isaacsas
Copy link
Member

Just FYI, I'm traveling for the next week, but will try to review once I am back in Boston.

@isaacsas isaacsas closed this Oct 30, 2024
@isaacsas isaacsas reopened this Oct 30, 2024
@isaacsas
Copy link
Member

@Vilin97 sorry again for the long delays with this. I’ll try to put a test for the case I was worried about into the general tests in a followup. Assuming tests now pass I’ll merge.

I do think there is a chance the removal of the dispatch for HighLow could have performance implications, as I’m not sure Julia can always remove the branch in this situation (what it can do from the REPL may not be the same as what it can do here). But in any case we can merge and that can be examined later as a performance optimization.

Thanks again for your efforts on this — I look forward to updating the benchmarks to use it to see how it does.

@isaacsas
Copy link
Member

Ahh, I didn’t realize that the updates to address my earlier comments actually never passed tests.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants