From eb398414181a66c592be3301f679a901c62257b5 Mon Sep 17 00:00:00 2001 From: linpz Date: Wed, 20 Nov 2024 17:31:23 +0800 Subject: [PATCH 1/3] fix bug: change Mixing_Data::length from int to size_t --- source/module_base/module_mixing/mixing_data.cpp | 4 ++-- source/module_base/module_mixing/mixing_data.h | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/source/module_base/module_mixing/mixing_data.cpp b/source/module_base/module_mixing/mixing_data.cpp index 6c41757ee3..5a40799f90 100644 --- a/source/module_base/module_mixing/mixing_data.cpp +++ b/source/module_base/module_mixing/mixing_data.cpp @@ -3,7 +3,7 @@ namespace Base_Mixing { -Mixing_Data::Mixing_Data(const int& ndim, const int& length, const size_t& type_size) +Mixing_Data::Mixing_Data(const int& ndim, const std::size_t& length, const size_t& type_size) { this->ndim_tot = ndim; this->length = length; @@ -19,7 +19,7 @@ Mixing_Data::~Mixing_Data() free(this->data); } -void Mixing_Data::resize(const int& ndim, const int& length, const size_t& type_size) +void Mixing_Data::resize(const int& ndim, const std::size_t& length, const size_t& type_size) { this->ndim_tot = ndim; this->length = length; diff --git a/source/module_base/module_mixing/mixing_data.h b/source/module_base/module_mixing/mixing_data.h index 69c2629c65..e5986f7faa 100644 --- a/source/module_base/module_mixing/mixing_data.h +++ b/source/module_base/module_mixing/mixing_data.h @@ -22,7 +22,7 @@ class Mixing_Data * @param type_size size of type * */ - Mixing_Data(const int& ndim, const int& length, const size_t& type_size); + Mixing_Data(const int& ndim, const std::size_t& length, const size_t& type_size); /** * @brief Destroy the Mixing_Data object @@ -38,7 +38,7 @@ class Mixing_Data * @param type_size size of type * */ - void resize(const int& ndim, const int& length, const size_t& type_size); + void resize(const int& ndim, const std::size_t& length, const size_t& type_size); /** * @brief push data to the tensor @@ -54,7 +54,7 @@ class Mixing_Data #ifdef _OPENMP #pragma omp parallel for schedule(static, 4096/sizeof(FPTYPE)) #endif - for (int i = 0; i < length; ++i) + for (std::size_t i = 0; i < length; ++i) { FP_startdata[i] = data_in[i]; } @@ -86,7 +86,7 @@ class Mixing_Data // the number of vectors for mixing int ndim_tot = 0; // the length of each vector - int length = 0; + std::size_t length = 0; // the start index for vector: start = this->index_move(0) int start = -1; // the number of used vectors for mixing From 020da17168e05cbb529468ebce09d8ea1bfbfcb8 Mon Sep 17 00:00:00 2001 From: linpz Date: Wed, 20 Nov 2024 18:44:44 +0800 Subject: [PATCH 2/3] fix bug: change Mixing_Data::length from int to size_t --- source/module_base/module_mixing/pulay_mixing.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/source/module_base/module_mixing/pulay_mixing.cpp b/source/module_base/module_mixing/pulay_mixing.cpp index e3ad3b3f70..9c9c10a7bd 100644 --- a/source/module_base/module_mixing/pulay_mixing.cpp +++ b/source/module_base/module_mixing/pulay_mixing.cpp @@ -28,13 +28,13 @@ void Pulay_Mixing::tem_push_data(Mixing_Data& mdata, std::function mix, const bool& need_calcoef) { - const size_t length = mdata.length; + const std::size_t length = mdata.length; std::vector F_tmp(length); #ifdef _OPENMP #pragma omp parallel for schedule(static, 4096 / sizeof(FPTYPE)) #endif - for (int i = 0; i < length; ++i) + for (std::size_t i = 0; i < length; ++i) { F_tmp[i] = data_out[i] - data_in[i]; } @@ -69,7 +69,7 @@ void Pulay_Mixing::tem_push_data(Mixing_Data& mdata, #ifdef _OPENMP #pragma omp parallel for schedule(static, 4096 / sizeof(FPTYPE)) #endif - for (int i = 0; i < length; ++i) + for (std::size_t i = 0; i < length; ++i) { FP_F[i] = F_tmp[i]; } @@ -81,7 +81,7 @@ void Pulay_Mixing::tem_push_data(Mixing_Data& mdata, #ifdef _OPENMP #pragma omp parallel for schedule(static, 4096 / sizeof(FPTYPE)) #endif - for (int i = 0; i < length; ++i) + for (std::size_t i = 0; i < length; ++i) { FP_startF[i] = F_tmp[i]; } @@ -103,7 +103,7 @@ void Pulay_Mixing::tem_cal_coef(const Mixing_Data& mdata, std::function(F); if (mdata.ndim_use > 1) From e21c139f9b8f337a61d3a4129e89744c6206416f Mon Sep 17 00:00:00 2001 From: "pre-commit-ci-lite[bot]" <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com> Date: Wed, 20 Nov 2024 15:47:44 +0000 Subject: [PATCH 3/3] [pre-commit.ci lite] apply automatic fixes --- source/module_base/module_mixing/mixing_data.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/source/module_base/module_mixing/mixing_data.cpp b/source/module_base/module_mixing/mixing_data.cpp index 5a40799f90..27d3292a72 100644 --- a/source/module_base/module_mixing/mixing_data.cpp +++ b/source/module_base/module_mixing/mixing_data.cpp @@ -15,16 +15,18 @@ Mixing_Data::Mixing_Data(const int& ndim, const std::size_t& length, const size_ Mixing_Data::~Mixing_Data() { - if (this->data != nullptr) + if (this->data != nullptr) { free(this->data); } +} void Mixing_Data::resize(const int& ndim, const std::size_t& length, const size_t& type_size) { this->ndim_tot = ndim; this->length = length; - if (this->data != nullptr) + if (this->data != nullptr) { free(this->data); +} if (ndim * length > 0) { this->data = malloc(ndim * length * type_size);