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

Populate full variable and use ns time #823

Merged
merged 3 commits into from
Aug 7, 2020
Merged

Conversation

Affie
Copy link
Member

@Affie Affie commented Aug 5, 2020

No description provided.

@Affie Affie added variableType Renamed from softtype timestamps labels Aug 5, 2020
@Affie Affie added this to the v0.15.0 milestone Aug 5, 2020
@codecov-commenter
Copy link

codecov-commenter commented Aug 5, 2020

Codecov Report

Merging #823 into master will decrease coverage by 0.13%.
The diff coverage is 55.55%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #823      +/-   ##
==========================================
- Coverage   62.47%   62.34%   -0.14%     
==========================================
  Files          39       39              
  Lines        4584     4600      +16     
==========================================
+ Hits         2864     2868       +4     
- Misses       1720     1732      +12     
Impacted Files Coverage Δ
src/ApproxConv.jl 87.58% <ø> (ø)
src/FactorGraph.jl 70.35% <55.55%> (-0.40%) ⬇️
src/Deprecated.jl 29.03% <0.00%> (-10.10%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d822096...57d9720. Read the comment docs.

@@ -103,6 +103,8 @@ function prepareCommonConvWrapper!(ccwl::CommonConvWrapper{T},
ccwl.cpt[i].p = collect(1:size(ccwl.cpt[i].X,1)) # collect(1:length(ccwl.cpt[i].Y))
ccwl.cpt[i].Y = zeros(ccwl.xDim) # zeros(ccwl.partial ? length(ccwl.usrfnc!.partial) : ccwl.xDim )
ccwl.cpt[i].res = zeros(ccwl.xDim) # used in ccw functor for AbstractRelativeFactorMinimize
# TODO JT - Confirm it should be updated here.
ccwl.cpt[i].factormetadata.fullvariables = copy(Xi)
Copy link
Member

@dehann dehann Aug 5, 2020

Choose a reason for hiding this comment

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

is a copy necessary? Factor operations should not be allowed to change the variable metadata so we can just send the same reference, unless there is a stack vs. heap performance benefit somehow.

Copy link
Member Author

@Affie Affie Aug 6, 2020

Choose a reason for hiding this comment

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

Copy was to be on the save side. I want to be sure the container does not change. It looks like it doesn't, but there are some comments in the code about constructing Xi:

TODO -- this build up of Xi is excessive and could happen at addFactor time

Perhaps fullvairables can be populated at construction time?

Copy link
Member Author

Choose a reason for hiding this comment

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

@dehann perhaps rather in prepgenericconvolution? Or will it not make a difference.

src/FactorGraph.jl Outdated Show resolved Hide resolved
@Affie Affie marked this pull request as ready for review August 7, 2020 16:05
@@ -608,6 +621,8 @@ function prepgenericconvolution(
)
#
for i in 1:Threads.nthreads()
# TODO JT - Confirm it should be updated here. Also testing in prepareCommonConvWrapper!
ccw.cpt[i].factormetadata.fullvariables = copy(Xi)
Copy link
Member

Choose a reason for hiding this comment

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

again, not sure if the copy is really needed?

@Affie Affie merged commit 8130401 into master Aug 7, 2020
@dehann dehann deleted the feat/20Q3/fullvar_nstime branch December 21, 2020 01:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
timestamps variableType Renamed from softtype
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants