remove trailing whitespace

Author: hipudding

ggml/src/ggml-cann/aclnn_ops.cpp

@@ -450,7 +450,7 @@ void ggml_cann_acc(ggml_backend_cann_context& ctx, ggml_tensor* dst) {
 
     if (!inplace) {
         size_t cpy_size = ggml_nbytes(dst);
-        ggml_cann_async_memcpy(ctx, dst->data, src0->data, cpy_size, 
+        ggml_cann_async_memcpy(ctx, dst->data, src0->data, cpy_size,
             ACL_MEMCPY_DEVICE_TO_DEVICE);
         aclTensor* acl_src0 = ggml_cann_create_tensor(
             src0, src1->ne, src0->nb, GGML_MAX_DIMS, ACL_FORMAT_ND, offset);
@@ -991,7 +991,7 @@ static void ggml_cann_im2col_1d_post_process(
                              c * KH * KW * n_step_w * ggml_type_size(dst->type);
 
             for (int i = 0; i < n_step_w; i++) {
-                ggml_cann_async_memcpy(ctx, cur_dst_buffer, cur_permute_buffer, size_cpy, 
+                ggml_cann_async_memcpy(ctx, cur_dst_buffer, cur_permute_buffer, size_cpy,
                     ACL_MEMCPY_DEVICE_TO_DEVICE);
                 cur_dst_buffer =
                     (char*)cur_dst_buffer + KH * KW * ggml_type_size(dst->type);
@@ -1002,7 +1002,7 @@ static void ggml_cann_im2col_1d_post_process(
     } else {
         offset = KH * KW * n_step_w *
                  ggml_type_size(dst->type);  // equal to ggml_nbytes(dst)
-        ggml_cann_async_memcpy(ctx, dst->data, (char*)tmp_permute_buffer + offset, offset, 
+        ggml_cann_async_memcpy(ctx, dst->data, (char*)tmp_permute_buffer + offset, offset,
             ACL_MEMCPY_DEVICE_TO_DEVICE);
     }
 
@@ -1102,7 +1102,7 @@ void ggml_cann_im2col(ggml_backend_cann_context& ctx, ggml_tensor* dst) {
                                          tmp_im2col_tensor, im2col_op_params);
     }
 
-    ggml_cann_release_resources(ctx, acl_src1, tmp_im2col_tensor, tmp_cast_tensor, 
+    ggml_cann_release_resources(ctx, acl_src1, tmp_im2col_tensor, tmp_cast_tensor,
         kernel_size, dilations, paddings, strides);
 }
 
@@ -1239,7 +1239,7 @@ void ggml_cann_timestep_embedding(ggml_backend_cann_context& ctx,
 
     // release
     // segmentation fault when delete both tensorList and his elements.
-    ggml_cann_release_resources(ctx, tensor_list, acl_src, tmp_arange_tensor, 
+    ggml_cann_release_resources(ctx, tensor_list, acl_src, tmp_arange_tensor,
         tmp_permute_tensor, tmp_mul_tensor, acl_dst);
 }
 
@@ -1430,8 +1430,8 @@ static void aclnn_alibi(ggml_backend_cann_context& ctx, aclTensor* acl_src,
 
     // add
     aclnn_add(ctx, tmp_output_tensor, acl_src, acl_dst);
-    ggml_cann_release_resources(ctx, tmp_arange1_tensor, tmp_arange2_tensor, 
-        tmp_mk_base1_tensor, tmp_mk_base2_tensor, tmp_mk_base_tensor, 
+    ggml_cann_release_resources(ctx, tmp_arange1_tensor, tmp_arange2_tensor,
+        tmp_mk_base1_tensor, tmp_mk_base2_tensor, tmp_mk_base_tensor,
         tmp_arange_tensor, tmp_mk_tensor, tmp_output_tensor);
 }
 
@@ -1563,7 +1563,7 @@ void ggml_cann_softmax(ggml_backend_cann_context& ctx, ggml_tensor* dst) {
         aclnn_softmax(ctx, acl_input_mul_scale_tensor, 3, acl_dst);
     }
 
-    ggml_cann_release_resources(ctx, acl_src0, acl_src1_fp32_tensor, acl_dst, 
+    ggml_cann_release_resources(ctx, acl_src0, acl_src1_fp32_tensor, acl_dst,
         acl_scale, acl_input_mul_scale_tensor, tmp_mask_tensor);
 }
 
@@ -2076,7 +2076,7 @@ static void aclnn_cache_init(ggml_backend_cann_context& ctx, ggml_tensor* dst,
 
     // power
     aclScalar* acl_theta_scale = aclCreateScalar(&theta_scale, aclDataType::ACL_FLOAT);
-    GGML_CANN_CALL_ACLNN_OP(ctx, PowScalarTensor, acl_theta_scale, acl_theta_scale_tensor, 
+    GGML_CANN_CALL_ACLNN_OP(ctx, PowScalarTensor, acl_theta_scale, acl_theta_scale_tensor,
                             acl_theta_scale_tensor);
 
     // freq_scale
@@ -2159,7 +2159,7 @@ static void aclnn_cache_init(ggml_backend_cann_context& ctx, ggml_tensor* dst,
     }
 
     // release
-    ggml_cann_release_resources(ctx, acl_theta_scale_tensor, acl_position_tensor, 
+    ggml_cann_release_resources(ctx, acl_theta_scale_tensor, acl_position_tensor,
         acl_theta_tensor, acl_sin_tensor, acl_cos_tensor, acl_theta_scale);
 }
 
@@ -2307,7 +2307,7 @@ void ggml_cann_rope(ggml_backend_cann_context& ctx, ggml_tensor* dst) {
         int64_t shifts[] = {src0->ne[0] / 2};
         int64_t dims[] = {3};
         aclnn_roll(ctx, acl_input_tensor, acl_input_roll_tensor, shifts, dims);
-        
+
         ggml_cann_release_resources(ctx, acl_input_roll_tensor, acl_input_tensor);
         // init [-1, -1, -1, 1, 1，1，...]
         minus_one_scale_buffer = minus_one_scale_allocator.get();
@@ -2411,7 +2411,7 @@ void ggml_cann_rope(ggml_backend_cann_context& ctx, ggml_tensor* dst) {
 
     switch (src0->type) {
         case GGML_TYPE_F32: {
-            GGML_CANN_CALL_ACLNN_OP(ctx, RotaryPositionEmbedding, acl_src, 
+            GGML_CANN_CALL_ACLNN_OP(ctx, RotaryPositionEmbedding, acl_src,
                 acl_cos_reshape_tensor, acl_sin_reshape_tensor, acl_mode, acl_dst);
             break;
         }
@@ -2438,8 +2438,8 @@ void ggml_cann_rope(ggml_backend_cann_context& ctx, ggml_tensor* dst) {
 
             aclnn_cast(ctx, acl_src, acl_src_trans_tensor, ACL_FLOAT);
 
-            GGML_CANN_CALL_ACLNN_OP(ctx, RotaryPositionEmbedding, acl_src_trans_tensor, 
-                acl_cos_reshape_tensor, acl_sin_reshape_tensor, acl_mode, 
+            GGML_CANN_CALL_ACLNN_OP(ctx, RotaryPositionEmbedding, acl_src_trans_tensor,
+                acl_cos_reshape_tensor, acl_sin_reshape_tensor, acl_mode,
                 acl_dst_trans_tensor);
 
             aclnn_cast(ctx, acl_dst_trans_tensor, acl_dst, ACL_FLOAT16);
@@ -2452,7 +2452,7 @@ void ggml_cann_rope(ggml_backend_cann_context& ctx, ggml_tensor* dst) {
             GGML_ABORT("Unsupported tensor type for GGML_OP_ROPE");
             break;
     }
-    ggml_cann_release_resources(ctx, acl_cos_reshape_tensor, 
+    ggml_cann_release_resources(ctx, acl_cos_reshape_tensor,
         acl_sin_reshape_tensor, acl_src, acl_dst);
 }
 

ggml/src/ggml-cann/aclnn_ops.h

@@ -721,7 +721,7 @@ using any_acl_resource = std::unique_ptr<void, std::function<void(void*)>>;
 
 /**
  * @brief Trait structure used to define how to destroy a given ACL resource type.
- * 
+ *
  * @tparam T ACL resource type.
  */
 template<typename T>
@@ -769,7 +769,7 @@ struct acl_resource_traits<aclTensorList> {
 
 /**
  * @brief Creates a generic ACL resource wrapper with proper destruction logic.
- * 
+ *
  * @tparam T ACL resource type.
  * @param ptr Raw pointer to ACL resource.
  * @return any_acl_resource Smart pointer that handles destruction.
@@ -786,7 +786,7 @@ any_acl_resource make_acl_resource(T* ptr) {
 
 /**
  * @brief Registers multiple ACL resources into a vector for lifetime management.
- * 
+ *
  * @tparam Args Variadic list of ACL resource types.
  * @param vec Target vector to hold ACL resources.
  * @param args Raw pointers to ACL resources.
@@ -863,7 +863,7 @@ class async_memset_task : public cann_task {
     public:
     async_memset_task(void* buffer, size_t size, int32_t value, aclrtStream stream)
             : buffer_(buffer), size_(size), value_(value), stream_(stream) {}
-    
+
         virtual void run_task() override {
             ACL_CHECK(aclrtMemsetAsync(buffer_, size_, value_, size_, stream_));
         }
@@ -914,14 +914,14 @@ class async_memset_task : public cann_task {
     } while (0)
 
 /**
- * @brief Registers and releases multiple ACL resources, optionally deferring the release 
+ * @brief Registers and releases multiple ACL resources, optionally deferring the release
  *        using a task.
- * 
+ *
  * @tparam Args Types of the ACL resources.
  * @param ctx Backend context which manages task submission and async mode.
  * @param args Pointers to ACL resources to be released.
  */
-template <typename... Args> 
+template <typename... Args>
 void ggml_cann_release_resources(ggml_backend_cann_context & ctx, Args &&... args) {
     std::vector<any_acl_resource> resources;
     register_acl_resources(resources, std::forward<Args>(args)...);
@@ -933,7 +933,7 @@ void ggml_cann_release_resources(ggml_backend_cann_context & ctx, Args &&... arg
 
 /**
  * @brief Performs an asynchronous memory copy operation, optionally deferred via task submission.
- * 
+ *
  * @param ctx Backend context containing stream and async configuration.
  * @param dst Destination memory address.
  * @param src Source memory address.
@@ -962,7 +962,7 @@ inline void ggml_cann_async_memcpy(ggml_backend_cann_context * ctx, void * dst,
 
 /**
  * @brief Performs an asynchronous memory set operation, optionally deferred via task submission.
- * 
+ *
  * @param ctx Backend context containing stream and async configuration.
  * @param buffer Memory buffer to be set.
  * @param size Size of the memory buffer (in bytes).

ggml/src/ggml-cann/common.h

@@ -220,7 +220,7 @@ using aclnn_func_t = aclnnStatus (*)(void*, uint64_t, aclOpExecutor*, aclrtStrea
 
 /**
  * @brief Base class for all CANN tasks to be submitted to the task queue.
- * 
+ *
  * Users should override the run_task() method with actual task logic.
  */
 class cann_task {
@@ -235,7 +235,7 @@ class cann_task_queue {
 public:
     /**
      * @brief Constructs a task queue with a fixed power-of-two capacity for a specific device.
-     * 
+     *
      * @param capacity Queue capacity. Must be a power of 2.
      * @param device Target device ID (used for context setting).
      */
@@ -248,7 +248,7 @@ class cann_task_queue {
 
     /**
      * @brief Attempts to enqueue a task into the queue.
-     * 
+     *
      * @param item Unique pointer to the task.
      * @return true if the task was successfully enqueued, false if the queue was full.
      */
@@ -268,20 +268,20 @@ class cann_task_queue {
 
     /**
      * @brief Submits a task to the queue, and starts the worker thread if not already running.
-     * 
+     *
      * @param task Task to be submitted.
      */
     void submit_task(std::unique_ptr<cann_task>&& task) {
         while(!enqueue(std::move(task))) {
             std::this_thread::yield();
             continue;
         }
-        
+
         if (!running_) {
             running_ = true;
             thread_ = std::thread(&cann_task_queue::execute, this);
         }
-        
+
     }
 
     /**

ggml/src/ggml-cann/ggml-cann.cpp

@@ -1791,7 +1791,7 @@ static void ggml_backend_cann_free(ggml_backend_t backend) {
 /**
  * @brief Sets tensor data asynchronously in the CANN backend.
  *
- * This function asynchronously sets tensor data in the CANN backend. 
+ * This function asynchronously sets tensor data in the CANN backend.
  *
  * @param backend Pointer to the CANN backend structure.
  * @param tensor Pointer to the tensor structure to set data for.
@@ -1813,14 +1813,14 @@ static void ggml_backend_cann_set_tensor_async(ggml_backend_t backend,
         "unsupported buffer type");
     GGML_ASSERT(!ggml_is_quantized(tensor->type));
 
-    ggml_cann_async_memcpy(cann_ctx, (char *)tensor->data + offset, data, size, 
+    ggml_cann_async_memcpy(cann_ctx, (char *)tensor->data + offset, data, size,
         ACL_MEMCPY_HOST_TO_DEVICE);
 }
 
 /**
  * @brief Gets tensor data asynchronously in the CANN backend.
  *
- * This function asynchronously gets tensor data in the CANN backend. 
+ * This function asynchronously gets tensor data in the CANN backend.
  *
  * @param backend Pointer to the CANN backend structure.
  * @param tensor Pointer to the tensor structure to get data from.
@@ -1842,7 +1842,7 @@ static void ggml_backend_cann_get_tensor_async(
 
     ggml_cann_async_memcpy(cann_ctx, data, (char *)tensor->data + offset, size,
         ACL_MEMCPY_DEVICE_TO_HOST);
-   
+
 }
 
 /**