Added Community Sensor Model as a dependency #4130
Merged
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
jessemapel
reviewed
Nov 19, 2020
environment.yml
Outdated
| @@ -13,6 +13,7 @@ dependencies: | |||
| - bzip2 | |||
| - cmake >=3.15 | |||
| - cspice | |||
| - csm==3.0.3 | |||
There was a problem hiding this comment.
For some reason this isn't resolving correctly https://astroservices.usgs.gov/jenkins/job/USGS-Astrogeology/job/ISIS3/job/PR-4130/1/execution/node/44/log/
There was a problem hiding this comment.
This is a feature branch, so we can merge as needed. I don't see a problem with merging for now. As soon as I figure out what is causing it, I'll put up another PR. I think I have a good idea.
There was a problem hiding this comment.
I changed it to allow any 3.0.3.X version, and it now resolves the packages.
|
I know this isn't working on Jenkins but it builds fine for me locally. Is it okay if I merge this? It's not into dev, so it's not going to break anything. |
|
Builds are linking properly, I think we can merge this |
jessemapel
approved these changes
Nov 20, 2020
krlberry
added a commit
that referenced
this pull request
Jan 20, 2021
* Added Community Sensor Model as a dependency (#4130) * Added Community Sensor Model as a dependency * Added new keyword for CSM plugin locations * Fixed csm entry to allow the 4th version number to float * Csm plugin (#4142) * Added Community Sensor Model as a dependency * Added new keyword for CSM plugin locations * Fixed csm entry to allow the 4th version number to float * Load CSM plugin libraries * Adds csminit and csmpt as prototype CSM support (#4143) * Partial csminit code * Update csminit to get compiling, update label based on discussion to store csm information in the Archive group, and write the state string out to the cube * Removed Thanksgiving-themed debug output * Updated StringBlob override methods * Fixed some build errors * Fixed header * Working? * Now working? * First pass at csmpt application * Better error checking * Modified to use the plugin specification * Addressed PR comments Co-authored-by: Kristin <[email protected]> * Update Test plugin and model to get partway to using a second sensor model * Adds tests for csminit (#4151) * Update Test plugin and model to get partway to using a second sensor model * Add tests for csminit * Fixed stream buffer flushing issue to fix json file issues * Fix issue with reading/writing blobs to test cube and general cleanup and documentation * Update PR based on comments * Remove full path * Update based on feedback * modified csminit to put model info in a separate group (#4171) * Added test model parameters * Added geometric model stuff to alternate * Moved csm info to new group * Updated tests for csminit clean-up * Changed test states to hold params * Fixed param names and removed hardcoding * Add documentation for testing plugin and sensosr model classes * Added the ability to run spiceinit and csminit in any order (#4180) * Added csminit cleanup * spiceinit clean up * Added no clean up test * Added a new comment and fixed test name * Update Test CSM Plugin to act more like a real plugin (#4187) * Add documentation for testing plugin and sensosr model classes * Update Test Plugin to act more like a functional plugin * Remove comments * Clean up * Fix failing tests * Update TestCsmPlugin based on feedback and add back in model construction from state based on name * Switch to use comparison with static plugin name rather than hardcoded state * Remove json include and unnecessary model_name from test * Csm branch clean up (#4191) * Removed csmpt * General cleanup * Review feedback * Updated based on feedback * Fix faulty spiceinit merge Co-authored-by: Stuart Sides <[email protected]> Co-authored-by: Kristin <[email protected]>
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.
Modified cmake system to find CSM includes and library
Description
Added the Community Sensor Model library and includes to the dependencies in preparation for adding CSM models as an option to ISIS
Related Issue
Motivation and Context
How Has This Been Tested?
The output of the cmake configuration was checked to see that the lib and inc directories were found.
Screenshots (if appropriate):
Types of changes
Checklist:
Licensing
This project is mostly composed of free and unencumbered software released into the public domain, and we are unlikely to accept contributions that are not also released into the public domain. Somewhere near the top of each file should have these words: