adapted examples for api changes and fixed a few bugs

Author: Felix Igelbrink

examples/compile_with_tasks.py

@@ -1,7 +1,4 @@
 import concurrent.futures
-
-import direct.task.Task
-
 import optix as ox
 import argparse
 import logging

examples/dynamic_geometry.py

@@ -220,6 +220,7 @@ def display_subframe(output_buffer, gl_display, window):
                         framebuf_res_x, framebuf_res_y,
                         output_buffer.get_pbo() )
 
+
 def init_camera_state(state):
     camera = state.camera
     camera.eye = (0, 1, -20)
@@ -233,12 +234,14 @@ def init_camera_state(state):
     trackball.set_reference_frame([1,0,0], [0,0,1], [0,1,0])
     trackball.reinitialize_orientation_from_camera()
 
+
 def create_context(state):
     logger = ox.Logger(log)
     ctx = ox.DeviceContext(validation_mode=False, log_callback_function=logger, log_callback_level=4)
     ctx.cache_enabled = False
     state.ctx = ctx
 
+
 def generate_animated_vertices(out_vertices, animation_mode, time, width, height):
     threads_per_block = 128
     num_blocks = (width*height + threads_per_block - 1) // threads_per_block
@@ -251,12 +254,13 @@ def generate_animated_vertices(out_vertices, animation_mode, time, width, height
 def launch_generate_animated_vertices(state, animation_mode):
     generate_animated_vertices(state.d_temp_vertices, animation_mode, state.time, g_tessellation_resolution, g_tessellation_resolution)
 
+
 def update_mesh_accel(state):
     # first sphere is static
 
     # second sphere moves by updating its transform matrix
-    transform = state.ias_build_input.get_transform_view(1)
-    transform[1,-1] = np.sin(4*state.time)
+    transform = state.ias_build_input.view_instance_transform(1)
+    transform[1, -1] = np.sin(4*state.time)
 
     # third sphere deforms
     launch_generate_animated_vertices(state, AnimationMode.DEFORM)
@@ -270,13 +274,14 @@ def update_mesh_accel(state):
         state.last_exploding_sphere_rebuild_time = state.time
         state.exploding_gas = ox.AccelerationStructure(state.ctx, state.gas_build_input,
                 compact=True, allow_update=True, random_vertex_access=True)
-        state.ias_build_input.instances[3].update_traversable(state.exploding_gas)
+        state.ias_build_input[3].traversable = state.exploding_gas
         state.ias_build_input.update_instance(3)
     else:
         state.exploding_gas.update(state.gas_build_input)
 
     state.ias.update(state.ias_build_input)
 
+
 def build_vertex_generation_kernel(state):
     cuda_source = os.path.join(script_dir, 'cuda', 'dynamic_geometry_vertex_generation.cu')
     example_include_path = os.path.dirname(cuda_source)
@@ -289,6 +294,7 @@ def build_vertex_generation_kernel(state):
     state.generate_vertices_kernel = cp.RawKernel(code=code, backend='nvrtc',
             options=build_flags, name='generate_vertices')
 
+
 def build_mesh_accel(state):
     # Allocate temporary space for vertex generation.
     # The same memory space is reused for generating the deformed and exploding vertices before updates.
@@ -335,9 +341,10 @@ def create_module(state):
     else:
         exception_flags=ox.ExceptionFlags.NONE
 
+    print("Triangle value", ox.PrimitiveTypeFlags.TRIANGLE.value)
     pipeline_opts = ox.PipelineCompileOptions(
             uses_motion_blur=False,
-            uses_primitive_type_flags = ox.PrimitiveTypeFlags.TRIANGLE,
+            uses_primitive_type_flags =ox.PrimitiveTypeFlags.TRIANGLE,
             traversable_graph_flags=ox.TraversableGraphFlags.ALLOW_SINGLE_LEVEL_INSTANCING,
             exception_flags=exception_flags,
             num_payload_values=3,
@@ -347,7 +354,7 @@ def create_module(state):
     compile_opts = ox.ModuleCompileOptions(
             max_register_count=ox.ModuleCompileOptions.DEFAULT_MAX_REGISTER_COUNT,
             opt_level=ox.CompileOptimizationLevel.DEFAULT,
-            debug_level=ox.CompileDebugLevel.LINEINFO)
+            debug_level=ox.CompileDebugLevel.MODERATE)
 
     cuda_source = os.path.join(script_dir, 'cuda', 'dynamic_geometry.cu')
     state.module = ox.Module(state.ctx, cuda_source, compile_opts, pipeline_opts)
@@ -364,7 +371,7 @@ def create_pipeline(state):
     program_grps = [state.raygen_grp, state.miss_grp, state.hit_grp]
 
     link_opts = ox.PipelineLinkOptions(max_trace_depth=1,
-                                       debug_level=ox.CompileDebugLevel.LINEINFO)
+                                       debug_level=ox.CompileDebugLevel.MODERATE)
 
     pipeline = ox.Pipeline(state.ctx,
                            compile_options=state.pipeline_opts,

examples/dynamic_materials.py

@@ -194,7 +194,7 @@ def create_module(state):
     compile_opts = ox.ModuleCompileOptions(
             max_register_count=ox.ModuleCompileOptions.DEFAULT_MAX_REGISTER_COUNT,
             opt_level=ox.CompileOptimizationLevel.DEFAULT,
-            debug_level=ox.CompileDebugLevel.LINEINFO)
+            debug_level=ox.CompileDebugLevel.MODERATE)
 
     source = os.path.join(script_dir, 'cuda', 'dynamic_materials.cu')
     state.module = ox.Module(state.ctx, source, compile_opts, pipeline_opts)

