Skip to content

Commit df20b6b

Browse files
tcadusertcaduser
committed
upgrade to superlu 5.3
1 parent 79f26d7 commit df20b6b

27 files changed

+73
-61
lines changed

‎.gitmodules‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
[submodule "external/symdiff"]
22
path = external/symdiff
33
url = ../symdiff.git
4+
[submodule "external/superlu"]
5+
path = external/superlu
6+
url = https://github.com/xiaoyeli/superlu.git

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ set (CMAKE_CXX_STANDARD 17)
1313
INCLUDE(${PROJECT_SOURCE_DIR}/cmake/${DEVSIM_CONFIG}.cmake)
1414
INCLUDE(${PROJECT_SOURCE_DIR}/local.cmake OPTIONAL)
1515

16-
ADD_DEFINITIONS(-DDEVSIM_VERSION_STRING=\"2.1.1\")
16+
ADD_DEFINITIONS(-DDEVSIM_VERSION_STRING=\"2.2.0\")
1717
ADD_DEFINITIONS(-DDEVSIM_COPYRIGHT_YEAR=\"2009-2022\")
1818
1919
IF (MKL_PARDISO)

‎cmake/appveyor.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ SET (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /SAFESEH:NO")
3232

3333
# windows build
3434

35-
SET (SUPERLULOCATE ${CMAKE_SOURCE_DIR}/external/SuperLU_4.3)
36-
SET (SUPERLU_ARCHIVE ${SUPERLULOCATE}/${BUILDDIR}/Release/superlu.lib)
35+
SET (SUPERLULOCATE ${CMAKE_SOURCE_DIR}/external/superlu)
36+
SET (SUPERLU_ARCHIVE ${SUPERLULOCATE}/${BUILDDIR}/SRC/Release/superlu.lib)
3737
SET (SUPERLU_INCLUDE ${SUPERLULOCATE}/SRC)
3838

3939
SET (BLAS_ARCHIVE ${CONDA_PREFIX}/Library/lib/mkl_rt.lib)

‎cmake/centos_6.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ SET (BLAS_ARCHIVE -L${MKL_LIB_DIR} -Wl,--no-as-needed -lmkl_rt -lpthread -lm -ld
2020
SET (EXTENDED_BLAS_ARCHIVE ${EXTERNAL_LIB}/getrf/build/libgetrf.a)
2121

2222

23-
SET (SUPERLULOCATE ${EXTERNAL_LIB}/SuperLU_4.3)
23+
SET (SUPERLULOCATE ${EXTERNAL_LIB}/superlu)
2424
SET (SUPERLU_INCLUDE ${SUPERLULOCATE}/SRC)
25-
SET (SUPERLU_ARCHIVE ${SUPERLULOCATE}/lib/libsuperlu_4.3.a)
25+
SET (SUPERLU_ARCHIVE ${SUPERLULOCATE}/build/SRC/libsuperlu.a)
2626

2727
SET (SQLITE3_INCLUDE ${CONDA_PREFIX}/include)
2828
SET (SQLITE3_ARCHIVE -L${TMPLIBPATH} -lsqlite3)

‎cmake/msys.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ SET (BOOST_INCLUDE "${CONDA_PREFIX}/Library/include")
1414

1515
# windows build
1616

17-
SET (SUPERLULOCATE ${CMAKE_SOURCE_DIR}/external/SuperLU_4.3)
18-
SET (SUPERLU_ARCHIVE ${SUPERLULOCATE}/msys/libsuperlu.a)
17+
SET (SUPERLULOCATE ${CMAKE_SOURCE_DIR}/external/superlu)
18+
SET (SUPERLU_ARCHIVE ${SUPERLULOCATE}/msys/SRC/libsuperlu.a)
1919
SET (SUPERLU_INCLUDE ${SUPERLULOCATE}/SRC)
2020

2121
SET (BLAS_ARCHIVE ${CONDA_PREFIX}/Library/lib/mkl_rt.lib)

‎cmake/osx_10.10.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ SET (BOOST_INCLUDE "${CONDA_PREFIX}/include")
99

1010
SET (BLAS_ARCHIVE -weak-lblas -weak-llapack)
1111
SET (EXTERNAL_LIB ${PROJECT_SOURCE_DIR}/external)
12-
SET (SUPERLULOCATE ${EXTERNAL_LIB}/SuperLU_4.3)
12+
SET (SUPERLULOCATE ${EXTERNAL_LIB}/superlu)
1313
SET (SUPERLU_INCLUDE ${SUPERLULOCATE}/SRC)
14-
SET (SUPERLU_ARCHIVE ${SUPERLULOCATE}/lib/libsuperlu_4.3_x86_64.a)
14+
SET (SUPERLU_ARCHIVE ${SUPERLULOCATE}/build/SRC/libsuperlu.a)
1515
SET (SQLITE3_ARCHIVE "-lsqlite3")
1616
SET (SQLITE3_INCLUDE "/usr/include")
1717
SET (ZLIB_INCLUDE "/usr/include")

‎cmake/osx_gcc.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ SET (BLAS_ARCHIVE -L${MKL_LIB_DIR} -lmkl_rt -lm -ldl)
1818
SET (EXTENDED_BLAS_ARCHIVE ${EXTERNAL_LIB}/getrf/build/libgetrf.a)
1919

2020

21-
SET (SUPERLULOCATE ${EXTERNAL_LIB}/SuperLU_4.3)
21+
SET (SUPERLULOCATE ${EXTERNAL_LIB}/superlu)
2222
SET (SUPERLU_INCLUDE ${SUPERLULOCATE}/SRC)
23-
SET (SUPERLU_ARCHIVE ${SUPERLULOCATE}/lib/libsuperlu_4.3_x86_64.a)
23+
SET (SUPERLU_ARCHIVE ${SUPERLULOCATE}/build/SRC/libsuperlu.a)
2424

2525
SET (SQLITE3_INCLUDE ${CONDA_PREFIX}/include)
2626
SET (SQLITE3_ARCHIVE -lsqlite3)

‎cmake/ubuntu_18.04.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ SET (ZLIB_ARCHIVE -lz )
1111
SET (SQLITE3_ARCHIVE -lsqlite3)
1212

1313

14-
SET (SUPERLULOCATE ${EXTERNAL_LIB}/SuperLU_4.3)
14+
SET (SUPERLULOCATE ${EXTERNAL_LIB}/superlu)
1515
SET (SUPERLU_INCLUDE ${SUPERLULOCATE}/SRC)
16-
SET (SUPERLU_ARCHIVE ${SUPERLULOCATE}/lib/libsuperlu_4.3.a)
16+
SET (SUPERLU_ARCHIVE ${SUPERLULOCATE}/build/SRC/libsuperlu.a)
1717
SET (BOOST_INCLUDE "/usr/include")
1818
SET (QUADMATH_ARCHIVE "-lquadmath")
1919
SET (DLOPEN_LIB -ldl)

‎external/build_superlu_appveyor.sh‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,12 @@ set -e
33

44
GENERATOR="$1"
55
AOPTION="$2"
6-
BUILDDIR="SuperLU_4.3/$3"
6+
BUILDDIR="superlu/$3"
77

88
(\
9-
bsdtar xzf superlu_4.3.tar.gz && \
109
mkdir -p ${BUILDDIR} && \
1110
cd ${BUILDDIR} && \
12-
cmake -G "${GENERATOR}" -A "${AOPTION}" .. && \
11+
cmake -G "${GENERATOR}" -A "${AOPTION}" -DCMAKE_C_FLAGS="/fp:strict" -Denable_complex=OFF -Denable_single=OFF -Denable_doc=OFF -Denable_tests=OFF -DXSDK_ENABLE_Fortran=OFF -DBLAS_FOUND=ON .. && \
1312
cmake --build . --config Release -- //m //nologo //verbosity:minimal \
1413
)
1514

‎external/build_superlu_msys.sh‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,12 @@ CMAKE=$(cygpath -w ${ANACONDA_PATH}/Library/bin/cmake.exe)
55
MAKE=make
66

77
GENERATOR="MSYS Makefiles"
8-
BUILDDIR="SuperLU_4.3/msys"
8+
BUILDDIR="superlu/msys"
99

1010
(\
11-
bsdtar xzf superlu_4.3.tar.gz && \
1211
mkdir -p ${BUILDDIR} && \
1312
cd ${BUILDDIR} && \
14-
"${CMAKE}" -G "${GENERATOR}" -DCMAKE_BUILD_TYPE=RELEASE .. && \
13+
"${CMAKE}" -G "${GENERATOR}" -DCMAKE_BUILD_TYPE=RELEASE -Denable_complex=OFF -Denable_single=OFF -Denable_doc=OFF -Denable_tests=OFF -DXSDK_ENABLE_Fortran=OFF -DBLAS_FOUND=ON .. && \
1514
"${MAKE}" -j2 \
1615
)
1716

0 commit comments

Comments
 (0)