Skip to content

Commit 1863d9e

Browse files
authored
refactor: remove obsolete OptiX PTX scratch files and stale sysrap test runners (#343)
This PR removes outdated OptiX/PTX scratch code and related stale test artifacts. ### CSGOptiX cleanup - remove the obsolete `CSGOptiX/Check.cu` debug/probe source - simplify `CSGOptiX/CMakeLists.txt` now that `CSGOptiX7.cu` is the only remaining OptiX PTX source - keep the PTX object/install wiring aligned with the single-source setup ### sysrap test cleanup - remove stale `SOPTIX_Module_test.{cc,sh}` and `SOPTIX_Pipeline_test.{cc,sh}` files - remove the obsolete `sysrap/tests/go.sh` runner and its `tests.txt` manifest - clean up leftover references in `sysrap/SOPTIX.rst` and `sysrap/SGLFW_Evt.h` ## Why `Check.cu` was an old standalone compiler/debug check and is no longer part of the active OptiX path. The removed `sysrap` test files were stale, not wired into the current CMake test flow, and still referenced outdated PTX naming/path conventions. Existing OptiX integration paths already exercise module/pipeline creation more realistically through current render/simulate flows.
1 parent a1578ac commit 1863d9e

10 files changed

Lines changed: 17 additions & 502 deletions

File tree

CSGOptiX/CMakeLists.txt

Lines changed: 14 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ set(name CSGOptiX)
33
find_package(OptiX 7 REQUIRED)
44

55
set(SOURCES)
6-
set(OPTIX_SOURCES)
6+
set(OPTIX_PTX_SRC CSGOptiX7.cu)
7+
set(OPTIX_PTX_TARGET CSGOptiX7_ptx)
78

89

910
list(APPEND SOURCES
@@ -25,33 +26,18 @@ list(APPEND HEADERS
2526
CSGOPTIX_LOG.hh
2627
)
2728

28-
list(APPEND OPTIX_SOURCES
29-
CSGOptiX7.cu
30-
Check.cu
31-
)
32-
33-
34-
message(STATUS "OPTIX_SOURCES : ${OPTIX_SOURCES} ")
35-
36-
set(_generated_PTX_files "")
37-
38-
foreach(cu_src IN LISTS OPTIX_SOURCES)
39-
message(STATUS "Processing ${cu_src}")
40-
add_library(${cu_src} OBJECT ${cu_src})
41-
set_target_properties(${cu_src} PROPERTIES CUDA_PTX_COMPILATION ON)
42-
target_include_directories(${cu_src} PUBLIC
43-
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/CSG>
44-
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/sysrap>
45-
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/qudarap>)
46-
target_compile_definitions(${cu_src} PUBLIC WITH_PRD WITH_SIMULATE WITH_SIMTRACE WITH_RENDER
47-
OPTICKS_CSGOPTIX WITH_THRUST OPTICKS_CSG WITH_CONTIGUOUS WITH_S_BB CONFIG_Debug OPTICKS_SYSRAP WITH_CHILD
48-
PLOG_LOCAL RNG_PHILOX DEBUG_TAG DEBUG_PIDX DEBUG_PIDXYZ OPTICKS_OKCONF OPTICKS_QUDARAP NVCC)
49-
target_link_libraries(${cu_src} PUBLIC OptiX::OptiX)
50-
51-
list(APPEND _generated_PTX_files "${cu_src}.ptx")
52-
endforeach()
29+
add_library(${OPTIX_PTX_TARGET} OBJECT ${OPTIX_PTX_SRC})
30+
set_target_properties(${OPTIX_PTX_TARGET} PROPERTIES CUDA_PTX_COMPILATION ON)
31+
target_include_directories(${OPTIX_PTX_TARGET} PUBLIC
32+
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/CSG>
33+
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/sysrap>
34+
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/qudarap>)
35+
target_compile_definitions(${OPTIX_PTX_TARGET} PUBLIC WITH_PRD WITH_SIMULATE WITH_SIMTRACE WITH_RENDER
36+
OPTICKS_CSGOPTIX WITH_THRUST OPTICKS_CSG WITH_CONTIGUOUS WITH_S_BB CONFIG_Debug OPTICKS_SYSRAP WITH_CHILD
37+
PLOG_LOCAL RNG_PHILOX DEBUG_TAG DEBUG_PIDX DEBUG_PIDXYZ OPTICKS_OKCONF OPTICKS_QUDARAP NVCC)
38+
target_link_libraries(${OPTIX_PTX_TARGET} PUBLIC OptiX::OptiX)
5339

54-
message(STATUS "_generated_PTX_files ${_generated_PTX_files}")
40+
message(STATUS "Configured PTX build for ${OPTIX_PTX_SRC}")
5541

5642
add_library( ${name} SHARED ${SOURCES} ${HEADERS} )
5743

@@ -84,7 +70,7 @@ target_include_directories( ${name} PUBLIC
8470

8571
target_link_libraries(${name} PUBLIC OptiX::OptiX CSG QUDARap SysRap gphox)
8672

87-
install(FILES $<TARGET_OBJECTS:CSGOptiX7.cu> DESTINATION ${CMAKE_INSTALL_LIBDIR})
73+
install(FILES $<TARGET_OBJECTS:${OPTIX_PTX_TARGET}> DESTINATION ${CMAKE_INSTALL_LIBDIR})
8874
install(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/${name})
8975

9076
install(TARGETS ${name}

CSGOptiX/Check.cu

Lines changed: 0 additions & 39 deletions
This file was deleted.

sysrap/SGLFW_Evt.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ and event rendering here.
1919
./sysrap/tests/SGLFW_SOPTIX_Scene_test.cc
2020
./sysrap/tests/SGLFW_Evt_test.cc
2121
./sysrap/tests/SGLFW_Evt_test.sh
22-
./sysrap/tests/tests.txt
2322
./sysrap/SGLFW_Evt.h
2423
2524
@@ -128,4 +127,3 @@ inline std::string SGLFW_Evt::desc() const
128127
return str ;
129128
}
130129

131-

sysrap/SOPTIX.rst

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ SOPTIX.rst : triangulated machinery
44
Overview
55
----------
66

7-
The SOPTIX,SCUDA,SMesh,SGLFW structs were developed to learn how to
7+
The SOPTIX, SCUDA, SMesh, SGLFW structs were developed to learn how to
88
implement a triangulated geometry workflow with the NVIDIA OptiX 7+ API
99
and also to implement interactive OpenGL rendering of the triangulated geometry.
1010

@@ -60,28 +60,18 @@ tests
6060
SGLFW_SOPTIX_Scene_test.{sh,cc}
6161
interactive raytrace visualization of triangulated geometry::
6262

63-
~/o/sysrap/tests/SGLFW_SOPTIX_Scene_test.sh
64-
63+
sysrap/tests/SGLFW_SOPTIX_Scene_test.sh
6564

6665
SOPTIX_Scene_test.{sh,cc} SOPTIX_Scene_Encapsulated_test.cc
6766
ppm non-interactive raytrace render of triangulated geometry
6867
both non-encapsulated and encapsulated versions can be built
6968
and run with the script::
7069
71-
~/o/sysrap/tests/SOPTIX_Scene_test.sh
72-
73-
74-
75-
SOPTIX_Module_test.{sh,cc}
76-
TODO: CHECK
70+
sysrap/tests/SOPTIX_Scene_test.sh
7771

7872
SOPTIX_Options_test.{sh,cc}
7973
TODO: CHECK
8074

81-
SOPTIX_Pipeline_test.{sh,cc}
82-
TODO: CHECK
83-
84-
8575

8676
SOPTIX_SBT::initHitgroup
8777
---------------------------
@@ -99,7 +89,3 @@ Need nested loop like CSGOptiX/SBT.cc SBT::createHitgroup::
9989
sub-SMesh
10090

10191
So need access to scene data to form the SBT
102-
103-
104-
105-

sysrap/tests/SOPTIX_Module_test.cc

Lines changed: 0 additions & 37 deletions
This file was deleted.

sysrap/tests/SOPTIX_Module_test.sh

Lines changed: 0 additions & 50 deletions
This file was deleted.

sysrap/tests/SOPTIX_Pipeline_test.cc

Lines changed: 0 additions & 39 deletions
This file was deleted.

sysrap/tests/SOPTIX_Pipeline_test.sh

Lines changed: 0 additions & 50 deletions
This file was deleted.

0 commit comments

Comments
 (0)