Skip to content

Commit

Permalink
v1.10.9. Change codes for compiling in Windows. Remove UMFPACK, and K…
Browse files Browse the repository at this point in the history
…LU from STEPS. Modify readme.md.
  • Loading branch information
changgang committed Jan 23, 2019
1 parent 4fb2ff4 commit 2d7d1a5
Show file tree
Hide file tree
Showing 8 changed files with 14,598 additions and 11,153 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Please go to http://steps.apsal.org.cn:82 for documentation.
Please go to http://steps.drli.group:82 for documentation.

3 changes: 3 additions & 0 deletions code/Complie_sequence
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,6 @@
3, Compile CSparse as static library
4, Compile CppTest as static library
5, Compile STEPS as dynamic library or exectuable file. Include libUMFPACK.a, libBLAS.a, libCSparse.a, and libCpptest.a. Put libBLAS.a after libUMFPACK.a.

6, when compiling in Windows, remove -no-pie and -lgfortran options
remove libKLU.a, libBLAS.a, libUMFPACK.a
14 changes: 7 additions & 7 deletions code/STEPS.cbp
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<Compiler>
<Add option="-O3" />
<Add option="-Wall" />
<Add option="-no-pie" />
<Add option="-std=c++1z" />
<Add directory="../code" />
<Add directory="thirdparty/SuiteSparse/UMFPACK/Include" />
<Add directory="thirdparty/SuiteSparse/CSparse/Include" />
Expand All @@ -31,12 +31,8 @@
<Linker>
<Add option="-static-libstdc++" />
<Add option="-static-libgcc" />
<Add option="-lgfortran -no-pie" />
<Add library="../build/bin/Release/libUMFPACK.a" />
<Add library="../build/bin/Release/libBLAS.a" />
<Add library="../build/bin/Release/libCSparse.a" />
<Add library="../build/bin/Release/libCpptest.a" />
<Add library="../build/bin/Release/libKLU.a" />
</Linker>
</Target>
</Build>
Expand Down Expand Up @@ -381,9 +377,13 @@
<Unit filename="source/basic/rating_test.cpp" />
<Unit filename="source/basic/sparse_matrix.cpp" />
<Unit filename="source/basic/sparse_matrix_csparse.cpp" />
<Unit filename="source/basic/sparse_matrix_klu.cpp" />
<Unit filename="source/basic/sparse_matrix_klu.cpp">
<Option link="0" />
</Unit>
<Unit filename="source/basic/sparse_matrix_test.cpp" />
<Unit filename="source/basic/sparse_matrix_umfpack.cpp" />
<Unit filename="source/basic/sparse_matrix_umfpack.cpp">
<Option link="0" />
</Unit>
<Unit filename="source/basic/terminal.cpp" />
<Unit filename="source/basic/terminal_test.cpp" />
<Unit filename="source/basic/timer.cpp" />
Expand Down
Loading

0 comments on commit 2d7d1a5

Please sign in to comment.