experimental support for optix 7.5

Author: Felix Igelbrink

optix/_version.py

@@ -1 +1 @@
-__version__ = "0.1.1"
+__version__ = "0.1.2"

optix/build.pxd

@@ -33,11 +33,13 @@ cdef extern from "optix.h" nogil:
         float timeBegin
         float timeEnd
 
+
     cdef struct OptixAccelBuildOptions:
         unsigned int buildFlags
         OptixBuildOperation operation
         OptixMotionOptions motionOptions
 
+
     cdef enum OptixBuildInputType:
         OPTIX_BUILD_INPUT_TYPE_TRIANGLES,
         OPTIX_BUILD_INPUT_TYPE_CUSTOM_PRIMITIVES,
@@ -51,6 +53,7 @@ cdef extern from "optix.h" nogil:
         CUdeviceptr instances
         unsigned int numInstances
 
+
     cdef struct OptixAabb:
         float minX
         float minY
@@ -59,6 +62,7 @@ cdef extern from "optix.h" nogil:
         float maxY
         float maxZ
 
+
     cdef struct OptixBuildInputCustomPrimitiveArray:
         const CUdeviceptr * aabbBuffers
         unsigned int numPrimitives
@@ -70,6 +74,7 @@ cdef extern from "optix.h" nogil:
         unsigned int sbtIndexOffsetStrideInBytes
         unsigned int primitiveIndexOffset
 
+
     IF _OPTIX_VERSION_MAJOR == 7 and _OPTIX_VERSION_MINOR > 4:  # switch to new instance flags
         cdef enum OptixPrimitiveType:
             OPTIX_PRIMITIVE_TYPE_CUSTOM,
@@ -95,11 +100,13 @@ cdef extern from "optix.h" nogil:
             OPTIX_PRIMITIVE_TYPE_ROUND_LINEAR,
             OPTIX_PRIMITIVE_TYPE_TRIANGLE,
 
+
     IF _OPTIX_VERSION_MAJOR == 7 and _OPTIX_VERSION_MINOR > 3:  # switch to new instance flags
         cdef enum OptixCurveEndcapFlags:
             OPTIX_CURVE_ENDCAP_DEFAULT,
             OPTIX_CURVE_ENDCAP_ON
 
+
         cdef struct OptixBuildInputCurveArray:
             OptixPrimitiveType curveType
             unsigned int numPrimitives
@@ -131,11 +138,13 @@ cdef extern from "optix.h" nogil:
             unsigned int flag
             unsigned int primitiveIndexOffset
 
+
     cdef enum OptixIndicesFormat:
         OPTIX_INDICES_FORMAT_NONE,
         OPTIX_INDICES_FORMAT_UNSIGNED_SHORT3,
         OPTIX_INDICES_FORMAT_UNSIGNED_INT3
 
+
     cdef enum OptixVertexFormat:
         OPTIX_VERTEX_FORMAT_NONE,
         OPTIX_VERTEX_FORMAT_FLOAT3,
@@ -145,11 +154,13 @@ cdef extern from "optix.h" nogil:
         OPTIX_VERTEX_FORMAT_SNORM16_3,
         OPTIX_VERTEX_FORMAT_SNORM16_2
 
+
     cdef enum OptixTransformFormat:
         OPTIX_TRANSFORM_FORMAT_NONE,
         OPTIX_TRANSFORM_FORMAT_MATRIX_FLOAT12,
 
-    IF _OPTIX_VERSION_MAJOR == 7 and _OPTIX_VERSION_MINOR > 4:  # switch to new geometry flags
+
+    IF _OPTIX_VERSION > 70400:  # switch to new geometry flags
         cdef enum OptixGeometryFlags:
             OPTIX_GEOMETRY_FLAG_NONE,
             OPTIX_GEOMETRY_FLAG_DISABLE_ANYHIT,
@@ -179,7 +190,8 @@ cdef extern from "optix.h" nogil:
         unsigned int primitiveIndexOffset
         OptixTransformFormat transformFormat
 
-    IF _OPTIX_VERSION_MAJOR == 7 and _OPTIX_VERSION_MINOR > 4:  # switch to new geometry flags
+
+    IF _OPTIX_VERSION > 70400:  # switch to new geometry flags
         cdef struct OptixBuildInputSphereArray:
             const CUdeviceptr* vertexBuffers
             unsigned int vertexStrideInBytes
@@ -211,24 +223,30 @@ cdef extern from "optix.h" nogil:
             OptixBuildInputCustomPrimitiveArray customPrimitiveArray
             OptixBuildInputInstanceArray instanceArray
 
+
     cdef struct OptixAccelBufferSizes:
         size_t outputSizeInBytes
         size_t tempSizeInBytes
         size_t tempUpdateSizeInBytes
 
+
     cdef enum OptixAccelPropertyType:
         OPTIX_PROPERTY_TYPE_COMPACTED_SIZE,
         OPTIX_PROPERTY_TYPE_AABBS,
 
+
     cdef struct OptixAccelEmitDesc:
         CUdeviceptr result
         OptixAccelPropertyType type
 
+
     ctypedef uintptr_t OptixTraversableHandle
 
+
     cdef struct OptixAccelRelocationInfo:
         unsigned long long info[4]
 
+
     cdef enum OptixTraversableType:
         OPTIX_TRAVERSABLE_TYPE_STATIC_TRANSFORM,
         OPTIX_TRAVERSABLE_TYPE_MATRIX_MOTION_TRANSFORM,
@@ -341,6 +359,7 @@ cdef class BuildInputCurveArray(BuildInputArray):
     cdef vector[CUdeviceptr] _d_normal_buffer_ptrs
     cdef object _d_index_buffer
 
+
 IF _OPTIX_VERSION > 70400:
     cdef class BuildInputSphereArray(BuildInputArray):
         cdef OptixBuildInputSphereArray build_input
@@ -351,6 +370,7 @@ IF _OPTIX_VERSION > 70400:
         cdef object _d_sbt_offset_buffer
         cdef vector[unsigned int] _flags
 
+
 cdef class Instance(OptixObject):
     cdef OptixInstance instance
     cdef AccelerationStructure _traversable

optix/denoiser.pxd

@@ -46,16 +46,16 @@ cdef extern from "optix_includes.h" nogil:
             size_t    internalGuideLayerPixelSizeInBytes
 
         cdef enum OptixDenoiserAlphaMode:
-            OPTIX_DENOISER_ALPHA_MODE_COPY
-            OPTIX_DENOISER_ALPHA_MODE_ALPHA_AS_AOV
+            OPTIX_DENOISER_ALPHA_MODE_COPY,
+            OPTIX_DENOISER_ALPHA_MODE_ALPHA_AS_AOV,
             OPTIX_DENOISER_ALPHA_MODE_FULL_DENOISE_PASS
 
         cdef struct OptixDenoiserParams:
             OptixDenoiserAlphaMode denoiseAlpha
             CUdeviceptr  hdrIntensity
             float        blendFactor
             CUdeviceptr  hdrAverageColor
-            unsigned int    temporalModeUsePreviousLayers
+            unsigned int temporalModeUsePreviousLayers
     ELSE:
         cdef struct OptixDenoiserSizes:
             size_t stateSizeInBytes
@@ -70,8 +70,6 @@ cdef extern from "optix_includes.h" nogil:
             CUdeviceptr  hdrAverageColor
 
 
-
-
     cdef enum OptixPixelFormat:
         OPTIX_PIXEL_FORMAT_HALF2
         OPTIX_PIXEL_FORMAT_HALF3

optix/module.pyx

@@ -217,6 +217,8 @@ cdef class Module(OptixContextObject):
     """
     Class representing a Optix Cuda program that will be called during pipeline execution. Wraps the OptixModule struct.
 
+    TODO: support creating modules through nvcc instead of nvrtc as well to support the new optix-ir format in 7.5
+
     Parameters
     ----------
     context: DeviceContext
@@ -406,6 +408,7 @@ cdef class Module(OptixContextObject):
         flags = list(compile_flags)
         # get cuda and optix_include_paths
         cuda_include_path = get_cuda_include_path()
+        print("cuda path", cuda_include_path)
         optix_include_path = get_optix_include_path()
 
         flags.extend([f'-I{cuda_include_path}', f'-I{optix_include_path}'])

optix/path_utility.py

@@ -38,7 +38,9 @@ def get_path(key):
         return tuple()
 
 
-def search_on_path(filenames, keys=('PATH',)):
+def search_on_path(filenames, keys=None):
+    if keys is None:
+        keys = ('PATH',)
     for p in chain(*[get_path(key) for key in keys]):
         for filename in filenames:
             full = os.path.abspath(os.path.join(p, filename))
@@ -47,15 +49,16 @@ def search_on_path(filenames, keys=('PATH',)):
     return None
 
 
-def get_cuda_path(environment_variable='CUDA_ROOT'):
+def get_cuda_path(environment_variable=None):
     global _cuda_path_cache
 
     # Use a magic word to represent the cache not filled because None is a
     # valid return value.
     if _cuda_path_cache != 'NOT_INITIALIZED':
         return _cuda_path_cache
 
-    nvcc_path = search_on_path(('nvcc', 'nvcc.exe'), keys=(environment_variable, 'PATH'))
+    nvcc_path = search_on_path(('nvcc', 'nvcc.exe'), keys=(environment_variable, 'PATH') if environment_variable is not
+                                                                                            None else ('PATH',))
     cuda_path_default = None
     if nvcc_path is not None:
         cuda_path_default = os.path.normpath(
@@ -70,7 +73,7 @@ def get_cuda_path(environment_variable='CUDA_ROOT'):
     return _cuda_path_cache
 
 
-def get_cuda_include_path(environment_variable='CUDA_ROOT'):
+def get_cuda_include_path(environment_variable=None):
     cuda_path = get_cuda_path(environment_variable=environment_variable)
     if cuda_path is None:
         return None
@@ -81,22 +84,28 @@ def get_cuda_include_path(environment_variable='CUDA_ROOT'):
         return None
 
 
-def get_optix_path(environment_variable='OPTIX_PATH'):
+def get_optix_path(path_hint=None, environment_variable=None):
     global _optix_path_cache
 
     # Use a magic word to represent the cache not filled because None is a
     # valid return value.
     if _optix_path_cache != 'NOT_INITIALIZED':
         return _optix_path_cache
 
-    # prefer the dedicated environment variable
-    optix_header_path = search_on_path(('include/optix.h',), keys=(environment_variable,))
-    if optix_header_path is None:
-        # search on the default path
-        optix_header_path = search_on_path(('../optix/include/optix.h',), keys=('PATH',))
+    if path_hint is None:
+        # prefer the dedicated environment variable
+        optix_header_path = search_on_path(('include/optix.h',), keys=(environment_variable,) if environment_variable is not
+                                                                                                 None else None)
+        if optix_header_path is None:
+            # search on the default path
+            optix_header_path = search_on_path(('../optix/include/optix.h',), keys=('PATH',))
 
-    if optix_header_path is not None:
-        optix_header_path = os.path.normpath(os.path.join(os.path.dirname(optix_header_path), '..'))
+        if optix_header_path is not None:
+            optix_header_path = os.path.normpath(os.path.join(os.path.dirname(optix_header_path), '..'))
+    else:
+        optix_header_path = path_hint
+        if not os.path.exists(os.path.join(optix_header_path, "include/optix.h")):
+            raise ValueError(f"Path {optix_header_path} does not contain an optix installation.")
 
     if optix_header_path is not None:
         _optix_path_cache = optix_header_path
@@ -106,7 +115,7 @@ def get_optix_path(environment_variable='OPTIX_PATH'):
     return _optix_path_cache
 
 
-def get_optix_include_path(environment_variable='OPTIX_PATH'):
+def get_optix_include_path(environment_variable=None):
     optix_path = get_optix_path(environment_variable=environment_variable)
     if optix_path is None:
         return None