Style fixes

Author: szymon-zadworny

oneapi-rs-sys/include/usm.hpp

@@ -14,8 +14,8 @@
 #include <memory>
 
 namespace sycl_shims::usm {
-std::uint8_t* aligned_alloc_device(std::size_t alignment, std::size_t bytes, Queue const &);
-std::uint8_t* aligned_alloc_host(std::size_t alignment, std::size_t bytes, Queue const &);
-std::uint8_t* aligned_alloc_shared(std::size_t alignment, std::size_t bytes, Queue const &);
+std::uint8_t* aligned_alloc_device(std::size_t alignment, std::size_t num_bytes, Queue const &);
+std::uint8_t* aligned_alloc_host(std::size_t alignment, std::size_t num_bytes, Queue const &);
+std::uint8_t* aligned_alloc_shared(std::size_t alignment, std::size_t num_bytes, Queue const &);
 void free(std::uint8_t*, Queue const &);
 } // namespace sycl_shims::usm

oneapi-rs-sys/src/usm-sys.rs

@@ -15,9 +15,9 @@ pub mod ffi {
 
     extern "C++" {
         include!("oneapi-rs-sys/include/usm.hpp");
-        unsafe fn aligned_alloc_device(alignment: usize, bytes: usize, queue: &Queue) -> Result<*mut u8>;
-        unsafe fn aligned_alloc_host(alignment: usize, bytes: usize, queue: &Queue) -> Result<*mut u8>;
-        unsafe fn aligned_alloc_shared(alignment: usize, bytes: usize, queue: &Queue) -> Result<*mut u8>;
+        unsafe fn aligned_alloc_device(alignment: usize, num_bytes: usize, queue: &Queue) -> Result<*mut u8>;
+        unsafe fn aligned_alloc_host(alignment: usize, num_bytes: usize, queue: &Queue) -> Result<*mut u8>;
+        unsafe fn aligned_alloc_shared(alignment: usize, num_bytes: usize, queue: &Queue) -> Result<*mut u8>;
         unsafe fn free(ptr: *mut u8, queue: &Queue);
     }
 }

oneapi-rs-sys/src/usm.cpp

@@ -10,16 +10,16 @@
 #include "oneapi-rs-sys/src/usm-sys.rs.h"
 
 namespace sycl_shims::usm {
-std::uint8_t* aligned_alloc_device(std::size_t alignment, std::size_t bytes, Queue const & queue) {
-  return static_cast<std::uint8_t*>(sycl::aligned_alloc_device(alignment, bytes, queue));
+std::uint8_t* aligned_alloc_device(std::size_t alignment, std::size_t num_bytes, Queue const & queue) {
+  return static_cast<std::uint8_t*>(sycl::aligned_alloc_device(alignment, num_bytes, queue));
 }
 
-std::uint8_t* aligned_alloc_host(std::size_t alignment, std::size_t bytes, Queue const & queue) {
-  return static_cast<std::uint8_t*>(sycl::aligned_alloc_host(alignment, bytes, queue));
+std::uint8_t* aligned_alloc_host(std::size_t alignment, std::size_t num_bytes, Queue const & queue) {
+  return static_cast<std::uint8_t*>(sycl::aligned_alloc_host(alignment, num_bytes, queue));
 }
 
-std::uint8_t* aligned_alloc_shared(std::size_t alignment, std::size_t bytes, Queue const & queue) {
-  return static_cast<std::uint8_t*>(sycl::aligned_alloc_shared(alignment, bytes, queue));
+std::uint8_t* aligned_alloc_shared(std::size_t alignment, std::size_t num_bytes, Queue const & queue) {
+  return static_cast<std::uint8_t*>(sycl::aligned_alloc_shared(alignment, num_bytes, queue));
 }
 
 void free(std::uint8_t* memory, Queue const & queue) {

oneapi-rs/src/buffer.rs

@@ -13,12 +13,12 @@ use crate::usm::UsmAlloc;
 /// The Buffer struct defines a shared array of one, two or three dimensions that can be used
 /// by the SYCL kernel. Buffers are templated on the type of their data, and the number of
 /// dimensions that the data is stored and accessed through.
-
+///
 /// A Buffer does not map to only one underlying backend object, and all SYCL backend memory objects
 /// may be temporary for use on a specific device.
-
+///
 /// Buffers can be constructed by methods provided by the [`Queue`](`crate::queue::Queue`) class.
-
+///
 /// The Buffer struct template takes a template parameter [`UsmAlloc`](`crate::usm::UsmAlloc`) for
 /// specifying an allocator which is used by the SYCL runtime when allocating temporary memory on
 /// the host.

oneapi-rs/src/usm.rs

@@ -27,7 +27,7 @@ pub unsafe trait UsmAlloc : Allocator {}
 unsafe impl<'a, T: UsmAllocatorKind> UsmAlloc for UsmAllocator<'a, T> {}
 
 pub trait UsmAllocatorKind {
-    unsafe fn alloc(alignment: usize, bytes: usize, queue: &Queue) -> CxxResult<*mut u8>;
+    unsafe fn alloc(alignment: usize, num_bytes: usize, queue: &Queue) -> CxxResult<*mut u8>;
 }
 
 impl<'a, T: UsmAllocatorKind> From<&'a Queue> for UsmAllocator<'a, T> {
@@ -61,25 +61,25 @@ unsafe impl<T: UsmAllocatorKind> Allocator for UsmAllocator<'_, T> {
 pub(crate) struct DeviceAllocator;
 
 impl UsmAllocatorKind for DeviceAllocator {
-    unsafe fn alloc(alignment: usize, bytes: usize, queue: &Queue) -> CxxResult<*mut u8> {
-        unsafe { ffi::aligned_alloc_device(alignment, bytes, &queue.0) }
+    unsafe fn alloc(alignment: usize, num_bytes: usize, queue: &Queue) -> CxxResult<*mut u8> {
+        unsafe { ffi::aligned_alloc_device(alignment, num_bytes, &queue.0) }
     }
 }
 
 /// An allocator for Host-side buffers
 pub struct HostAllocator;
 
 impl UsmAllocatorKind for HostAllocator {
-    unsafe fn alloc(alignment: usize, bytes: usize, queue: &Queue) -> CxxResult<*mut u8> {
-        unsafe { ffi::aligned_alloc_host(alignment, bytes, &queue.0) }
+    unsafe fn alloc(alignment: usize, num_bytes: usize, queue: &Queue) -> CxxResult<*mut u8> {
+        unsafe { ffi::aligned_alloc_host(alignment, num_bytes, &queue.0) }
     }
 }
 
 /// An allocator for shared memory buffers
 pub struct SharedAllocator;
 
 impl UsmAllocatorKind for SharedAllocator {
-    unsafe fn alloc(alignment: usize, bytes: usize, queue: &Queue) -> CxxResult<*mut u8> {
-        unsafe { ffi::aligned_alloc_shared(alignment, bytes, &queue.0) }
+    unsafe fn alloc(alignment: usize, num_bytes: usize, queue: &Queue) -> CxxResult<*mut u8> {
+        unsafe { ffi::aligned_alloc_shared(alignment, num_bytes, &queue.0) }
     }
 }