Skip to content

Perf: inline function of complexarray #5964

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 7, 2025
Merged

Perf: inline function of complexarray #5964

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
183f8a2
inline function of complexarray
dzzz2001 Mar 5, 2025
629d9e0
Merge branch 'develop' into inline
dzzz2001 Mar 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 0 additions & 14 deletions source/module_base/complexarray.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,18 +262,4 @@ void point_mult(ComplexArray &in1, ComplexArray &in2, ComplexArray &out){
in1.ptr[i].real() * in2.ptr[i].imag() +
in1.ptr[i].imag() * in2.ptr[i].real());}
}
const std::complex <double> &ComplexArray::operator()(const int ind1, const int ind2, const int ind3, const int ind4) const{
assert(ind1>=0); assert(ind1<bound1);
assert(ind2>=0); assert(ind2<bound2);
assert(ind3>=0); assert(ind3<bound3);
assert(ind4>=0); assert(ind4<bound4);
const int ind = ((ind1 * bound2 + ind2) * bound3 + ind3) * bound4 + ind4;
return ptr[ind];}
std::complex<double>& ComplexArray::operator()(const int ind1,const int ind2,const int ind3,const int ind4){
assert(ind1>=0); assert(ind1<bound1);
assert(ind2>=0); assert(ind2<bound2);
assert(ind3>=0); assert(ind3<bound3);
assert(ind4>=0); assert(ind4<bound4);
const int ind = ((ind1 * bound2 + ind2) * bound3 + ind3) * bound4 + ind4;
return ptr[ind];}
}
21 changes: 19 additions & 2 deletions source/module_base/complexarray.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include <iostream>
#include <fstream>
#include <iomanip>
#include <cassert>

namespace ModuleBase
{
Expand Down Expand Up @@ -58,11 +59,27 @@ class ComplexArray

/// overloaded subscript operator for non-const std::complex Array const reference return creates an lvakue
std::complex <double> &operator()
(const int ind1=0, const int ind2=0, const int ind3=0, const int ind4=0);
(const int ind1=0, const int ind2=0, const int ind3=0, const int ind4=0)
{
assert(ind1>=0); assert(ind1<bound1);
assert(ind2>=0); assert(ind2<bound2);
assert(ind3>=0); assert(ind3<bound3);
assert(ind4>=0); assert(ind4<bound4);
const int ind = ((ind1 * bound2 + ind2) * bound3 + ind3) * bound4 + ind4;
return ptr[ind];
};
// std::complex < double> &operator()(int, int, int, int, int);
/// overloaded subscript operator for const std::complex Array const reference return creates an cvakue
const std::complex <double> &operator()
(const int ind1=0, const int ind2=0, const int ind3=0, const int ind4=0)const;
(const int ind1=0, const int ind2=0, const int ind3=0, const int ind4=0) const
{
assert(ind1>=0); assert(ind1<bound1);
assert(ind2>=0); assert(ind2<bound2);
assert(ind3>=0); assert(ind3<bound3);
assert(ind4>=0); assert(ind4<bound4);
const int ind = ((ind1 * bound2 + ind2) * bound3 + ind3) * bound4 + ind4;
return ptr[ind];
};
// const std::complex < double> &operator()(int, int, int, int, int)const;

/****************************************************
Expand Down
Loading