Skip to content

116 support all geometries gpu runner -- continued#129

Closed
jmaack24 wants to merge 121 commits into
optixCSP_mergefrom
116-support-all-geometries---gpu-runner
Closed

116 support all geometries gpu runner -- continued#129
jmaack24 wants to merge 121 commits into
optixCSP_mergefrom
116-support-all-geometries---gpu-runner

Conversation

@jmaack24

@jmaack24 jmaack24 commented Mar 30, 2026 •
edited
Loading

Copy link
Copy Markdown
Collaborator

Enable the following geometries within OptixRunner:

  • Flat Circle
  • Flat Hexagon
  • Flat Annulus
  • Parabola Circle
  • Parabola Hexagon
  • Parabola (general) Triangle
  • Parabola Annulus
  • Parabola Quadrilateral

If there is time, adding these would also be good

  • Cone Circle
  • Cone Hexagon
  • Cone (general) Triangle
  • Cone Rectangle
  • Cone Annulus
  • Cone Quadrilateral
  • Sphere Circle
  • Sphere Hexagon
  • Sphere (general) Triangle
  • Sphere Rectangle
  • Sphere Annulus
  • Sphere Quadrilateral

The following checklist for adding Surface/Aperture combination to the OptixRunner may be of use in the future. It is recommended to add the functions in the following order:

  1. Add needed OpticalEntityType (in OptixCSP/src/core/Soltrace.h)
  2. Add intersection function to IntersectionKernelMap in pipeline_manager.cpp
  3. Write intersection program (kernel) in intersection.cu. Function name must start with __intersection__ (note double underscores on both sides!!!)
  4. Add needed types and functions to GeometryDataST
  5. Add needed OptixCSP Aperture and Surface types in Aperture.h, Surface.h, and soltrace_type.h
  6. Add needed mapping to OpticalEntityType in GeometryManager::collect_geometry_info
  7. Add needed conversion code in CspElement::toDeviceGeometryData
  8. Add needed conversion code in OptixRunner::setup_elements
  9. Add some sort of test

nicholasbl and others added 30 commits January 22, 2026 14:15
@nicholasbl
First commit of port to GLM
38bb800
@nicholasbl
Passes tests, but is a bit slow
52258c4
@nicholasbl
Merge remote-tracking branch 'origin/develop' into dev_updates
b665288
@nicholasbl
Clean up from merge
c49c566
@nicholasbl
Fix more tests
41e3ac3
@nicholasbl
Performance and bugfix
d99f085
@nicholasbl
Remove old vec files and patch optix
2acc79f
@nicholasbl
Compile fixes for optix
20ffa4e
@nicholasbl
More detail for gcc issues
599c005
@nicholasbl
Uninitialized read in gcc
5f46881
@nicholasbl
Fix uninit and duration test
ef13831
@nicholasbl
Bump test timing. Another uninit.
09db2d4
@nicholasbl
Merge remote-tracking branch 'origin/develop' into dev_updates
10911e0
@nicholasbl
Update gitignore
6da668a
@nicholasbl
Multiple fixes to compile and execute
c8dbb15 
- Fix unconditional embree include
- Fix broken merge
- Update CI to remove Debug
@nicholasbl
Fix the helio tests to only run if embree is enabled
0edfd62 
Also, optimizations.
@nicholasbl
Improve embree test
02bb568 
This could still fail for very fast machines
@nicholasbl
Header fixes GCC
7cfbb2b
@nicholasbl
Timing for coverage
2bedb97
@nicholasbl
Wider bands for CI
68cdd49
@nicholasbl
Trying a fix for a weird coverage error
fcf8b59
@nicholasbl
Trying one more coverage fix
4ebee8d
@nicholasbl
Another tweak. If this fails, we move to ignore negatives
ecf2a3f
@nicholasbl
Ignore negatives for the moment
10f0cfa
@nicholasbl
Address review comments
6ec5c5a
@jmaack24
Merge pull request #101 from nicholasbl/dev_updates
0ab26d6 
Transition to GLM
@nicholasbl
Add ASAN to root CMake (#109)
521ac55 
* Add ASAN to root CMake

* Add message to verify ASAN is enabled

* Change the compiler check to only trigger on Clang
@jmaack24
Initial run at adding flat circle to OptixRunner
e59fc3b
@jmaack24
Add intersection function to pipeline manager map
fa3b64c
@jmaack24
Compile fixes
1aab1e1
jmaack24 and others added 28 commits May 19, 2026 08:57
@jmaack24
Merge branch 'develop' into 111-batch-running-features---gpu-runner
365d619
@jmaack24
Make geometry intersection testing for optix runner more robust
41c613d
@jmaack24
Fix dumb errors
e99b9d9
@jmaack24
Another dumb error...
6808cd6
@jmaack24
Fix hexagon aperture mistake
e1cddd7
@jmaack24
Address copilot review comments
8b2d78f
@jmaack24
Add option to enable/disable OptixRunner ray trimming; added test for…
4e7247a 
… it as well
@jmaack24
Fix some memory leaks in optix runner
08f6f8c
@jmaack24
Make automatic batch sizing more stable on multiple run calls
ae78f0f
@jmaack24
Remove outdated todos
1529f5b
@jmaack24
Move to 64-bit unsigned integers for global ray ids; more copilot rev…
aa686a3 
…iew fixes
@jmaack24
Limit max trace depth to 255 using 8-bit unsigned integer
e609f99
@jmaack24
Add ray generation tests for optix runner
ebb1e50
@jmaack24
Fix halton generation method; add warning for exceeding 32-bit uint m…
b347a6e 
…ax with max rays; add/remove tests
@jmaack24
Make max trace depth a user accesible parameter at the optix runner l…
bfdec00 
…evel
@jmaack24
Add tests for user setting max trace depth
df0f560
@jmaack24
Add test checking that max trace depth is observed during tracing
3cc88e7
@jmaack24
Add count of rays terminated due to max depth
663e142
@jmaack24
Add test for counting depth terminated rays; expose trace terminated …
1b53f8a 
…ray count through optix runner
@jmaack24
Attempt to fix occasional post compile optix runner seg fault; relax …
5f06f16 
…max trace depth count test
@jmaack24
Address copilot comments
5a63384
@jmaack24
One last copilot comment fix
874f4dd
@taylorbrown75
Fix macro conflict on windows
dac334b
@jmaack24
Merge pull request #142 from NLR-SolTrace/111-batch-running-features-…
d5a679d 
…--gpu-runner

111 batch running features   gpu runner
@qualand
Update CI badge URLs in README.md
9391195
@taylorbrown75
Add build instructions for optix runner. (#145)
c0b8d9e 
* Draft build instructions for optix runner.

* Fix type

* Rename optix runner in readme

* docs: normalize Linux distro capitalization in OptiX config list

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
@jmaack24
Account for rotation in hexagon-flat and annulus-flat geometries
cb6e6da
@jmaack24
Update tests for rotated elements
de9984c
@jmaack24

jmaack24 commented Jun 8, 2026

Copy link
Copy Markdown
Collaborator Author

OptixCSP_merge has been merged into develop. Closing this PR in favor of a new one targeting the develop branch.

@jmaack24 jmaack24 closed this Jun 8, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@jmaack24 @nicholasbl @qualand @taylorbrown75