Skip to content

Using updated cspice #5886

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

Open
wants to merge 7 commits into
base: dev
Choose a base branch
from
Open

Using updated cspice #5886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a6a5c90
Use new cspice
chkim-usgs Sep 22, 2025
2b254f1
update changelog
chkim-usgs Sep 22, 2025
d8bfdc9
Force cspice version to pick up build 11
acpaquette Sep 23, 2025
430cb0b
set spiceql to 1.2.0_1, sqlite to original
chkim-usgs Sep 30, 2025
6376161
Fixed up cmake for new cspice target
acpaquette Sep 30, 2025
925959e
Updated arm envs with spiceql version
acpaquette Sep 30, 2025
1b76808
Update meta.yaml
acpaquette Sep 30, 2025
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ ctest FunctionalTestJigsawApollo to validate this output. [#5710](https://github
- Changed `StripPolygonSeeder` and `GridPolygonSeeder` to seed individual polygons within each images multipolygon footprint [#5193](https://github.com/DOI-USGS/ISIS3/issues/5193)
- Pinned SpiceQL to 1.2.0 [#5852](https://github.com/DOI-USGS/ISIS3/pull/5852)
- Changed `ControlMeasure` object comparison to no longer factor in creation date for equality [#5862](https://github.com/DOI-USGS/ISIS3/pull/5862)
- Updated cmake configs to accommodate new cspice release [#5886](https://github.com/DOI-USGS/ISIS3/pull/5886)

### Fixed
- Fixed kaguyatc2isis invalid BandBin values [#5629](https://github.com/DOI-USGS/ISIS3/issues/5629)
Expand Down
4 changes: 2 additions & 2 deletions environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dependencies:
- bz2file
- bzip2
- cmake >=3.27,<3.28
- cspice =67
- cspice =67=*_11
Copy link
Contributor

@amystamile-usgs amystamile-usgs Sep 24, 2025

Choose a reason for hiding this comment

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

The dev anaconda builds are failing too. Need to update the meta.yml as well.

Copy link
Collaborator

@acpaquette acpaquette Sep 24, 2025

Choose a reason for hiding this comment

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

Right, there's another issue going on. Basically the same issues for updating to gdal 3.11. There is seemingly a random segfault happening when collecting gtests. I have also run into segfaults when running ISIS apps with the updates in the env file.

I've basically hit a brick wall and can't figure out what the issue is

Copy link
Contributor

@amystamile-usgs amystamile-usgs Sep 24, 2025

Choose a reason for hiding this comment

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

I figured there are more issues going on and that this PR isn't ready yet. I just wanted to throw a comment in here so it's not missed before it's ready for review/merging.

- csm >=3.0.3,<3.0.4
- curl >=8.14.1,<9
- cxx-compiler=1.7
Expand Down Expand Up @@ -64,7 +64,7 @@ dependencies:
- qhull
- qt-main>=5.15, <5.16
- qwt <6.3.0
- spiceql =1.2.0
- spiceql =1.2.0=*_1
- sqlite >=3.46.0,<3.47
- suitesparse <7.7.0
- superlu
Expand Down
4 changes: 2 additions & 2 deletions environment_arm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dependencies:
- bz2file
- bzip2
- cmake >=3.27,<3.28
- cspice =67
- cspice =67=*_11
Copy link
Contributor

@amystamile-usgs amystamile-usgs Sep 30, 2025

Choose a reason for hiding this comment

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

Do the changes in the main environment.yml also need to be applied to the ARM environment yamls?

Copy link
Contributor Author

@chkim-usgs chkim-usgs Sep 30, 2025

Choose a reason for hiding this comment

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

Yes, although some changes may be reverted so once the main environment.yml is finalized then I'll update the variants.

- csm >=3.0.3,<3.0.4
- curl >=8.4.0,<8.5
- cxx-compiler=1.7
Expand Down Expand Up @@ -61,7 +61,7 @@ dependencies:
- qhull
- qt-main>=5.15, <5.16
- qwt <6.3.0
- spiceql =1.2.0
- spiceql =1.2.0=*_1
- sqlite >=3.46.0,<3.47
- suitesparse <7.7.0
- superlu
Expand Down
4 changes: 2 additions & 2 deletions environment_arm_linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ dependencies:
- bz2file
- bzip2
- cmake >=3.27,<3.28
- cspice =67
- cspice =67=*_11
#- csm >=3.0.3,<3.0.4
- curl >=8.4.0,<8.5
- cxx-compiler=1.7
Expand Down Expand Up @@ -60,7 +60,7 @@ dependencies:
- qhull
- qt-main>=5.15, <5.16
- qwt <6.3.0
- spiceql =1.2.0
- spiceql =1.2.0=*_1
- sqlite >=3.46.0,<3.47
- suitesparse <7.7.0
- superlu
Expand Down
9 changes: 7 additions & 2 deletions isis/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ find_package(Json REQUIRED)
find_package(BulletFloat64 REQUIRED)
find_package(Cholmod 4.4.5 REQUIRED)
find_package(CSM 3.0.3.3 REQUIRED)
find_package(CSPICE 65 REQUIRED)
find_package(cspice 67 REQUIRED)
find_package(Eigen REQUIRED)
find_package(Embree 3.13.0 REQUIRED)
find_package(GDAL REQUIRED CONFIG)
Expand Down Expand Up @@ -384,7 +384,7 @@ foreach (_variableName ${_variableNames})
endforeach()

# add target based linkages to ALLLIBS variable
list(APPEND ALLLIBS pantor::inja sensorutilities protobuf::libprotobuf embree GDAL::GDAL)
list(APPEND ALLLIBS pantor::inja sensorutilities protobuf::libprotobuf embree GDAL::GDAL CSPICE::cspice)

# Sometimes we add the same lib more than once (especially with LIBDIRS)
list(REMOVE_DUPLICATES ALLLIBDIRS)
Expand All @@ -394,6 +394,10 @@ list(REMOVE_DUPLICATES ALLINCDIRS)
#===============================================================================
#===============================================================================


get_target_property(CSPICE_INCLUDE_DIRS CSPICE::cspice INTERFACE_INCLUDE_DIRECTORIES)
list(APPEND ALLLIBDIRS ${CSPICE_INCLUDE_DIRS})

# Start setting up the build
# Add extension to find fortran until .so symlink can be added to /usr/lib64
list(APPEND CMAKE_FIND_LIBRARY_SUFFIXES .so.3 .so.6 .so.5)
Expand All @@ -403,6 +407,7 @@ include_directories(SYSTEM ${ALLINCDIRS})
link_directories(${ALLLIBDIRS})

include_directories(${CMAKE_BINARY_DIR}/inc)

set(CORE_LIB_NAME isis)
message(STATUS "CORE LIB: ${CORE_LIB_NAME}")

Expand Down
0 isis/cmake/FindCSPICE.cmake → isis/cmake/FindCSPICE-disabled.cmake
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ requirements:
- bz2file
- bzip2
- cmake >=3.27,<3.28
- cspice =67
- cspice =67=*_11
- usgs-astrogeology::csm >=3.0.3,<3.0.4 # [osx and arm64]
- csm >=3.0.3,<3.0.4 # [not (osx and arm64)]
- curl >=8.14.1,<9
Expand Down Expand Up @@ -106,7 +106,7 @@ requirements:
- qhull
- qt-main >=5.15,<5.16
- qwt <6.3.0
- spiceql =1.2.0
- spiceql =1.2.0=*_1
- sqlite >=3.46.0,<3.47
- suitesparse <7.7.0
- superlu
Expand Down Expand Up @@ -136,7 +136,7 @@ requirements:
- bz2file
- usgs-astrogeology::csm # [osx and arm64]
- csm # [not (osx and arm64)]
- cspice
- cspice=67=*_11
- curl
- eigen
- {{ pin_compatible('embree', min_pin='x.x', max_pin='x.x') }}
Expand Down