optix/build.pxd

@@ -303,12 +303,12 @@ cdef class BuildInputCurveArray(BuildInputArray):
 
 cdef class Instance(OptixObject):
     cdef OptixInstance instance
-    cdef AccelerationStructure traversable
+    cdef AccelerationStructure _traversable
 
 
 cdef class BuildInputInstanceArray(BuildInputArray):
     cdef OptixBuildInputInstanceArray build_input
-    cdef public object instances
+    cdef object instances
     cdef object _d_instances
 
 

optix/build.pyx

@@ -459,11 +459,9 @@ cdef class Instance(OptixObject):
                  visibility_mask=None):
         if transform is None:
             transform = np.eye(3, 4, dtype=np.float32)
-        transform = np.ascontiguousarray(np.asarray(transform, dtype=np.float32).reshape(3,4))
-        cdef float[:, ::1] c_transform = transform
-        memcpy(&self.instance.transform, &c_transform[0, 0], sizeof(float) * 12)
+        self.transform = transform
         self.traversable = traversable
-        self.instance.traversableHandle = self.traversable.handle
+
         self.instance.instanceId = instance_id
         self.instance.flags = flags.value
         self.instance.sbtOffset = sbt_offset
@@ -474,8 +472,14 @@ cdef class Instance(OptixObject):
             raise ValueError(f"Too many entries in visibility mask. Got {visibility_mask.bit_length()} but supported are only {max_visibility_mask_bits}")
         self.instance.visibilityMask = visibility_mask
 
-    def update_traversable(self, AccelerationStructure traversable):
-        self.traversable = traversable
+    @property
+    def traversable(self):
+        return self._traversable
+
+    @traversable.setter
+    def traversable(self, AccelerationStructure traversable):
+        self._traversable = traversable
+        # update the handle as well
         self.instance.traversableHandle = self.traversable.handle
 
     def __deepcopy__(self, memodict={}):
@@ -488,6 +492,17 @@ cdef class Instance(OptixObject):
 
         return result
 
+    @property
+    def transform(self):
+        cdef float [:] transform_view = self.instance.transform
+        return np.asarray(transform_view).reshape(3,4)
+
+    @transform.setter
+    def transform(self, tf):
+        transform = np.ascontiguousarray(np.asarray(tf, dtype=np.float32).reshape(3,4))
+        cdef float[:, ::1] c_transform = transform
+        memcpy(&self.instance.transform, &c_transform[0, 0], sizeof(float) * 12)
+
 
 cdef class BuildInputInstanceArray(BuildInputArray):
     """
@@ -521,13 +536,48 @@ cdef class BuildInputInstanceArray(BuildInputArray):
 
     cdef size_t num_elements(self):
         return self.build_input.numInstances
-    
+
+    def __getitem__(self, index):
+        return self.instances[index]
+
+    def __setitem__(self, index, instance):
+        if not isinstance(instance, Instance):
+            raise TypeError("Only instance objects.")
+        self.instances[index] = instance
+        self.update_instance(index)
+
     def update_instance(self, index):
-        src_ptr = <size_t>&((<Instance>(self.instances[index])).instance)
+        """
+        Update the instance at index in gpu memory from the instances list in host memory.
+
+        Parameters
+        ----------
+        index: int
+            The index to update
+        """
+        # update the value in the cuda buffer
+        src_ptr = <size_t>&(<Instance>(self.instances[index])).instance
         dst_ptr = self._d_instances.ptr + index*sizeof(OptixInstance)
         cp.cuda.runtime.memcpy(dst_ptr, src_ptr, sizeof(OptixInstance), cp.cuda.runtime.memcpyHostToDevice)
 
-    def get_transform_view(self, index):
+    # TODO: still thinking of a better way to acomplish the transform access in an OO way.
+    def view_instance_transform(self, index):
+        """
+        Obtain a view of the transform parameter at index in gpu memory as a cupy array for direct modification
+
+        Parameters
+        ----------
+        index: int
+            The index of the transform this view should point to
+
+        Returns
+        -------
+        transform_view: cp.ndarray of shape (3, 4)
+            A view of the transform matrix
+
+        """
+        if index < 0 or index >=len(self.instances):
+            raise IndexError(f"Invalid index {index} for list of length {len(self.instances)}.")
         device_ptr = cp.cuda.MemoryPointer(mem=self._d_instances.mem, offset=<int>index*sizeof(OptixInstance))
         return cp.ndarray(shape=(3,4), dtype=np.float32, memptr=device_ptr)
 

optix/context.pxd

@@ -59,4 +59,4 @@ cdef class DeviceContext(OptixObject):
 
 
 cdef class OptixContextObject(OptixObject):
-    cdef DeviceContext context
+    cdef public DeviceContext context

optix/context.pyx

@@ -11,9 +11,6 @@ OPTIX_VERSION = _OPTIX_VERSION
 def optix_version():
     return _OPTIX_VERSION_MAJOR, _OPTIX_VERSION_MINOR, _OPTIX_VERSION_MICRO
 
-
-
-
 cdef class _LogWrapper:
     def __init__(self, log_function):
         self.log_function = log_function
@@ -262,3 +259,4 @@ cdef class OptixContextObject(OptixObject):
     """
     def __init__(self, DeviceContext context):
         self.context = context
+

optix/pipeline.pyx

@@ -57,7 +57,7 @@ IF _OPTIX_VERSION > 70300:  # switch to new instance flags
         ROUND_CUBIC_BSPLINE = OPTIX_PRIMITIVE_TYPE_FLAGS_ROUND_CUBIC_BSPLINE,
         ROUND_LINEAR = OPTIX_PRIMITIVE_TYPE_FLAGS_ROUND_LINEAR,
         ROUND_CATMULLROM = OPTIX_PRIMITIVE_TYPE_FLAGS_ROUND_CATMULLROM,
-        TRIANGLE = OPTIX_PRIMITIVE_TYPE_FLAGS_TRIANGLE
+        TRIANGLE = <unsigned int>OPTIX_PRIMITIVE_TYPE_FLAGS_TRIANGLE # fixes negative number error
 ELSE:
     class CompileDebugLevel(IntEnum):
         """