First pass

.github/workflows/rust.yml

@@ -59,7 +59,7 @@ jobs:
         run: cargo fmt --all -- --check
 
       - name: Build
-        run: cargo build --workspace --exclude "optix" --exclude "optix_sys" --exclude "path_tracer" --exclude "denoiser" --exclude "add"
+        run: cargo build --workspace --exclude "optix" --exclude "path_tracer" --exclude "denoiser" --exclude "add" --exclude "ex*"
 
       # Don't currently test because many tests rely on the system having a CUDA GPU
       # - name: Test
@@ -69,9 +69,9 @@ jobs:
         if: contains(matrix.os, 'ubuntu')
         env:
           RUSTFLAGS: -Dwarnings
-        run: cargo clippy --workspace --exclude "optix" --exclude "optix_sys" --exclude "path_tracer" --exclude "denoiser" --exclude "add"
+        run: cargo clippy --workspace --exclude "optix" --exclude "path_tracer" --exclude "denoiser" --exclude "add" --exclude "ex*"
 
       - name: Check documentation
         env:
           RUSTDOCFLAGS: -Dwarnings
-        run: cargo doc --workspace --all-features --document-private-items --no-deps --exclude "optix" --exclude "optix_sys" --exclude "path_tracer" --exclude "denoiser" --exclude "add"
+        run: cargo doc --workspace --all-features --document-private-items --no-deps --exclude "optix" --exclude "path_tracer" --exclude "denoiser" --exclude "add" --exclude "ex*"

Cargo.toml

@@ -1,7 +1,8 @@
 [workspace]
 members = [
   "crates/*",
-
+  "crates/optix/examples/ex*",
+  "crates/optix/examples/ex*/device",
   "xtask",
 
   "examples/optix/*",
@@ -10,5 +11,9 @@ members = [
 
 ]
 
+exclude = [
+    "crates/optix/examples/common"
+]
+
 [profile.dev.package.rustc_codegen_nvvm]
 opt-level = 3

crates/blastoff/Cargo.toml

@@ -8,7 +8,7 @@ repository = "https://github.com/Rust-GPU/Rust-CUDA"
 [dependencies]
 bitflags = "1.3.2"
 cublas_sys = { version = "0.1", path = "../cublas_sys" }
-cust = { version = "0.2", path = "../cust", features = ["num-complex"] }
+cust = { version = "0.2", path = "../cust", features = ["impl_num_complex"] }
 num-complex = "0.4.0"
 
 [package.metadata.docs.rs]

crates/blastoff/src/level1.rs

@@ -46,9 +46,9 @@ impl CublasContext {
             Ok(T::amin(
                 ctx.raw,
                 n as i32,
-                x.as_device_ptr().as_raw(),
+                x.as_device_ptr().as_ptr(),
                 stride.unwrap_or(1) as i32,
-                result.as_device_ptr().as_raw_mut(),
+                result.as_device_ptr().as_mut_ptr(),
             )
             .to_result()?)
         })
@@ -108,9 +108,9 @@ impl CublasContext {
             Ok(T::amax(
                 ctx.raw,
                 n as i32,
-                x.as_device_ptr().as_raw(),
+                x.as_device_ptr().as_ptr(),
                 stride.unwrap_or(1) as i32,
-                result.as_device_ptr().as_raw_mut(),
+                result.as_device_ptr().as_mut_ptr(),
             )
             .to_result()?)
         })
@@ -172,10 +172,10 @@ impl CublasContext {
             Ok(T::axpy(
                 ctx.raw,
                 n as i32,
-                alpha.as_device_ptr().as_raw(),
-                x.as_device_ptr().as_raw(),
+                alpha.as_device_ptr().as_ptr(),
+                x.as_device_ptr().as_ptr(),
                 x_stride.unwrap_or(1) as i32,
-                y.as_device_ptr().as_raw_mut(),
+                y.as_device_ptr().as_mut_ptr(),
                 y_stride.unwrap_or(1) as i32,
             )
             .to_result()?)
@@ -245,9 +245,9 @@ impl CublasContext {
             Ok(T::copy(
                 ctx.raw,
                 n as i32,
-                x.as_device_ptr().as_raw(),
+                x.as_device_ptr().as_ptr(),
                 x_stride.unwrap_or(1) as i32,
-                y.as_device_ptr().as_raw_mut(),
+                y.as_device_ptr().as_mut_ptr(),
                 y_stride.unwrap_or(1) as i32,
             )
             .to_result()?)
@@ -314,11 +314,11 @@ impl CublasContext {
             Ok(T::dot(
                 ctx.raw,
                 n as i32,
-                x.as_device_ptr().as_raw(),
+                x.as_device_ptr().as_ptr(),
                 x_stride.unwrap_or(1) as i32,
-                y.as_device_ptr().as_raw(),
+                y.as_device_ptr().as_ptr(),
                 y_stride.unwrap_or(1) as i32,
-                result.as_device_ptr().as_raw_mut(),
+                result.as_device_ptr().as_mut_ptr(),
             )
             .to_result()?)
         })
@@ -390,11 +390,11 @@ impl CublasContext {
             Ok(T::dotu(
                 ctx.raw,
                 n as i32,
-                x.as_device_ptr().as_raw(),
+                x.as_device_ptr().as_ptr(),
                 x_stride.unwrap_or(1) as i32,
-                y.as_device_ptr().as_raw(),
+                y.as_device_ptr().as_ptr(),
                 y_stride.unwrap_or(1) as i32,
-                result.as_device_ptr().as_raw_mut(),
+                result.as_device_ptr().as_mut_ptr(),
             )
             .to_result()?)
         })
@@ -438,11 +438,11 @@ impl CublasContext {
             Ok(T::dotc(
                 ctx.raw,
                 n as i32,
-                x.as_device_ptr().as_raw(),
+                x.as_device_ptr().as_ptr(),
                 x_stride.unwrap_or(1) as i32,
-                y.as_device_ptr().as_raw(),
+                y.as_device_ptr().as_ptr(),
                 y_stride.unwrap_or(1) as i32,
-                result.as_device_ptr().as_raw_mut(),
+                result.as_device_ptr().as_mut_ptr(),
             )
             .to_result()?)
         })
@@ -483,9 +483,9 @@ impl CublasContext {
             Ok(T::nrm2(
                 ctx.raw,
                 n as i32,
-                x.as_device_ptr().as_raw(),
+                x.as_device_ptr().as_ptr(),
                 x_stride.unwrap_or(1) as i32,
-                result.as_device_ptr().as_raw_mut(),
+                result.as_device_ptr().as_mut_ptr(),
             )
             .to_result()?)
         })
@@ -559,12 +559,12 @@ impl CublasContext {
             Ok(T::rot(
                 ctx.raw,
                 n as i32,
-                x.as_device_ptr().as_raw_mut(),
+                x.as_device_ptr().as_mut_ptr(),
                 x_stride.unwrap_or(1) as i32,
-                y.as_device_ptr().as_raw_mut(),
+                y.as_device_ptr().as_mut_ptr(),
                 y_stride.unwrap_or(1) as i32,
-                c.as_device_ptr().as_raw(),
-                s.as_device_ptr().as_raw(),
+                c.as_device_ptr().as_ptr(),
+                s.as_device_ptr().as_ptr(),
             )
             .to_result()?)
         })

crates/cudnn/src/context.rs

