Merge Craig's GPU changes into abhijeet_per_camera_prior_gpu branch #259
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Modified solve_matrices algorithm to accept PCA or BVLS as a method. Re-orgianized logic for GPU to take advantage of existing calc_zchi2_batch algorithm. For some strange reason refactoring tdata to add rows for color data in batch in 3d array on CPU takes way longer than a python loop over 2d arrays so I left two methods for per_camera - one for GPU and one for CPU - for now while this gets resolved. This is not the cleanest but it is the fastest and we can revisit if we change our mind on that.
cleanly without a speed loss in runtime. Removed old methods Tbs_for_archetypes, per_camera_coeff_with_least_square, and per_camera_coeff_with_least_square_cpu and renamed the remaining method to per_camera_coeff_with_least_square_batch. Updated 1->n_nbh where Abhijeet pointed out errors had been made.
Rolled back changes by Abhijeet done while attempting to merge to restore per camera batch method.
This was referenced Nov 28, 2023
Closed
…et_per_camera_prior_gpu. Added prior as optional arg to calc_zchi2_batch to do this.
craigwarner-ufastro
merged commit bd5983a
into
abhijeet_per_camera_prior_gpu
17 checks passed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR merges changes from @craigwarner-ufastro on the abhijeet_per_camera_gpu branch into the abhijeet_per_camera_prior_gpu branch, so that they can be included in PR #255 to merge these into main.
@craigwarner-ufastro please review these changes and resolve any conflicts with the goal of getting abhijeet_per_camera_prior_gpu into the "reference state" for updated archetypes + GPUs.