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

Geos 3.12 Update #5361

Merged
merged 9 commits into from
Dec 7, 2023
Merged

Geos 3.12 Update #5361

merged 9 commits into from
Dec 7, 2023

Conversation

acpaquette
Copy link
Collaborator

@acpaquette acpaquette commented Dec 5, 2023

Description

Second attempt at the geos 3.12 update. #5350 was reverted due to issue with build on mac. Embree2 shipped with a some version of tbb. Other dependencies on geos 3.12 needed tbb 2021.10.0. When that version of tbb would get installed it would clobber Embree2's version of tbb and result in missing symbols. This PR has everything from the other geos PR and includes the initial steps to update to embree3. All of the calls have been changed over but we have failing tests.

Related Issue

How Has This Been Validated?

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.

@jlaura jlaura mentioned this pull request Dec 5, 2023
@oleg-alexandrov
Copy link
Contributor

Good you folks updated embree. I ran into problems in the Mac with that one too before. Embree 2 was old.

@acpaquette
Copy link
Collaborator Author

@oleg-alexandrov Some of the initial changes, still working out the kinks

@acpaquette acpaquette merged commit 968dec6 into DOI-USGS:dev Dec 7, 2023
@acpaquette acpaquette mentioned this pull request Jan 12, 2024
12 tasks
chkim-usgs pushed a commit to chkim-usgs/ISIS3 that referenced this pull request Nov 26, 2024
* Geos changes from updating to 3.12

* Added missing float include

* Updated tests

* Cleaned up environment.yml

* Removed pdal dep

* Set geos dep to proper version

* Embree3 update

* Final changes to embree shape/target

* Use find package shipped with embree and link against embree target
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants