Merge pull request #521 from gonsolo/noseven

Three more occurrences of OPTIX7.

Author: mmp

.github/workflows/ci-gpu.yml

@@ -77,13 +77,13 @@ jobs:
       if: ${{ matrix.os == 'windows-latest' }}
       run: |
         cd build
-        cmake .. -DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_INSTALLATION_ROOT"/scripts/buildsystems/vcpkg.cmake -DPBRT_USE_PREGENERATED_RGB_TO_SPECTRUM_TABLES=True -DPBRT_OPTIX7_PATH=../optix/${{ matrix.optix }} -DPBRT_GPU_SHADER_MODEL=sm_80
+        cmake .. -DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_INSTALLATION_ROOT"/scripts/buildsystems/vcpkg.cmake -DPBRT_USE_PREGENERATED_RGB_TO_SPECTRUM_TABLES=True -DPBRT_OPTIX_PATH=../optix/${{ matrix.optix }} -DPBRT_GPU_SHADER_MODEL=sm_80
 
     - name: Configure (Linux)
       if: ${{ matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-24.04' }}
       run: |
         cd build
-        cmake .. -DPBRT_USE_PREGENERATED_RGB_TO_SPECTRUM_TABLES=True -DPBRT_OPTIX7_PATH=../optix/${{ matrix.optix }} -DPBRT_GPU_SHADER_MODEL=sm_80
+        cmake .. -DPBRT_USE_PREGENERATED_RGB_TO_SPECTRUM_TABLES=True -DPBRT_OPTIX_PATH=../optix/${{ matrix.optix }} -DPBRT_GPU_SHADER_MODEL=sm_80
 
     - name: Build
       # We need to limit the number of jobs so that it doesn't OOM 

README.md

@@ -206,7 +206,7 @@ later.  Both Linux and Windows are supported.
 
 The build scripts automatically attempt to find a CUDA compiler, looking in
 the usual places; the cmake output will indicate whether it was successful.
-It is necessary to manually set the cmake `PBRT_OPTIX7_PATH` configuration
+It is necessary to manually set the cmake `PBRT_OPTIX_PATH` configuration
 option to point at an OptiX installation.  By default, the GPU shader model
 that pbrt targets is set automatically based on the GPU in the system.
 Alternatively, the `PBRT_GPU_SHADER_MODEL` option can be set manually