Skip to content

Commit 09433ab

Browse files
tcadusertcaduser
committed
Work on providing python based direct solver
1 parent c4dc299 commit 09433ab

57 files changed

Lines changed: 1828 additions & 448 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitmodules‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,6 @@
1313
[submodule "external/boostorg/math"]
1414
path = external/boostorg/math
1515
url = https://github.com/boostorg/math
16+
[submodule "external/umfpack_lgpl"]
17+
path = external/umfpack_lgpl
18+
url = ../umfpack_lgpl

‎.travis.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ before_script:
5454
- git submodule update --init --depth 1 external/superlu
5555
- git submodule update --init --depth 1 external/boostorg/multiprecision
5656
- git submodule update --init --depth 1 external/boostorg/math
57+
- git submodule update --init --depth 1 external/umfpack_lgpl
5758

5859

5960
script:

‎CHANGES.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@
55

66
Please see the release notes in ``doc/devsim.pdf`` or at [https://devsim.net](https://devsim.net) for more detailed information about changes.
77

8+
## Version 2.4.0
9+
10+
Python solver
11+
12+
The global parameter ``math_libraries`` provides a list of loaded dlls.
13+
814
## Version 2.3.8
915

1016
### Bugs

‎CMakeLists.txt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
PROJECT (DEVSIM CXX)
22
cmake_minimum_required(VERSION 3.9)
33

4+
set(DEVSIM_CONFIG "unknown" CACHE STRING "configuration to load from ./cmake")
45
OPTION(VTKWRITER "Build with VTK Writer" ON)
56
OPTION(PYTHON3 "Build Python 3 Interpreter" ON)
67
OPTION(DEVSIM_EXTENDED_PRECISION "Build with extended precision" OFF)
78
OPTION(DEVSIM_CPP_BIN_FLOAT "Build with boost quadmath emulation" OFF)
8-
OPTION(MKL_PARDISO "Build with MKL Pardiso" OFF)
9+
OPTION(MKL_PARDISO "Build with MKL Pardiso" ON)
910
OPTION(EXPLICIT_MATH_LOAD "Explicit linking of math libraries" ON)
1011
OPTION(EIGEN_DENSE "Use eigen for the dense matrix in extended precision" OFF)
1112

@@ -16,7 +17,7 @@ INCLUDE(${PROJECT_SOURCE_DIR}/cmake/${DEVSIM_CONFIG}.cmake)
1617
INCLUDE(${PROJECT_SOURCE_DIR}/local.cmake OPTIONAL)
1718

1819
#also change this in setup.cfg
19-
ADD_DEFINITIONS(-DDEVSIM_VERSION_STRING=\"2.3.8\")
20+
ADD_DEFINITIONS(-DDEVSIM_VERSION_STRING=\"2.4.0\")
2021
ADD_DEFINITIONS(-DDEVSIM_COPYRIGHT_YEAR=\"2009-2023\")
2122
2223
IF (MKL_PARDISO)

‎dist/bdist_wheel/setup.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
py-limited-api = cp36
33
#plat-name=
44
[metadata]
5-
version = 2.3.8
5+
version = 2.4.0
66
classifiers =
77
Development Status :: 5 - Production/Stable
88
Intended Audience :: Science/Research

‎dist/package_appveyor.sh‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ DIST_VER=${DIST_DIR}
2626
SYMDIFF_LIBRARY_DIR=../external/symdiff/lib/symdiff
2727
SYMDIFF_EXAMPLES_DIR=../external/symdiff/examples
2828
SYMDIFF_DOCUMENTATION_DIR=../external/symdiff/doc
29+
UMFPACK_LIBRARY_FILE=../external/umfpack_lgpl/${ARCH}/umfpack_lgpl.dll
2930

3031
# make the bin directory and copy binary in
3132
mkdir -p ${DIST_BIN}
@@ -39,6 +40,9 @@ cp -v __init__.py ${DIST_PYDLL}
3940
# Intel MKL
4041
#cp -v ${CONDA_PREFIX}/Library/bin/mkl_rt.1.dll ${DIST_PYDLL}
4142

43+
# Copy UMFPACK
44+
cp -v ${UMFPACK_LIBRARY_FILE} ${DIST_PYDLL}
45+
4246
# goes to lib/symdiff
4347
cp -R ${SYMDIFF_LIBRARY_DIR} ${DIST_LIB}
4448

‎dist/package_linux.sh‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ DIST_VER=${DIST_DIR}
1818
SYMDIFF_LIBRARY_DIR=../external/symdiff/lib/symdiff
1919
SYMDIFF_EXAMPLES_DIR=../external/symdiff/examples
2020
SYMDIFF_DOCUMENTATION_DIR=../external/symdiff/doc
21+
UMFPACK_LIBRARY_FILE=../external/umfpack_lgpl/build/libumfpack_lgpl.so
2122

2223
# make the bin directory and copy binary in
2324
# we need the wrapper script for libstdc++
@@ -48,6 +49,8 @@ for i in INSTALL.md NOTICE LICENSE README.md CHANGES.md install.py; do
4849
cp ../$i ${DIST_DIR}
4950
done
5051

52+
cp -vf ${UMFPACK_LIBRARY_FILE} ${DIST_PYDLL}
53+
5154
#MKL library
5255
# $ORIGIN rpath set in src/main/CMakeLists.txt
5356
#cp "${CONDA_PREFIX}/lib/libmkl_rt.so.1" ${DIST_PYDLL}
@@ -71,7 +74,7 @@ Package released as:
7174
${DIST_VER}.tgz
7275
7376
Source available from:
74-
http://www.github.com/devsim/devsim
77+
http://github.com/devsim/devsim
7578
commit ${COMMIT}
7679
EOF
7780
tar czvf ${DIST_VER}.tgz ${DIST_DIR}

‎dist/package_macos.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ DIST_VER=${DIST_DIR}
2424
SYMDIFF_LIBRARY_DIR=../external/symdiff/lib/symdiff
2525
SYMDIFF_EXAMPLES_DIR=../external/symdiff/examples
2626
SYMDIFF_DOCUMENTATION_DIR=../external/symdiff/doc
27+
UMFPACK_LIBRARY_FILE=../external/umfpack_lgpl/build/libumfpack_lgpl.dylib
2728

2829
# make the bin directory and copy binary in
2930
# Assume libstdc++ is a standard part of the system
@@ -103,6 +104,8 @@ fi
103104
# keep a copy of unstripped binary
104105
#cp ${SRC_BIN} ${DIST_VER}_unstripped
105106

107+
cp -vf ${UMFPACK_LIBRARY_FILE} ${DIST_PYDLL}
108+
106109

107110
mkdir -p ${DIST_DIR}/doc
108111
cp ../doc/devsim.pdf ${DIST_DIR}/doc

‎external/build_superlu_appveyor.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11

22
set -e
3+
set -u
34

45
GENERATOR="$1"
56
AOPTION="$2"

‎external/build_superlu_msys.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11

22
set -e
3+
set -u
34
ANACONDA_PATH=${CONDA_PREFIX}
45
CMAKE=$(cygpath -w ${ANACONDA_PATH}/Library/bin/cmake.exe)
56
MAKE=make

0 commit comments

Comments
 (0)