rayd 0.2.2__tar.gz → 0.3.0__tar.gz

{rayd-0.2.2 → rayd-0.3.0}/.github/constraints/drjit-build.txt

@@ -1,2 +1,2 @@
-drjit==1.2.0
+drjit==1.3.1
 nanobind==2.9.2

{rayd-0.2.2 → rayd-0.3.0}/.gitignore

@@ -22,4 +22,5 @@ unit_test/result/
 .slangtorch_cache/
 .rayd_slang_cache/
 tests/slang/test_interop_gen.cpp
-artifacts/
+artifacts/
+docs/

{rayd-0.2.2 → rayd-0.3.0}/CMakeLists.txt

@@ -12,6 +12,9 @@ option(RAYD_OPTIX_PRODUCTION_CONFIG "Use OptiX production module settings (LEVEL
 option(RAYD_NANOBIND_NOMINSIZE "Disable nanobind's size-oriented optimization flags in optimized configs." ON)
 option(RAYD_ENABLE_LTO "Enable nanobind/C++ link-time optimization." OFF)
 option(RAYD_REGENERATE_REFLECTION_TRACE_PTX "Regenerate reflection_trace PTX during the build. Requires OptiX SDK headers." OFF)
+option(RAYD_REGENERATE_REFLECTION_ACCUMULATION_PTX "Regenerate reflection_accumulation PTX during the build. Requires OptiX SDK headers." OFF)
+option(RAYD_REGENERATE_SEGMENT_VISIBILITY_PTX "Regenerate segment_visibility PTX during the build. Requires OptiX SDK headers." OFF)
+option(RAYD_REGENERATE_EDGE_OPTIX_PTX "Regenerate edge OptiX custom-AABB PTX during the build. Requires OptiX SDK headers." OFF)
 
 find_package(Python COMPONENTS Interpreter Development.Module REQUIRED)
 execute_process(
@@ -21,7 +24,7 @@ execute_process(
     OUTPUT_STRIP_TRAILING_WHITESPACE
 )
 if(NOT DRJIT_CMAKE_DIR_RESULT EQUAL 0)
-    message(FATAL_ERROR "Could not locate the installed Dr.Jit CMake package. Ensure drjit>=1.2.0 is installed in the build environment.")
+    message(FATAL_ERROR "Could not locate the installed Dr.Jit CMake package. Ensure drjit>=1.3.1 is installed in the build environment.")
 endif()
 
 execute_process(
@@ -112,10 +115,12 @@ set(RAYD_CORE_SOURCE_FILES
 
     ${RAYD_INCLUDE_DIR}/ray.h
     ${RAYD_INCLUDE_DIR}/intersection.h
-    ${RAYD_INCLUDE_DIR}/reflection.h
+    ${RAYD_INCLUDE_DIR}/multipath/reflection.h
+    ${RAYD_INCLUDE_DIR}/multipath/reflection_accumulation.h
+    ${RAYD_INCLUDE_DIR}/multipath/segment_visibility.h
     ${RAYD_INCLUDE_DIR}/transform.h
 
-    ${RAYD_INCLUDE_DIR}/edge.h
+    ${RAYD_INCLUDE_DIR}/edge/edge.h
 
     ${RAYD_INCLUDE_DIR}/mesh.h
     ${RAYD_SOURCE_DIR}/mesh.cpp
@@ -130,14 +135,20 @@ set(RAYD_CORE_SOURCE_FILES
     ${RAYD_SOURCE_DIR}/multipath/reflection_trace_host.h
     ${RAYD_SOURCE_DIR}/multipath/reflection_trace_params.h
     ${RAYD_SOURCE_DIR}/multipath/reflection_trace_host.cpp
+    ${RAYD_SOURCE_DIR}/multipath/reflection_accumulation_host.h
+    ${RAYD_SOURCE_DIR}/multipath/reflection_accumulation_params.h
+    ${RAYD_SOURCE_DIR}/multipath/reflection_accumulation_host.cpp
+    ${RAYD_SOURCE_DIR}/multipath/segment_visibility_host.h
+    ${RAYD_SOURCE_DIR}/multipath/segment_visibility_params.h
+    ${RAYD_SOURCE_DIR}/multipath/segment_visibility_host.cpp
     ${RAYD_SOURCE_DIR}/multipath/reflection_dedup.h
-    ${RAYD_INCLUDE_DIR}/scene/scene_edge.h
-    ${RAYD_SOURCE_DIR}/scene/scene_edge.cpp
-    ${RAYD_SOURCE_DIR}/scene/edge_bvh.h
-    ${RAYD_SOURCE_DIR}/scene/experimental/edge_bvh_ploc.h
-    ${RAYD_SOURCE_DIR}/scene/experimental/edge_bvh_ploc_build.inc
-    ${RAYD_SOURCE_DIR}/scene/experimental/edge_bvh_ploc_kernels.inc
-    ${RAYD_SOURCE_DIR}/scene/experimental/scene_edge_ploc.inc
+    ${RAYD_INCLUDE_DIR}/edge/scene_edge.h
+    ${RAYD_INCLUDE_DIR}/edge/scene_edge_optix.h
+    ${RAYD_SOURCE_DIR}/edge/scene_edge.cpp
+    ${RAYD_SOURCE_DIR}/edge/scene_edge_optix.cpp
+    ${RAYD_SOURCE_DIR}/edge/edge_bvh.h
+    ${RAYD_SOURCE_DIR}/edge/edge_bvh_config.h
+    ${RAYD_SOURCE_DIR}/edge/edge_optix_params.h
 
     ${RAYD_INCLUDE_DIR}/scene/scene.h
     ${RAYD_SOURCE_DIR}/scene/scene.cpp
@@ -158,18 +169,15 @@ if(WIN32)
 "@echo off\r\n\
 call \"${RAYD_VSDEVCMD}\" -arch=x64\r\n\
 if errorlevel 1 exit /b %errorlevel%\r\n\
-\"${CUDA_NVCC_EXECUTABLE}\" --extended-lambda -std=c++17 -c \"${CMAKE_CURRENT_SOURCE_DIR}/${RAYD_SOURCE_DIR}/scene/edge_bvh.cu\" ${RAYD_CUDA_INCLUDE_FLAGS} ${RAYD_CUDA_DEFINITIONS} -Xcompiler \"/MD /O2 /EHsc /wd4819\" -o \"${RAYD_CUDA_OBJECT}\"\r\n\
+\"${CUDA_NVCC_EXECUTABLE}\" --extended-lambda -std=c++17 -c \"${CMAKE_CURRENT_SOURCE_DIR}/${RAYD_SOURCE_DIR}/edge/edge_bvh.cu\" ${RAYD_CUDA_INCLUDE_FLAGS} ${RAYD_CUDA_DEFINITIONS} -Xcompiler \"/MD /O2 /EHsc /wd4819\" -o \"${RAYD_CUDA_OBJECT}\"\r\n\
 ")
     add_custom_command(
         OUTPUT "${RAYD_CUDA_OBJECT}"
         COMMAND "${RAYD_CUDA_BUILD_SCRIPT}"
         DEPENDS
             "${RAYD_CUDA_BUILD_SCRIPT}"
-            "${CMAKE_CURRENT_SOURCE_DIR}/${RAYD_SOURCE_DIR}/scene/edge_bvh.cu"
-            "${CMAKE_CURRENT_SOURCE_DIR}/${RAYD_SOURCE_DIR}/scene/edge_bvh.h"
-            "${CMAKE_CURRENT_SOURCE_DIR}/${RAYD_SOURCE_DIR}/scene/experimental/edge_bvh_ploc.h"
-            "${CMAKE_CURRENT_SOURCE_DIR}/${RAYD_SOURCE_DIR}/scene/experimental/edge_bvh_ploc_build.inc"
-            "${CMAKE_CURRENT_SOURCE_DIR}/${RAYD_SOURCE_DIR}/scene/experimental/edge_bvh_ploc_kernels.inc"
+            "${CMAKE_CURRENT_SOURCE_DIR}/${RAYD_SOURCE_DIR}/edge/edge_bvh.cu"
+            "${CMAKE_CURRENT_SOURCE_DIR}/${RAYD_SOURCE_DIR}/edge/edge_bvh.h"
         VERBATIM
     )
 else()
@@ -177,16 +185,13 @@ else()
     add_custom_command(
         OUTPUT "${RAYD_CUDA_OBJECT}"
         COMMAND "${CUDA_NVCC_EXECUTABLE}" -ccbin "${CMAKE_CXX_COMPILER}" -std=c++17 -Xcompiler=-fPIC -c
-                "${CMAKE_CURRENT_SOURCE_DIR}/${RAYD_SOURCE_DIR}/scene/edge_bvh.cu"
+                "${CMAKE_CURRENT_SOURCE_DIR}/${RAYD_SOURCE_DIR}/edge/edge_bvh.cu"
                 ${RAYD_CUDA_INCLUDE_FLAGS_LIST}
                 ${RAYD_CUDA_DEFINITIONS_LIST}
                 -o "${RAYD_CUDA_OBJECT}"
         DEPENDS
-            "${CMAKE_CURRENT_SOURCE_DIR}/${RAYD_SOURCE_DIR}/scene/edge_bvh.cu"
-            "${CMAKE_CURRENT_SOURCE_DIR}/${RAYD_SOURCE_DIR}/scene/edge_bvh.h"
-            "${CMAKE_CURRENT_SOURCE_DIR}/${RAYD_SOURCE_DIR}/scene/experimental/edge_bvh_ploc.h"
-            "${CMAKE_CURRENT_SOURCE_DIR}/${RAYD_SOURCE_DIR}/scene/experimental/edge_bvh_ploc_build.inc"
-            "${CMAKE_CURRENT_SOURCE_DIR}/${RAYD_SOURCE_DIR}/scene/experimental/edge_bvh_ploc_kernels.inc"
+            "${CMAKE_CURRENT_SOURCE_DIR}/${RAYD_SOURCE_DIR}/edge/edge_bvh.cu"
+            "${CMAKE_CURRENT_SOURCE_DIR}/${RAYD_SOURCE_DIR}/edge/edge_bvh.h"
         VERBATIM
     )
 endif()
@@ -315,6 +320,261 @@ else()
     list(APPEND RAYD_CORE_SOURCE_FILES "${RAYD_REFLECTION_TRACE_PTX_H_COMMITTED}")
 endif()
 
+set(RAYD_REFLECTION_ACCUMULATION_CU "${CMAKE_CURRENT_SOURCE_DIR}/${RAYD_SOURCE_DIR}/multipath/reflection_accumulation.cu")
+set(RAYD_REFLECTION_ACCUMULATION_PTX_H "${CMAKE_CURRENT_BINARY_DIR}/reflection_accumulation_ptx.h")
+set(RAYD_REFLECTION_ACCUMULATION_PTX_H_COMMITTED
+    "${CMAKE_CURRENT_SOURCE_DIR}/${RAYD_SOURCE_DIR}/multipath/reflection_accumulation_ptx.h")
+
+if(RAYD_REGENERATE_REFLECTION_ACCUMULATION_PTX)
+    find_path(OPTIX_INCLUDE_DIR optix.h
+        HINTS
+            ENV OPTIX_INCLUDE_DIR
+            ENV OPTIX_PATH
+            "$ENV{PROGRAMDATA}/NVIDIA Corporation/OptiX SDK 9.1.0"
+            "$ENV{PROGRAMDATA}/NVIDIA Corporation/OptiX SDK 8.1.0"
+            "$ENV{PROGRAMDATA}/NVIDIA Corporation/OptiX SDK 8.0.0"
+            "/usr/local/NVIDIA-OptiX-SDK-9.1.0-linux64-x86_64"
+            "/usr/local/NVIDIA-OptiX-SDK-8.1.0-linux64-x86_64"
+            "/usr/local/NVIDIA-OptiX-SDK-8.0.0-linux64-x86_64"
+            "/opt/NVIDIA-OptiX-SDK-9.1.0-linux64-x86_64"
+            "/opt/NVIDIA-OptiX-SDK-8.1.0-linux64-x86_64"
+            "/opt/NVIDIA-OptiX-SDK-8.0.0-linux64-x86_64"
+        PATH_SUFFIXES include
+    )
+    if(NOT OPTIX_INCLUDE_DIR)
+        message(FATAL_ERROR
+            "Could not locate OptiX SDK headers needed to regenerate reflection_accumulation PTX. "
+            "Set OPTIX_INCLUDE_DIR or OPTIX_PATH, or disable RAYD_REGENERATE_REFLECTION_ACCUMULATION_PTX.")
+    endif()
+
+    set(RAYD_REFLECTION_ACCUMULATION_PTX "${CMAKE_CURRENT_BINARY_DIR}/reflection_accumulation.ptx")
+    if(WIN32)
+        set(RAYD_REFLECTION_ACCUMULATION_BUILD_SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/build_reflection_accumulation_ptx.bat")
+        file(GENERATE OUTPUT "${RAYD_REFLECTION_ACCUMULATION_BUILD_SCRIPT}" CONTENT
+"@echo off\r\n\
+call \"${RAYD_VSDEVCMD}\" -arch=x64\r\n\
+if errorlevel 1 exit /b %errorlevel%\r\n\
+\"${CUDA_NVCC_EXECUTABLE}\" -ptx --use_fast_math -std=c++17 -arch=compute_70 \"${RAYD_REFLECTION_ACCUMULATION_CU}\" -I\"${OPTIX_INCLUDE_DIR}\" ${RAYD_CUDA_INCLUDE_FLAGS} ${RAYD_CUDA_DEFINITIONS} -o \"${RAYD_REFLECTION_ACCUMULATION_PTX}\"\r\n\
+")
+        add_custom_command(
+            OUTPUT "${RAYD_REFLECTION_ACCUMULATION_PTX}"
+            COMMAND "${RAYD_REFLECTION_ACCUMULATION_BUILD_SCRIPT}"
+            DEPENDS
+                "${RAYD_REFLECTION_ACCUMULATION_BUILD_SCRIPT}"
+                "${RAYD_REFLECTION_ACCUMULATION_CU}"
+                "${CMAKE_CURRENT_SOURCE_DIR}/${RAYD_SOURCE_DIR}/multipath/reflection_accumulation_params.h"
+            VERBATIM
+        )
+    else()
+        add_custom_command(
+            OUTPUT "${RAYD_REFLECTION_ACCUMULATION_PTX}"
+            COMMAND "${CUDA_NVCC_EXECUTABLE}" -ptx --use_fast_math -std=c++17 -arch=compute_70
+                    "${RAYD_REFLECTION_ACCUMULATION_CU}"
+                    -I"${OPTIX_INCLUDE_DIR}"
+                    ${RAYD_CUDA_INCLUDE_FLAGS_LIST}
+                    ${RAYD_CUDA_DEFINITIONS_LIST}
+                    -o "${RAYD_REFLECTION_ACCUMULATION_PTX}"
+            DEPENDS
+                "${RAYD_REFLECTION_ACCUMULATION_CU}"
+                "${CMAKE_CURRENT_SOURCE_DIR}/${RAYD_SOURCE_DIR}/multipath/reflection_accumulation_params.h"
+            VERBATIM
+        )
+    endif()
+
+    add_custom_command(
+        OUTPUT "${RAYD_REFLECTION_ACCUMULATION_PTX_H}"
+        COMMAND ${CMAKE_COMMAND}
+            -DPTX_FILE=${RAYD_REFLECTION_ACCUMULATION_PTX}
+            -DOUTPUT_FILE=${RAYD_REFLECTION_ACCUMULATION_PTX_H}
+            -DVAR_NAME=reflection_accumulation_ptx
+            -P "${CMAKE_CURRENT_SOURCE_DIR}/cmake/embed_ptx.cmake"
+        DEPENDS
+            "${RAYD_REFLECTION_ACCUMULATION_PTX}"
+            "${CMAKE_CURRENT_SOURCE_DIR}/cmake/embed_ptx.cmake"
+        VERBATIM
+    )
+    set_source_files_properties("${RAYD_REFLECTION_ACCUMULATION_PTX_H}" PROPERTIES GENERATED TRUE)
+    list(APPEND RAYD_CORE_SOURCE_FILES "${RAYD_REFLECTION_ACCUMULATION_PTX_H}")
+else()
+    if(NOT EXISTS "${RAYD_REFLECTION_ACCUMULATION_PTX_H_COMMITTED}")
+        message(FATAL_ERROR
+            "Missing committed reflection_accumulation PTX header at "
+            "${RAYD_REFLECTION_ACCUMULATION_PTX_H_COMMITTED}. "
+            "Restore it or enable RAYD_REGENERATE_REFLECTION_ACCUMULATION_PTX with OptiX SDK headers available.")
+    endif()
+    list(APPEND RAYD_CORE_SOURCE_FILES "${RAYD_REFLECTION_ACCUMULATION_PTX_H_COMMITTED}")
+endif()
+
+set(RAYD_SEGMENT_VISIBILITY_CU "${CMAKE_CURRENT_SOURCE_DIR}/${RAYD_SOURCE_DIR}/multipath/segment_visibility.cu")
+set(RAYD_SEGMENT_VISIBILITY_PTX_H "${CMAKE_CURRENT_BINARY_DIR}/segment_visibility_ptx.h")
+set(RAYD_SEGMENT_VISIBILITY_PTX_H_COMMITTED
+    "${CMAKE_CURRENT_SOURCE_DIR}/${RAYD_SOURCE_DIR}/multipath/segment_visibility_ptx.h")
+
+if(RAYD_REGENERATE_SEGMENT_VISIBILITY_PTX)
+    find_path(OPTIX_INCLUDE_DIR optix.h
+        HINTS
+            ENV OPTIX_INCLUDE_DIR
+            ENV OPTIX_PATH
+            "$ENV{PROGRAMDATA}/NVIDIA Corporation/OptiX SDK 9.1.0"
+            "$ENV{PROGRAMDATA}/NVIDIA Corporation/OptiX SDK 8.1.0"
+            "$ENV{PROGRAMDATA}/NVIDIA Corporation/OptiX SDK 8.0.0"
+            "/usr/local/NVIDIA-OptiX-SDK-9.1.0-linux64-x86_64"
+            "/usr/local/NVIDIA-OptiX-SDK-8.1.0-linux64-x86_64"
+            "/usr/local/NVIDIA-OptiX-SDK-8.0.0-linux64-x86_64"
+            "/opt/NVIDIA-OptiX-SDK-9.1.0-linux64-x86_64"
+            "/opt/NVIDIA-OptiX-SDK-8.1.0-linux64-x86_64"
+            "/opt/NVIDIA-OptiX-SDK-8.0.0-linux64-x86_64"
+        PATH_SUFFIXES include
+    )
+    if(NOT OPTIX_INCLUDE_DIR)
+        message(FATAL_ERROR
+            "Could not locate OptiX SDK headers needed to regenerate segment_visibility PTX. "
+            "Set OPTIX_INCLUDE_DIR or OPTIX_PATH, or disable RAYD_REGENERATE_SEGMENT_VISIBILITY_PTX.")
+    endif()
+
+    set(RAYD_SEGMENT_VISIBILITY_PTX "${CMAKE_CURRENT_BINARY_DIR}/segment_visibility.ptx")
+    if(WIN32)
+        set(RAYD_SEGMENT_VISIBILITY_BUILD_SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/build_segment_visibility_ptx.bat")
+        file(GENERATE OUTPUT "${RAYD_SEGMENT_VISIBILITY_BUILD_SCRIPT}" CONTENT
+"@echo off\r\n\
+call \"${RAYD_VSDEVCMD}\" -arch=x64\r\n\
+if errorlevel 1 exit /b %errorlevel%\r\n\
+\"${CUDA_NVCC_EXECUTABLE}\" -ptx --use_fast_math -std=c++17 -arch=compute_70 \"${RAYD_SEGMENT_VISIBILITY_CU}\" -I\"${OPTIX_INCLUDE_DIR}\" ${RAYD_CUDA_INCLUDE_FLAGS} ${RAYD_CUDA_DEFINITIONS} -o \"${RAYD_SEGMENT_VISIBILITY_PTX}\"\r\n\
+")
+        add_custom_command(
+            OUTPUT "${RAYD_SEGMENT_VISIBILITY_PTX}"
+            COMMAND "${RAYD_SEGMENT_VISIBILITY_BUILD_SCRIPT}"
+            DEPENDS
+                "${RAYD_SEGMENT_VISIBILITY_BUILD_SCRIPT}"
+                "${RAYD_SEGMENT_VISIBILITY_CU}"
+                "${CMAKE_CURRENT_SOURCE_DIR}/${RAYD_SOURCE_DIR}/multipath/segment_visibility_params.h"
+            VERBATIM
+        )
+    else()
+        add_custom_command(
+            OUTPUT "${RAYD_SEGMENT_VISIBILITY_PTX}"
+            COMMAND "${CUDA_NVCC_EXECUTABLE}" -ptx --use_fast_math -std=c++17 -arch=compute_70
+                    "${RAYD_SEGMENT_VISIBILITY_CU}"
+                    -I"${OPTIX_INCLUDE_DIR}"
+                    ${RAYD_CUDA_INCLUDE_FLAGS_LIST}
+                    ${RAYD_CUDA_DEFINITIONS_LIST}
+                    -o "${RAYD_SEGMENT_VISIBILITY_PTX}"
+            DEPENDS
+                "${RAYD_SEGMENT_VISIBILITY_CU}"
+                "${CMAKE_CURRENT_SOURCE_DIR}/${RAYD_SOURCE_DIR}/multipath/segment_visibility_params.h"
+            VERBATIM
+        )
+    endif()
+
+    add_custom_command(
+        OUTPUT "${RAYD_SEGMENT_VISIBILITY_PTX_H}"
+        COMMAND ${CMAKE_COMMAND}
+            -DPTX_FILE=${RAYD_SEGMENT_VISIBILITY_PTX}
+            -DOUTPUT_FILE=${RAYD_SEGMENT_VISIBILITY_PTX_H}
+            -DVAR_NAME=segment_visibility_ptx
+            -P "${CMAKE_CURRENT_SOURCE_DIR}/cmake/embed_ptx.cmake"
+        DEPENDS
+            "${RAYD_SEGMENT_VISIBILITY_PTX}"
+            "${CMAKE_CURRENT_SOURCE_DIR}/cmake/embed_ptx.cmake"
+        VERBATIM
+    )
+    set_source_files_properties("${RAYD_SEGMENT_VISIBILITY_PTX_H}" PROPERTIES GENERATED TRUE)
+    list(APPEND RAYD_CORE_SOURCE_FILES "${RAYD_SEGMENT_VISIBILITY_PTX_H}")
+else()
+    if(NOT EXISTS "${RAYD_SEGMENT_VISIBILITY_PTX_H_COMMITTED}")
+        message(FATAL_ERROR
+            "Missing committed segment_visibility PTX header at "
+            "${RAYD_SEGMENT_VISIBILITY_PTX_H_COMMITTED}. "
+            "Restore it or enable RAYD_REGENERATE_SEGMENT_VISIBILITY_PTX with OptiX SDK headers available.")
+    endif()
+    list(APPEND RAYD_CORE_SOURCE_FILES "${RAYD_SEGMENT_VISIBILITY_PTX_H_COMMITTED}")
+endif()
+
+set(RAYD_EDGE_OPTIX_CU "${CMAKE_CURRENT_SOURCE_DIR}/${RAYD_SOURCE_DIR}/edge/edge_optix.cu")
+set(RAYD_EDGE_OPTIX_PTX_H "${CMAKE_CURRENT_BINARY_DIR}/edge_optix_ptx.h")
+set(RAYD_EDGE_OPTIX_PTX_H_COMMITTED
+    "${CMAKE_CURRENT_SOURCE_DIR}/${RAYD_SOURCE_DIR}/edge/edge_optix_ptx.h")
+
+if(RAYD_REGENERATE_EDGE_OPTIX_PTX)
+    find_path(OPTIX_INCLUDE_DIR optix.h
+        HINTS
+            ENV OPTIX_INCLUDE_DIR
+            ENV OPTIX_PATH
+            "$ENV{PROGRAMDATA}/NVIDIA Corporation/OptiX SDK 9.1.0"
+            "$ENV{PROGRAMDATA}/NVIDIA Corporation/OptiX SDK 8.1.0"
+            "$ENV{PROGRAMDATA}/NVIDIA Corporation/OptiX SDK 8.0.0"
+            "/usr/local/NVIDIA-OptiX-SDK-9.1.0-linux64-x86_64"
+            "/usr/local/NVIDIA-OptiX-SDK-8.1.0-linux64-x86_64"
+            "/usr/local/NVIDIA-OptiX-SDK-8.0.0-linux64-x86_64"
+            "/opt/NVIDIA-OptiX-SDK-9.1.0-linux64-x86_64"
+            "/opt/NVIDIA-OptiX-SDK-8.1.0-linux64-x86_64"
+            "/opt/NVIDIA-OptiX-SDK-8.0.0-linux64-x86_64"
+        PATH_SUFFIXES include
+    )
+    if(NOT OPTIX_INCLUDE_DIR)
+        message(FATAL_ERROR
+            "Could not locate OptiX SDK headers needed to regenerate edge_optix PTX. "
+            "Set OPTIX_INCLUDE_DIR or OPTIX_PATH, or disable RAYD_REGENERATE_EDGE_OPTIX_PTX.")
+    endif()
+
+    set(RAYD_EDGE_OPTIX_PTX "${CMAKE_CURRENT_BINARY_DIR}/edge_optix.ptx")
+    if(WIN32)
+        set(RAYD_EDGE_OPTIX_BUILD_SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/build_edge_optix_ptx.bat")
+        file(GENERATE OUTPUT "${RAYD_EDGE_OPTIX_BUILD_SCRIPT}" CONTENT
+"@echo off\r\n\
+call \"${RAYD_VSDEVCMD}\" -arch=x64\r\n\
+if errorlevel 1 exit /b %errorlevel%\r\n\
+\"${CUDA_NVCC_EXECUTABLE}\" -ptx --use_fast_math -std=c++17 -arch=compute_70 \"${RAYD_EDGE_OPTIX_CU}\" -I\"${OPTIX_INCLUDE_DIR}\" ${RAYD_CUDA_INCLUDE_FLAGS} ${RAYD_CUDA_DEFINITIONS} -o \"${RAYD_EDGE_OPTIX_PTX}\"\r\n\
+")
+        add_custom_command(
+            OUTPUT "${RAYD_EDGE_OPTIX_PTX}"
+            COMMAND "${RAYD_EDGE_OPTIX_BUILD_SCRIPT}"
+            DEPENDS
+                "${RAYD_EDGE_OPTIX_BUILD_SCRIPT}"
+                "${RAYD_EDGE_OPTIX_CU}"
+                "${CMAKE_CURRENT_SOURCE_DIR}/${RAYD_SOURCE_DIR}/edge/edge_optix_params.h"
+            VERBATIM
+        )
+    else()
+        add_custom_command(
+            OUTPUT "${RAYD_EDGE_OPTIX_PTX}"
+            COMMAND "${CUDA_NVCC_EXECUTABLE}" -ptx --use_fast_math -std=c++17 -arch=compute_70
+                    "${RAYD_EDGE_OPTIX_CU}"
+                    -I"${OPTIX_INCLUDE_DIR}"
+                    ${RAYD_CUDA_INCLUDE_FLAGS_LIST}
+                    ${RAYD_CUDA_DEFINITIONS_LIST}
+                    -o "${RAYD_EDGE_OPTIX_PTX}"
+            DEPENDS
+                "${RAYD_EDGE_OPTIX_CU}"
+                "${CMAKE_CURRENT_SOURCE_DIR}/${RAYD_SOURCE_DIR}/edge/edge_optix_params.h"
+            VERBATIM
+        )
+    endif()
+
+    add_custom_command(
+        OUTPUT "${RAYD_EDGE_OPTIX_PTX_H}"
+        COMMAND ${CMAKE_COMMAND}
+            -DPTX_FILE=${RAYD_EDGE_OPTIX_PTX}
+            -DOUTPUT_FILE=${RAYD_EDGE_OPTIX_PTX_H}
+            -DVAR_NAME=edge_optix_ptx
+            -P "${CMAKE_CURRENT_SOURCE_DIR}/cmake/embed_ptx.cmake"
+        DEPENDS
+            "${RAYD_EDGE_OPTIX_PTX}"
+            "${CMAKE_CURRENT_SOURCE_DIR}/cmake/embed_ptx.cmake"
+        VERBATIM
+    )
+    set_source_files_properties("${RAYD_EDGE_OPTIX_PTX_H}" PROPERTIES GENERATED TRUE)
+    list(APPEND RAYD_CORE_SOURCE_FILES "${RAYD_EDGE_OPTIX_PTX_H}")
+else()
+    if(NOT EXISTS "${RAYD_EDGE_OPTIX_PTX_H_COMMITTED}")
+        message(FATAL_ERROR
+            "Missing committed edge_optix PTX header at "
+            "${RAYD_EDGE_OPTIX_PTX_H_COMMITTED}. "
+            "Restore it or enable RAYD_REGENERATE_EDGE_OPTIX_PTX with OptiX SDK headers available.")
+    endif()
+    list(APPEND RAYD_CORE_SOURCE_FILES "${RAYD_EDGE_OPTIX_PTX_H_COMMITTED}")
+endif()
+
 set(RAYD_NANOBIND_ARGS NB_DOMAIN drjit)
 if(RAYD_NANOBIND_NOMINSIZE)
     list(APPEND RAYD_NANOBIND_ARGS NOMINSIZE)

{rayd-0.2.2 → rayd-0.3.0}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.2
 Name: rayd
-Version: 0.2.2
+Version: 0.3.0
 Summary: RayD: minimalist differentiable ray tracing package wrapping Dr.Jit and OptiX.
 Author-Email: Xingyu Chen <xic063@ucsd.edu>
 License: BSD-3-Clause
 Requires-Python: >=3.10
-Requires-Dist: drjit==1.2.0
+Requires-Dist: drjit==1.3.1
 Provides-Extra: torch
 Requires-Dist: torch; extra == "torch"
 Description-Content-Type: text/markdown
@@ -285,7 +285,7 @@ In other words, RayD is not limited to triangle hits. It also gives you direct a
 
 RayD is a Python package with a C++/CUDA extension.
 
-You need Python `>=3.10`, CUDA Toolkit `>=11.0`, CMake, a C++17 compiler, `drjit>=1.2.0`, `nanobind==2.9.2`, and `scikit-build-core`.
+You need Python `>=3.10`, CUDA Toolkit `>=11.0`, CMake, a C++17 compiler, `drjit>=1.3.1`, `nanobind==2.9.2`, and `scikit-build-core`.
 
 On Windows, use Visual Studio 2022 with Desktop C++ tools. On Linux, use GCC or Clang with C++17 support.
 
@@ -296,7 +296,7 @@ conda create -n myenv python=3.10 -y
 conda activate myenv
 python -m pip install -U pip setuptools wheel
 python -m pip install cmake scikit-build-core nanobind==2.9.2
-python -m pip install "drjit>=1.2.0"
+python -m pip install "drjit>=1.3.1"
 ```
 
 ### Install
@@ -311,7 +311,7 @@ python -m pip install .
 RayD depends on:
 
 - Python `3.10+`
-- Dr.Jit `1.2.0+`
+- Dr.Jit `1.3.1+`
 - OptiX `8+`
 
 RayD does not include:

{rayd-0.2.2 → rayd-0.3.0}/README.md

@@ -273,7 +273,7 @@ In other words, RayD is not limited to triangle hits. It also gives you direct a
 
 RayD is a Python package with a C++/CUDA extension.
 
-You need Python `>=3.10`, CUDA Toolkit `>=11.0`, CMake, a C++17 compiler, `drjit>=1.2.0`, `nanobind==2.9.2`, and `scikit-build-core`.
+You need Python `>=3.10`, CUDA Toolkit `>=11.0`, CMake, a C++17 compiler, `drjit>=1.3.1`, `nanobind==2.9.2`, and `scikit-build-core`.
 
 On Windows, use Visual Studio 2022 with Desktop C++ tools. On Linux, use GCC or Clang with C++17 support.
 
@@ -284,7 +284,7 @@ conda create -n myenv python=3.10 -y
 conda activate myenv
 python -m pip install -U pip setuptools wheel
 python -m pip install cmake scikit-build-core nanobind==2.9.2
-python -m pip install "drjit>=1.2.0"
+python -m pip install "drjit>=1.3.1"
 ```
 
 ### Install
@@ -299,7 +299,7 @@ python -m pip install .
 RayD depends on:
 
 - Python `3.10+`
-- Dr.Jit `1.2.0+`
+- Dr.Jit `1.3.1+`
 - OptiX `8+`
 
 RayD does not include:

rayd-0.3.0/cmake/embed_ptx.cmake

@@ -0,0 +1,27 @@
+file(READ "${PTX_FILE}" PTX_CONTENT)
+string(LENGTH "${PTX_CONTENT}" PTX_SIZE)
+file(WRITE "${OUTPUT_FILE}"
+    "// Auto-generated. Do not edit.\n"
+    "#pragma once\n"
+    "#include <cstddef>\n"
+    "static const char ${VAR_NAME}[] =\n"
+)
+
+set(PTX_CHUNK_SIZE 16000)
+set(PTX_OFFSET 0)
+while(PTX_OFFSET LESS PTX_SIZE)
+    math(EXPR PTX_REMAINING "${PTX_SIZE} - ${PTX_OFFSET}")
+    if(PTX_REMAINING GREATER PTX_CHUNK_SIZE)
+        set(PTX_CURRENT_CHUNK_SIZE ${PTX_CHUNK_SIZE})
+    else()
+        set(PTX_CURRENT_CHUNK_SIZE ${PTX_REMAINING})
+    endif()
+    string(SUBSTRING "${PTX_CONTENT}" ${PTX_OFFSET} ${PTX_CURRENT_CHUNK_SIZE} PTX_CHUNK)
+    file(APPEND "${OUTPUT_FILE}" "R\"PTX_CHUNK(${PTX_CHUNK})PTX_CHUNK\"\n")
+    math(EXPR PTX_OFFSET "${PTX_OFFSET} + ${PTX_CURRENT_CHUNK_SIZE}")
+endwhile()
+
+file(APPEND "${OUTPUT_FILE}"
+    ";\n"
+    "static const size_t ${VAR_NAME}_size = ${PTX_SIZE};\n"
+)

{rayd-0.2.2 → rayd-0.3.0}/include/rayd/camera.h

@@ -3,7 +3,7 @@
 #include <utility>
 
 #include <rayd/rayd.h>
-#include <rayd/edge.h>
+#include <rayd/edge/edge.h>
 #include <drjit/tensor.h>
 #include <drjit/math.h>
 #include <drjit/util.h>

{rayd-0.2.2/include/rayd → rayd-0.3.0/include/rayd/edge}/edge.h

@@ -83,6 +83,45 @@ using NearestRayEdgeT = NearestRayEdgeData<FloatT<Detached>>;
 using NearestRayEdge = NearestRayEdgeT<false>;
 using NearestRayEdgeDetached = NearestRayEdgeT<true>;
 
+template <typename Float_>
+struct NearestEdgesTopKData {
+    static constexpr bool IsDetached = std::is_same_v<Float_, FloatDetached>;
+
+    using Mask_ = std::conditional_t<IsDetached, MaskDetached, Mask>;
+    using Vec3f = std::conditional_t<IsDetached, Vector3fDetached, Vector3f>;
+    using Int_ = std::conditional_t<IsDetached, IntDetached, Int>;
+
+    int query_count = 0;
+    int k = 0;
+
+    Mask_ is_valid = full<Mask_>(false, 1);
+    Float_ distances = full<Float_>(Infinity, 1);
+    Vec3f points = zeros<Vec3f>(1);
+    Float_ edge_t = zeros<Float_>(1);
+    Vec3f edge_points = zeros<Vec3f>(1);
+    Int_ shape_ids = full<Int_>(-1, 1);
+    Int_ edge_ids = full<Int_>(-1, 1);
+    Int_ global_edge_ids = full<Int_>(-1, 1);
+    Mask_ is_boundary = full<Mask_>(false, 1);
+
+    DRJIT_STRUCT(NearestEdgesTopKData,
+                 is_valid,
+                 distances,
+                 points,
+                 edge_t,
+                 edge_points,
+                 shape_ids,
+                 edge_ids,
+                 global_edge_ids,
+                 is_boundary)
+};
+
+template <bool Detached>
+using NearestEdgesTopKT = NearestEdgesTopKData<FloatT<Detached>>;
+
+using NearestEdgesTopK = NearestEdgesTopKT<false>;
+using NearestEdgesTopKDetached = NearestEdgesTopKT<true>;
+
 /// Primary-edge sample returned by image-space edge sampling.
 struct PrimaryEdgeSample {
     Float x_dot_n;
@@ -173,24 +212,32 @@ struct SceneEdgeInfo {
 struct SceneEdgeTopology {
     IntDetached v0;
     IntDetached v1;
+    IntDetached v0_global;
+    IntDetached v1_global;
     IntDetached face0_local;
     IntDetached face1_local;
     IntDetached face0_global;
     IntDetached face1_global;
     IntDetached opposite_vertex0;
     IntDetached opposite_vertex1;
+    IntDetached opposite_vertex0_global;
+    IntDetached opposite_vertex1_global;
 
     int size() const { return v0.size(); }
 
     DRJIT_STRUCT(SceneEdgeTopology,
                  v0,
                  v1,
+                 v0_global,
+                 v1_global,
                  face0_local,
                  face1_local,
                  face0_global,
                  face1_global,
                  opposite_vertex0,
-                 opposite_vertex1)
+                 opposite_vertex1,
+                 opposite_vertex0_global,
+                 opposite_vertex1_global)
 };
 
 } // namespace rayd

{rayd-0.2.2/include/rayd/scene → rayd-0.3.0/include/rayd/edge}/scene_edge.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <rayd/rayd.h>
-#include <rayd/edge.h>
+#include <rayd/edge/edge.h>
 #include <rayd/ray.h>
 #include <vector>
 
@@ -17,6 +17,14 @@ struct ClosestEdgeCandidate {
     FloatDetached distance_sq;
 };
 
+struct ClosestEdgeTopKCandidate {
+    int query_count = 0;
+    int k = 0;
+    MaskDetached is_valid;
+    IntDetached global_edge_ids;
+    FloatDetached distance_sq;
+};
+
 struct SceneEdgeBVHStats {
     int primitive_count = 0;
     int node_count = 0;
@@ -48,6 +56,7 @@ public:
                const std::vector<EdgeDirtyRange> &dirty_ranges);
     void refit(const SecondaryEdgeInfo &edge_info,
                const IntDetached &primitive_indices);
+    void materialize() const;
     IntDetached map_to_global(const IntDetached &bvh_ids,
                               const MaskDetached &valid) const;
     bool is_ready() const { return ready_; }
@@ -58,6 +67,11 @@ public:
     ClosestEdgeCandidate nearest_edge(const Vector3fT<Detached> &point,
                                       MaskT<Detached> &active) const;
 
+    template <bool Detached>
+    ClosestEdgeTopKCandidate nearest_edges_topk(const Vector3fT<Detached> &point,
+                                                int k,
+                                                MaskT<Detached> &active) const;
+
     template <bool Detached>
     ClosestEdgeCandidate nearest_edge(const RayT<Detached> &ray,
                                       MaskT<Detached> &active) const;
@@ -72,6 +86,9 @@ private:
     void refit_internal_nodes_dirty(const std::vector<IntDetached> &dirty_leaf_chunks);
     ClosestEdgeCandidate nearest_edge_point_detached(const Vector3fDetached &point,
                                                      const MaskDetached &active) const;
+    ClosestEdgeTopKCandidate nearest_edges_topk_point_detached(const Vector3fDetached &point,
+                                                               int k,
+                                                               const MaskDetached &active) const;
     ClosestEdgeCandidate nearest_edge_finite_ray_detached(const Vector3fDetached &origin,
                                                           const Vector3fDetached &segment,
                                                           const MaskDetached &active) const;