Skip to content

Commit 7dcc282

Browse files
linpeizePeizeLinpre-commit-ci-lite[bot]
authored
fix bug: change Mixing_Data::length from int to size_t (#5545)
* fix bug: change Mixing_Data::length from int to size_t * fix bug: change Mixing_Data::length from int to size_t * [pre-commit.ci lite] apply automatic fixes --------- Co-authored-by: linpz <[email protected]> Co-authored-by: pre-commit-ci-lite[bot] <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com>
1 parent c7e46be commit 7dcc282

File tree

3 files changed

+15
-13
lines changed

3 files changed

+15
-13
lines changed

source/module_base/module_mixing/mixing_data.cpp

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
namespace Base_Mixing
44
{
55

6-
Mixing_Data::Mixing_Data(const int& ndim, const int& length, const size_t& type_size)
6+
Mixing_Data::Mixing_Data(const int& ndim, const std::size_t& length, const size_t& type_size)
77
{
88
this->ndim_tot = ndim;
99
this->length = length;
@@ -15,16 +15,18 @@ Mixing_Data::Mixing_Data(const int& ndim, const int& length, const size_t& type_
1515

1616
Mixing_Data::~Mixing_Data()
1717
{
18-
if (this->data != nullptr)
18+
if (this->data != nullptr) {
1919
free(this->data);
2020
}
21+
}
2122

22-
void Mixing_Data::resize(const int& ndim, const int& length, const size_t& type_size)
23+
void Mixing_Data::resize(const int& ndim, const std::size_t& length, const size_t& type_size)
2324
{
2425
this->ndim_tot = ndim;
2526
this->length = length;
26-
if (this->data != nullptr)
27+
if (this->data != nullptr) {
2728
free(this->data);
29+
}
2830
if (ndim * length > 0)
2931
{
3032
this->data = malloc(ndim * length * type_size);

source/module_base/module_mixing/mixing_data.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class Mixing_Data
2222
* @param type_size size of type
2323
*
2424
*/
25-
Mixing_Data(const int& ndim, const int& length, const size_t& type_size);
25+
Mixing_Data(const int& ndim, const std::size_t& length, const size_t& type_size);
2626

2727
/**
2828
* @brief Destroy the Mixing_Data object
@@ -38,7 +38,7 @@ class Mixing_Data
3838
* @param type_size size of type
3939
*
4040
*/
41-
void resize(const int& ndim, const int& length, const size_t& type_size);
41+
void resize(const int& ndim, const std::size_t& length, const size_t& type_size);
4242

4343
/**
4444
* @brief push data to the tensor
@@ -54,7 +54,7 @@ class Mixing_Data
5454
#ifdef _OPENMP
5555
#pragma omp parallel for schedule(static, 4096/sizeof(FPTYPE))
5656
#endif
57-
for (int i = 0; i < length; ++i)
57+
for (std::size_t i = 0; i < length; ++i)
5858
{
5959
FP_startdata[i] = data_in[i];
6060
}
@@ -86,7 +86,7 @@ class Mixing_Data
8686
// the number of vectors for mixing
8787
int ndim_tot = 0;
8888
// the length of each vector
89-
int length = 0;
89+
std::size_t length = 0;
9090
// the start index for vector: start = this->index_move(0)
9191
int start = -1;
9292
// the number of used vectors for mixing

source/module_base/module_mixing/pulay_mixing.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ void Pulay_Mixing::tem_push_data(Mixing_Data& mdata,
2828
std::function<void(FPTYPE*, const FPTYPE*, const FPTYPE*)> mix,
2929
const bool& need_calcoef)
3030
{
31-
const size_t length = mdata.length;
31+
const std::size_t length = mdata.length;
3232
std::vector<FPTYPE> F_tmp(length);
3333

3434
#ifdef _OPENMP
3535
#pragma omp parallel for schedule(static, 4096 / sizeof(FPTYPE))
3636
#endif
37-
for (int i = 0; i < length; ++i)
37+
for (std::size_t i = 0; i < length; ++i)
3838
{
3939
F_tmp[i] = data_out[i] - data_in[i];
4040
}
@@ -69,7 +69,7 @@ void Pulay_Mixing::tem_push_data(Mixing_Data& mdata,
6969
#ifdef _OPENMP
7070
#pragma omp parallel for schedule(static, 4096 / sizeof(FPTYPE))
7171
#endif
72-
for (int i = 0; i < length; ++i)
72+
for (std::size_t i = 0; i < length; ++i)
7373
{
7474
FP_F[i] = F_tmp[i];
7575
}
@@ -81,7 +81,7 @@ void Pulay_Mixing::tem_push_data(Mixing_Data& mdata,
8181
#ifdef _OPENMP
8282
#pragma omp parallel for schedule(static, 4096 / sizeof(FPTYPE))
8383
#endif
84-
for (int i = 0; i < length; ++i)
84+
for (std::size_t i = 0; i < length; ++i)
8585
{
8686
FP_startF[i] = F_tmp[i];
8787
}
@@ -103,7 +103,7 @@ void Pulay_Mixing::tem_cal_coef(const Mixing_Data& mdata, std::function<double(F
103103
ModuleBase::WARNING_QUIT(
104104
"Pulay_mixing",
105105
"One Pulay_Mixing object can only bind one Mixing_Data object to calculate coefficients");
106-
const int length = mdata.length;
106+
const std::size_t length = mdata.length;
107107
FPTYPE* FP_F = static_cast<FPTYPE*>(F);
108108

109109
if (mdata.ndim_use > 1)

0 commit comments

Comments
 (0)