Upgraded to OptiX 6

Author: DeclanRussell

README.md

@@ -8,7 +8,7 @@ This is a simple implementation of NVidia AI denoiser. You can find a pre-built
 
 These libraries will also need to be copied to the bin directory or add them to your path to run the app. The scons build will copy the required dlls from the contrib to the bin for you. You may also need to update your driver as I did.
 
-You will require an Nvidia driver of at least 390.xx or higher to use the optix denoiser.
+You will require an Nvidia driver of at least 418.xx or higher and an Nvidia GPU of Maxwell architecture or newer to use the optix denoiser.
 
 ## Usage
 Command line parameters
@@ -18,6 +18,7 @@ Command line parameters
 * -n [string] : path to input normal AOV (optional, requires albedo AOV) 
 * -b [float] : blend amount (default 0) 
 * -hdr [int] : Use HDR training data (default 1)
+* -maxmem [int] : Maximum memory size used by the denoiser in MB
 * -h/--help : Lists command line parameters
 
 You need to at least have an input and output for the app to run. If you also have them, you can add an albedo AOV or albedo and normal AOVs to improve the denoising. All images should be the same resolutions, not meeting this requirement will lead to unexpected results (likely a crash). 

SConstruct

@@ -24,7 +24,7 @@ if PLATFORM.name == "win32":
 
 
 LIBS = []
-LIBS.append("optix.51")
+LIBS.append("optix.6.0.0")
 LIBS.append("OpenImageIO")
 
 LINKFLAGS = []
@@ -33,10 +33,9 @@ if PLATFORM.name == "win32":
     ENV.Append(CPPDEFINES = "NOMINMAX")
 
 # Copy over the OptiX dlls to the bin directory
-ENV.Command("bin/cudart64_90.dll", "./contrib/optix/bin/cudart64_90.dll", Copy("$TARGET", "$SOURCE"))
 ENV.Command("bin/cudnn64_7.dll", "./contrib/optix/bin/cudnn64_7.dll", Copy("$TARGET", "$SOURCE"))
-ENV.Command("bin/optix.51.dll", "./contrib/optix/bin/optix.51.dll", Copy("$TARGET", "$SOURCE"))
-ENV.Command("bin/optix_denoiser.51.dll", "./contrib/optix/bin/optix_denoiser.51.dll", Copy("$TARGET", "$SOURCE"))
+ENV.Command("bin/optix.6.0.0.dll", "./contrib/optix/bin/optix.6.0.0.dll", Copy("$TARGET", "$SOURCE"))
+ENV.Command("bin/optix_denoiser.6.0.0.dll", "./contrib/optix/bin/optix_denoiser.6.0.0.dll", Copy("$TARGET", "$SOURCE"))
 
 # Copy all of OIIO many dependancies!
 ENV.Command("bin/boost_atomic-vc141-mt-x64-1_67.dll", "./contrib/OpenImageIO/bin/boost_atomic-vc141-mt-x64-1_67.dll", Copy("$TARGET", "$SOURCE"))

bin/Denoiser.exe

@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) 2018 NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2018, NVIDIA CORPORATION.  All rights reserved.
  *
  * NVIDIA Corporation and its licensors retain all intellectual property and proprietary
  * rights in and to this software, related documentation and any modifications thereto.
@@ -30,7 +30,6 @@
 #ifndef __optix_optix_datatypes_h__
 #define __optix_optix_datatypes_h__
 
-#include <host_defines.h>               /* for __inline__ */
 #include "../optixu/optixu_vector_types.h"        /* for float3 */
 #include "optix_declarations.h"         /* for RT_HOSTDEVICE */