Skip to content

Commit 6b53ec6

Browse files
committed
Revert "Fix dsp linking order to put ScaLapack after Openblas"
This reverts commit 4eb3334.
1 parent 4eb3334 commit 6b53ec6

1 file changed

Lines changed: 1 addition & 9 deletions

File tree

source/CMakeLists.txt

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -176,12 +176,7 @@ elseif(USE_SW)
176176
${SW_MATH}/libswblas.a
177177
gfortran)
178178
else()
179-
# The DSP ScaLAPACK bundles BLAS objects built without OpenMP support.
180-
# The linker resolves BLAS symbols from the first library that provides
181-
# them, so the standalone BLAS must precede ScaLAPACK on the link line;
182-
# otherwise the bundled non-OpenMP BLAS wins and OpenBLAS aborts with
183-
# "Detect OpenMP Loop" once ABACUS calls it from an OpenMP region.
184-
if(ENABLE_MPI AND NOT USE_DSP)
179+
if(ENABLE_MPI)
185180
list(APPEND _abacus_linalg_libs ScaLAPACK::ScaLAPACK)
186181
endif()
187182
if(ENABLE_OPENMP)
@@ -191,9 +186,6 @@ else()
191186
FFTW3::FFTW3
192187
LAPACK::LAPACK
193188
BLAS::BLAS)
194-
if(ENABLE_MPI AND USE_DSP)
195-
list(APPEND _abacus_linalg_libs ScaLAPACK::ScaLAPACK)
196-
endif()
197189
list(APPEND _abacus_linalg_include_dirs ${FFTW3_INCLUDE_DIRS})
198190
if(ENABLE_FLOAT_FFTW)
199191
list(APPEND _abacus_linalg_libs FFTW3::FFTW3_FLOAT)

0 commit comments

Comments
 (0)