Skip to content

[Fix] Fix problems in the latest develop version causing compilation error on DSP hardware. #6577

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
mohanchen merged 2 commits into from
Oct 10, 2025
Merged

[Fix] Fix problems in the latest develop version causing compilation error on DSP hardware. #6577

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
f7de476
Initial Commit
Critsium-xy Oct 10, 2025
b3f57e1
Optimize Compilation experience on DSP
Critsium-xy Oct 10, 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
4 changes: 4 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,8 +481,12 @@ else()
find_package(Lapack REQUIRED)
include_directories(${FFTW3_INCLUDE_DIRS})
list(APPEND math_libs FFTW3::FFTW3 LAPACK::LAPACK BLAS::BLAS)
if(USE_DSP)
target_link_libraries(${ABACUS_BIN_NAME} ${SCALAPACK_LIBRARY_DIR})
else()
find_package(ScaLAPACK REQUIRED)
list(APPEND math_libs ScaLAPACK::ScaLAPACK)
endif()
if(USE_OPENMP)
list(APPEND math_libs FFTW3::FFTW3_OMP)
endif()
Expand Down
1 change: 1 addition & 0 deletions source/source_base/module_fft/fft_dsp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#include "fft_dsp.h"

#include "source_base/global_variable.h"
#include "source_base/global_function.h"

#include <iostream>
#include <string.h>
Expand Down
4 changes: 2 additions & 2 deletions source/source_pw/module_pwdft/VSep_in_pw.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ double shell_cut(double r, double r_in, double r_out, double r_power)
}
} // namespace

VSep::VSep() noexcept = default;
VSep::VSep() = default;

VSep::~VSep() noexcept = default;
VSep::~VSep() = default;

void VSep::init_vsep(const ModulePW::PW_Basis& rho_basis, const Sep_Cell& sep_cell)
{
Expand Down
4 changes: 2 additions & 2 deletions source/source_pw/module_pwdft/VSep_in_pw.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
class VSep
{
public:
VSep() noexcept;
~VSep() noexcept;
VSep();
~VSep();

void init_vsep(const ModulePW::PW_Basis& rho_basis, const Sep_Cell& sep_cell);
void generate_vsep_r(const ModulePW::PW_Basis& rho_basis, const ModuleBase::ComplexMatrix& sf_in, const Sep_Cell& sep_cell);
Expand Down
2 changes: 1 addition & 1 deletion source/source_pw/module_pwdft/operator_pw/veff_pw.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ void Veff<OperatorPW<T, Device>>::act(
#ifdef __DSP
if (npol == 1)
{
ModulePW::FFT_Guard guard(wfcpw->fft_bundle);
ModuleBase::FFT_Guard guard(wfcpw->fft_bundle);
for (int ib = 0; ib < nbands; ib += npol)
{
wfcpw->convolution(this->ctx,
Expand Down
Loading