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

Convert cholmod 32 bit to 64 bit calls #5267

Merged
merged 4 commits into from
Aug 17, 2023

Conversation

AustinSanders
Copy link
Contributor

@AustinSanders AustinSanders commented Aug 16, 2023

Description

Convert cholmod 32 bit calls to 64 bit. Resolves errors related to jigsaw used for large networks

Related Issue

Fixes #5173 and Fixes #5176

How Has This Been Validated?

User testing

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Documentation change (update to the documentation; no code change)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Infrastructure change (changes to things like CI or the build system that do not impact users)

Checklist:

  • I have read and agree to abide by the Code of Conduct
  • I have read the CONTRIBUTING document.
  • My change requires a change to the documentation and I have updated the documentation accordingly.
  • I have added tests to cover my changes.
  • I have added myself to the .zenodo.json document.
  • I have added any user impacting changes to the CHANGELOG.md document.

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:

This work is free and unencumbered software released into the public domain. In jurisdictions that recognize copyright laws, the author or authors of this software dedicate any and all copyright interest in the software to the public domain.

  • I dedicate any and all copyright interest in this software to the public domain. I make this dedication for the benefit of the public at large and to the detriment of my heirs and successors. I intend this dedication to be an overt act of relinquishment in perpetuity of all present and future rights to this software under copyright law.

Copy link
Collaborator

@acpaquette acpaquette left a comment

Choose a reason for hiding this comment

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

Overall looks good! Just waiting for jenkins to come back. Could we add a fixes #5176 to the description?

@acpaquette acpaquette merged commit 3d77a87 into DOI-USGS:dev Aug 17, 2023
@github-actions github-actions bot added the bug Something isn't working label Aug 17, 2023
acpaquette pushed a commit to acpaquette/ISIS3 that referenced this pull request Aug 22, 2023
* Updated cholmod calls to 64 bit

* changed int triple indices to long

* Fixed errorpropagation cholmod call

