Skip to content

Commit

Permalink
updated to OptiX 4.0, and therefore CUDA 7.5
Browse files Browse the repository at this point in the history
  • Loading branch information
Ryan M. Bergmann committed Apr 11, 2017
1 parent a4a9e21 commit 149ad67
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
Binary file modified Documentation/userguide.pdf
Binary file not shown.
18 changes: 9 additions & 9 deletions optix_stuff.h
Original file line number Diff line number Diff line change
Expand Up @@ -66,16 +66,16 @@ class optix_stuff{
*/
void init_internal(wgeometry, unsigned, std::string);
public:
CUdeviceptr positions_ptr; /**< CUDA positions pointer */
CUdeviceptr rxn_ptr; /**< CUDA reactions pointer */
CUdeviceptr done_ptr; /**< CUDA done flags pointer */
CUdeviceptr cellnum_ptr; /**< CUDA cell numbers pointer */
CUdeviceptr talnum_ptr; /**< CUDA tally numbers pointer */
CUdeviceptr matnum_ptr; /**< CUDA material numbers pointer */
CUdeviceptr remap_ptr; /**< CUDA remaps pointer */
void* positions_ptr; /**< CUDA positions pointer */
void* rxn_ptr; /**< CUDA reactions pointer */
void* done_ptr; /**< CUDA done flags pointer */
void* cellnum_ptr; /**< CUDA cell numbers pointer */
void* talnum_ptr; /**< CUDA tally numbers pointer */
void* matnum_ptr; /**< CUDA material numbers pointer */
void* remap_ptr; /**< CUDA remaps pointer */
unsigned stack_size_multiplier; /**< stack size multiplier */
unsigned N; /**< number of histories */
float outer_cell_dims[6]; /**< outermost cell dimensions */
unsigned N; /**< number of histories */
float outer_cell_dims[6]; /**< outermost cell dimensions */
/**
* \brief constructor
* \details sets stack size multiplier and number of histories.
Expand Down
4 changes: 2 additions & 2 deletions userguide/userguide.tex
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ \section{Dependencies of WARP}
Instructions for installing CMake on various operating systems can be found at
\url{http://cmake.org/install/}.

\item[NVIDIA CUDA]\index{NVIDIA CUDA}$\ge$ 5.0 \\
\item[NVIDIA CUDA]\index{NVIDIA CUDA}$\ge$ 7.5 \\
CUDA (``Compute Unified Device Architecture") is a parallel computing platform and programming model
invented by NVIDIA to utilize the power of the GPU. \textbf{Your computer must include a CUDA-enabled
GPU in order to install and use CUDA.}
Expand All @@ -123,7 +123,7 @@ \section{Dependencies of WARP}

Documentation for the CUDA Toolkit can be found at \url{http://docs.nvidia.com/cuda/index.html}.

\item[NVIDIA OptiX]\index{NVIDIA OptiX}$\ge$ 3.0.1 \\
\item[NVIDIA OptiX]\index{NVIDIA OptiX}$\ge$ 4.0.0 \\
OptiX is a software development kit developed by NVIDIA for ray tracing performance on GPUs; it provides a
framework for accessing the GPU's ray tracing capabilities.

Expand Down

0 comments on commit 149ad67

Please sign in to comment.