fix non unified memory comp for ocl

elftausend · Jan 12, 2024 · bf783b2 · bf783b2
1 parent 5a58573
commit bf783b2
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/src/devices/opencl/mod.rs b/src/devices/opencl/mod.rs
@@ -74,6 +74,12 @@ impl<T> HasId for CLPtr<T> {
     }
 }
 
+impl<T> CLPtr<T> {
+    pub fn len(&self) -> usize {
+        self.len
+    }
+}
+
 impl<T> ShallowCopy for CLPtr<T> {
     #[inline]
     unsafe fn shallow(&self) -> Self {
@@ -116,6 +122,7 @@ impl<T> HostPtr<T> for CLPtr<T> {
     }
 }
 
+#[cfg(unified_cl)]
 impl<T> Deref for CLPtr<T> {
     type Target = [T];
 
@@ -125,6 +132,7 @@ impl<T> Deref for CLPtr<T> {
     }
 }
 
+#[cfg(unified_cl)]
 impl<T> DerefMut for CLPtr<T> {
     #[inline]
     fn deref_mut(&mut self) -> &mut Self::Target {

diff --git a/src/devices/opencl/ops.rs b/src/devices/opencl/ops.rs
@@ -211,7 +211,10 @@ where
                 Ok(())
             }
             #[cfg(not(unified_cl))]
-            try_cl_apply_fn_mut(dev, buf, out, f);
+            {
+                try_cl_apply_fn_mut(dev, buf, out, **f)?;
+                Ok(())
+            }
         })
         .unwrap();
 

diff --git a/src/two_way_ops/mod.rs b/src/two_way_ops/mod.rs
@@ -390,7 +390,7 @@ pub mod tests_ex {
 
         let buf = device.apply_fn(&buf, |x| x.mul(2.).add(4.).sin().mul(x).add(1.));
         roughly_eq_slices(
-            buf.read(),
+            &buf.read(),
             &[
                 -0.6320633326681093,
                 -0.6320633326681093,