* Updated changelog
acpaquette added a commit that referenced this pull request Aug 23, 2023
* Check if history blob buffer is null before executing memcpy (#5205)

* Check if history blob buffer is null before executing memcpy

* Updated CHANGELOG

* changed description for tgocassisrdrgen to be more descriptive than before (#5167)

* changed description for tgocassisrdrgen to be more descriptive than before.

* modifying the changelog to reflect doc changes

* fix typo

* Documentation fix for broken links in User Docs (#5182)

* doc changes for new links, need to scan other files for the same

* fixed remaining links

* typo

* fixed command line references link for ISIS3 Applications

* Removed version specification from conda install command (#5236)

* Clean Build Warnings (#5257)

* std::unary/binary_function to std:::function

* sprintf -> snprintf

* vsprintf -> vsnprintf

* fixed misc warnings

* bypass jenkins error

* Cmake mac 13 (#5261)

* added quotes to Utilities.cmake

* Added config for mac 13.4

* updated config to target macos13.5

* Segfault fix and tests (#5262)

* fixed map definition reference link (#5265)

* Update geos to 3.11.1 (#5266)

* Update geos to 3.11.1

* Fixed failing test

* fixes rclone recopying existing kernels (#5255)

* fixes rclone duplication

* updated changelog

* Updated script

* Addressed PR feedback

* cubeit attribute fix (#5268)

* cubeit attribute fix

* Update changelog

* Convert cholmod 32 bit to 64 bit calls (#5267)

* Updated cholmod calls to 64 bit

* changed int triple indices to long

* Fixed errorpropagation cholmod call

* Updated changelog

* Campt attribute fix (#5269)

* Prevent cube manager from setting the virtual band

* Pass potential cube attributes through to the cube manager in campt

* Added changelog entry

* Fixed change log entry

* Updated environment test

---------

Co-authored-by: Christine Kim <[email protected]>
Co-authored-by: Anton Hibl <[email protected]>
Co-authored-by: Austin Sanders <[email protected]>
Co-authored-by: Amy Stamile <[email protected]>
Co-authored-by: Jacob Cain <[email protected]>
acpaquette added a commit to acpaquette/ISIS3 that referenced this pull request Mar 29, 2024
* Check if history blob buffer is null before executing memcpy (DOI-USGS#5205)

* Check if history blob buffer is null before executing memcpy

* Updated CHANGELOG

* changed description for tgocassisrdrgen to be more descriptive than before (DOI-USGS#5167)

* changed description for tgocassisrdrgen to be more descriptive than before.

* modifying the changelog to reflect doc changes

* fix typo

* Documentation fix for broken links in User Docs (DOI-USGS#5182)

* doc changes for new links, need to scan other files for the same

* fixed remaining links

* typo

* fixed command line references link for ISIS3 Applications

* Removed version specification from conda install command (DOI-USGS#5236)

* Clean Build Warnings (DOI-USGS#5257)

* std::unary/binary_function to std:::function

* sprintf -> snprintf

* vsprintf -> vsnprintf

* fixed misc warnings

* bypass jenkins error

* Cmake mac 13 (DOI-USGS#5261)

* added quotes to Utilities.cmake

* Added config for mac 13.4

* updated config to target macos13.5

* Segfault fix and tests (DOI-USGS#5262)

* fixed map definition reference link (DOI-USGS#5265)

* Update geos to 3.11.1 (DOI-USGS#5266)

* Update geos to 3.11.1

* Fixed failing test

* fixes rclone recopying existing kernels (DOI-USGS#5255)

* fixes rclone duplication

* updated changelog

* Updated script

* Addressed PR feedback

* cubeit attribute fix (DOI-USGS#5268)

* cubeit attribute fix

* Update changelog

* Convert cholmod 32 bit to 64 bit calls (DOI-USGS#5267)

* Updated cholmod calls to 64 bit

* changed int triple indices to long

* Fixed errorpropagation cholmod call

* Updated changelog

* Campt attribute fix (DOI-USGS#5269)

* Prevent cube manager from setting the virtual band

* Pass potential cube attributes through to the cube manager in campt

* Added changelog entry

* Fixed change log entry

* Updated environment test

---------

Co-authored-by: Christine Kim <[email protected]>
Co-authored-by: Anton Hibl <[email protected]>
Co-authored-by: Austin Sanders <[email protected]>
Co-authored-by: Amy Stamile <[email protected]>
Co-authored-by: Jacob Cain <[email protected]>
acpaquette added a commit that referenced this pull request Mar 29, 2024
* Check if history blob buffer is null before executing memcpy (#5205)

* Check if history blob buffer is null before executing memcpy

* Updated CHANGELOG

* changed description for tgocassisrdrgen to be more descriptive than before (#5167)

* changed description for tgocassisrdrgen to be more descriptive than before.

* modifying the changelog to reflect doc changes

* fix typo

* Documentation fix for broken links in User Docs (#5182)

* doc changes for new links, need to scan other files for the same

* fixed remaining links

* typo

* fixed command line references link for ISIS3 Applications

* Removed version specification from conda install command (#5236)

* Clean Build Warnings (#5257)

* std::unary/binary_function to std:::function

* sprintf -> snprintf

* vsprintf -> vsnprintf

* fixed misc warnings

* bypass jenkins error

* Cmake mac 13 (#5261)

* added quotes to Utilities.cmake

* Added config for mac 13.4

* updated config to target macos13.5

* Segfault fix and tests (#5262)

* fixed map definition reference link (#5265)

* Update geos to 3.11.1 (#5266)

* Update geos to 3.11.1

* Fixed failing test

* fixes rclone recopying existing kernels (#5255)

* fixes rclone duplication

* updated changelog

* Updated script

* Addressed PR feedback

* cubeit attribute fix (#5268)

* cubeit attribute fix

* Update changelog

* Convert cholmod 32 bit to 64 bit calls (#5267)

* Updated cholmod calls to 64 bit

* changed int triple indices to long

* Fixed errorpropagation cholmod call

* Updated changelog

* Campt attribute fix (#5269)

* Prevent cube manager from setting the virtual band

* Pass potential cube attributes through to the cube manager in campt

* Added changelog entry

* Fixed change log entry

* Updated environment test

---------

Co-authored-by: Christine Kim <[email protected]>
Co-authored-by: Anton Hibl <[email protected]>
Co-authored-by: Austin Sanders <[email protected]>
Co-authored-by: Amy Stamile <[email protected]>
Co-authored-by: Jacob Cain <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Change jigsaw cholmod calls from 32bit to 64bit Jigsaw - fails for Kaguya TC for certain cases
2 participants