@@ -397,9 +397,9 @@ impl CudnnContext {
         let x_data = x.data().as_device_ptr().as_raw();
 
         let y_desc = y.descriptor();
-        let y_data = y.data().as_device_ptr().as_raw_mut();
+        let y_data = y.data().as_device_ptr().as_ptr();
 
-        let reserve_space_ptr = reserve_space.as_device_ptr().as_raw_mut();
+        let reserve_space_ptr = reserve_space.as_device_ptr().as_ptr();
 
         unsafe {
             sys::cudnnDropoutForward(
@@ -454,9 +454,9 @@ impl CudnnContext {
         let dy_data = dy.data().as_device_ptr().as_raw();
 
         let dx_desc = dx.descriptor();
-        let dx_data = dx.data().as_device_ptr().as_raw_mut();
+        let dx_data = dx.data().as_device_ptr().as_ptr();
 
-        let reserve_space_ptr = reserve_space.as_device_ptr().as_raw_mut();
+        let reserve_space_ptr = reserve_space.as_device_ptr().as_ptr();
 
         unsafe {
             sys::cudnnDropoutBackward(
@@ -528,7 +528,7 @@ impl CudnnContext {
                 raw,
                 self.raw,
                 dropout,
-                states.as_device_ptr().as_raw_mut() as *mut std::ffi::c_void,
+                states.as_device_ptr().as_ptr() as *mut std::ffi::c_void,
                 states.len(),
                 seed,
             )
@@ -1185,14 +1185,14 @@ impl CudnnContext {
         let w_data = w.data().as_device_ptr().as_raw();
         let w_desc = w.descriptor();
 
-        let y_data = y.data().as_device_ptr().as_raw_mut();
+        let y_data = y.data().as_device_ptr().as_ptr();
         let y_desc = y.descriptor();
 
         // If the _ size is 0 then the algorithm can work in-place and cuDNN expects a null
         // pointer.
         let (work_space_ptr, work_space_size): (*mut u8, usize) = {
             work_space.map_or((std::ptr::null_mut(), 0), |work_space| {
-                (work_space.as_device_ptr().as_raw_mut(), work_space.len())
+                (work_space.as_device_ptr().as_mut_ptr(), work_space.len())
             })
         };
 
@@ -1287,12 +1287,12 @@ impl CudnnContext {
         let dy_data = dy.data().as_device_ptr().as_raw();
         let dy_desc = dy.descriptor();
 
-        let dx_data = dx.data().as_device_ptr().as_raw_mut();
+        let dx_data = dx.data().as_device_ptr().as_ptr();
         let dx_desc = dx.descriptor();
 
         let (work_space_ptr, work_space_size): (*mut u8, usize) = {
             work_space.map_or((std::ptr::null_mut(), 0), |work_space| {
-                (work_space.as_device_ptr().as_raw_mut(), work_space.len())
+                (work_space.as_device_ptr().as_mut_ptr(), work_space.len())
             })
         };
 
@@ -1388,12 +1388,12 @@ impl CudnnContext {
         let dy_data = dy.data().as_device_ptr().as_raw();
         let dy_desc = dy.descriptor();
 
-        let dw_data = dw.data().as_device_ptr().as_raw_mut();
+        let dw_data = dw.data().as_device_ptr().as_ptr();
         let dw_desc = dw.descriptor();
 
         let (work_space_ptr, work_space_size): (*mut u8, usize) = {
             work_space.map_or((std::ptr::null_mut(), 0), |work_space| {
-                (work_space.as_device_ptr().as_raw_mut(), work_space.len())
+                (work_space.as_device_ptr().as_mut_ptr(), work_space.len())
             })
         };
 
@@ -1615,28 +1615,28 @@ impl CudnnContext {
         L: RnnDataLayout,
         NCHW: SupportedType<T1>,
     {
-        let device_sequence_lengths_ptr = device_seq_lengths.as_device_ptr().as_raw();
+        let device_sequence_lengths_ptr = device_seq_lengths.as_device_ptr().as_ptr();
 
         let x_ptr = x.as_device_ptr().as_raw();
-        let y_ptr = y.as_device_ptr().as_raw_mut();
+        let y_ptr = y.as_device_ptr().as_ptr();
 
-        let hx_ptr = hx.map_or(std::ptr::null(), |buff| buff.as_device_ptr().as_raw());
+        let hx_ptr = hx.map_or(std::ptr::null(), |buff| buff.as_device_ptr().as_ptr());
         let hy_ptr = hy.map_or(std::ptr::null_mut(), |buff| {
-            buff.as_device_ptr().as_raw_mut()
+            buff.as_device_ptr().as_mut_ptr()
         });
 
         let c_desc = c_desc.map_or(std::ptr::null_mut(), |desc| desc.raw);
 
-        let cx_ptr = cx.map_or(std::ptr::null(), |buff| buff.as_device_ptr().as_raw());
+        let cx_ptr = cx.map_or(std::ptr::null(), |buff| buff.as_device_ptr().as_ptr());
         let cy_ptr = cy.map_or(std::ptr::null_mut(), |buff| {
-            buff.as_device_ptr().as_raw_mut()
+            buff.as_device_ptr().as_mut_ptr()
         });
 
-        let weight_space_ptr = weight_space.as_device_ptr().as_raw_mut();
-        let work_space_ptr = work_space.as_device_ptr().as_raw_mut();
+        let weight_space_ptr = weight_space.as_device_ptr().as_ptr();
+        let work_space_ptr = work_space.as_device_ptr().as_ptr();
         let (reserve_space_ptr, reserve_space_size) = reserve_space
             .map_or((std::ptr::null_mut(), 0), |buff| {
-                (buff.as_device_ptr().as_raw_mut(), buff.len())
+                (buff.as_device_ptr().as_mut_ptr(), buff.len())
             });
 
         unsafe {
@@ -1814,32 +1814,32 @@ impl CudnnContext {
         L: RnnDataLayout,
         NCHW: SupportedType<T1>,
     {
-        let device_sequence_lengths_ptr = device_seq_lengths.as_device_ptr().as_raw();
+        let device_sequence_lengths_ptr = device_seq_lengths.as_device_ptr().as_ptr();
 
         let y_ptr = y.as_device_ptr().as_raw();
         let dy_ptr = dy.as_device_ptr().as_raw();
 
-        let dx_ptr = dx.as_device_ptr().as_raw_mut();
+        let dx_ptr = dx.as_device_ptr().as_ptr();
 
         let h_desc = h_desc.map_or(std::ptr::null_mut(), |desc| desc.raw);
 
-        let hx_ptr = hx.map_or(std::ptr::null(), |buff| buff.as_device_ptr().as_raw());
-        let dhy_ptr = dhy.map_or(std::ptr::null(), |buff| buff.as_device_ptr().as_raw());
+        let hx_ptr = hx.map_or(std::ptr::null(), |buff| buff.as_device_ptr().as_ptr());
+        let dhy_ptr = dhy.map_or(std::ptr::null(), |buff| buff.as_device_ptr().as_ptr());
         let dhx_ptr = dhx.map_or(std::ptr::null_mut(), |buff| {
-            buff.as_device_ptr().as_raw_mut()
+            buff.as_device_ptr().as_mut_ptr()
         });
 
         let c_desc = c_desc.map_or(std::ptr::null_mut(), |desc| desc.raw);
 
-        let cx_ptr = cx.map_or(std::ptr::null(), |buff| buff.as_device_ptr().as_raw());
-        let dcy_ptr = dcy.map_or(std::ptr::null(), |buff| buff.as_device_ptr().as_raw());
+        let cx_ptr = cx.map_or(std::ptr::null(), |buff| buff.as_device_ptr().as_ptr());
+        let dcy_ptr = dcy.map_or(std::ptr::null(), |buff| buff.as_device_ptr().as_mut_ptr());
         let dcx_ptr = dcx.map_or(std::ptr::null_mut(), |buff| {
-            buff.as_device_ptr().as_raw_mut()
+            buff.as_device_ptr().as_mut_ptr()
         });
 
-        let weight_space_ptr = weight_space.as_device_ptr().as_raw_mut();
-        let work_space_ptr = work_space.as_device_ptr().as_raw_mut();
-        let reserve_space_ptr = reserve_space.as_device_ptr().as_raw_mut();
+        let weight_space_ptr = weight_space.as_device_ptr().as_ptr();
+        let work_space_ptr = work_space.as_device_ptr().as_ptr();
+        let reserve_space_ptr = reserve_space.as_device_ptr().as_ptr();
 
         unsafe {
             sys::cudnnRNNBackwardData_v8(
@@ -1947,15 +1947,15 @@ impl CudnnContext {
         L: RnnDataLayout,
         NCHW: SupportedType<T1>,
     {
-        let device_sequence_lengths_ptr = device_seq_lengths.as_device_ptr().as_raw();
+        let device_sequence_lengths_ptr = device_seq_lengths.as_device_ptr().as_mut_ptr();
 
         let x_ptr = x.as_device_ptr().as_raw();
         let hx_ptr = x.as_device_ptr().as_raw();
         let y_ptr = y.as_device_ptr().as_raw();
 
-        let dweight_space_ptr = dweight_space.as_device_ptr().as_raw_mut();
-        let work_space_ptr = work_space.as_device_ptr().as_raw_mut();
-        let reserve_space_ptr = reserve_space.as_device_ptr().as_raw_mut();
+        let dweight_space_ptr = dweight_space.as_device_ptr().as_mut_ptr();
+        let work_space_ptr = work_space.as_device_ptr().as_mut_ptr();
+        let reserve_space_ptr = reserve_space.as_device_ptr().as_mut_ptr();
 
         unsafe {
             sys::cudnnRNNBackwardWeights_v8(