Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 10 additions & 5 deletions .github/workflows/continuous.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,14 @@ jobs:
####################

Unix:
name: ${{ matrix.name }} (${{ matrix.config }})
name: ${{ matrix.name }} (${{ matrix.config }}, large_index=${{ matrix.large_index }})
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-latest]
config: [Debug, Release]
large_index: [ON, OFF]
include:
- os: macos-latest
name: macOS
Expand Down Expand Up @@ -57,8 +58,8 @@ jobs:
uses: actions/cache@v5
with:
path: ${{ env.CACHE_PATH }}
key: ${{ runner.os }}-${{ matrix.config }}-cache-${{ github.sha }}
restore-keys: ${{ runner.os }}-${{ matrix.config }}-cache
key: ${{ runner.os }}-${{ matrix.config }}-${{ matrix.large_index }}-cache-${{ github.sha }}
restore-keys: ${{ runner.os }}-${{ matrix.config }}-${{ matrix.large_index }}-cache

- name: Prepare ccache
run: |
Expand All @@ -71,6 +72,7 @@ jobs:
cd build
cmake .. \
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-DPOLYSOLVE_LARGE_INDEX=${{ matrix.large_index }} \
-DCMAKE_BUILD_TYPE=${{ matrix.config }} \

- name: Build
Expand All @@ -84,13 +86,15 @@ jobs:
####################

Windows:
name: Windows (${{ matrix.config }}, large_index=${{ matrix.large_index }})
runs-on: windows-latest
env:
SCCACHE_IDLE_TIMEOUT: "12000"
strategy:
fail-fast: false
matrix:
config: [Debug, Release]
large_index: [ON, OFF]
steps:
- name: Checkout repository
uses: actions/checkout@v6
Expand All @@ -106,8 +110,8 @@ jobs:
uses: actions/cache@v5
with:
path: ${{ env.appdata }}\Mozilla\sccache
key: ${{ runner.os }}-${{ matrix.config }}-cache-${{ github.sha }}
restore-keys: ${{ runner.os }}-${{ matrix.config }}-cache
key: ${{ runner.os }}-${{ matrix.config }}-${{ matrix.large_index }}-cache-${{ github.sha }}
restore-keys: ${{ runner.os }}-${{ matrix.config }}-${{ matrix.large_index }}-cache

- name: Prepare sccache
run: |
Expand All @@ -130,6 +134,7 @@ jobs:
-DCMAKE_C_COMPILER=cl.exe ^
-DCMAKE_CXX_COMPILER=cl.exe ^
-DCMAKE_CXX_COMPILER_LAUNCHER=sccache ^
-DPOLYSOLVE_LARGE_INDEX=${{ matrix.large_index }} ^
-DCMAKE_BUILD_TYPE=${{ matrix.config }} ^
-B build ^
-S .
Expand Down
2 changes: 1 addition & 1 deletion src/polysolve/linear/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ if(POLYSOLVE_WITH_CUDA)
)
endif()

if(POLYSOLVE_WITH_MPI)
if(POLYSOLVE_WITH_MPI AND NOT POLYSOLVE_LARGE_INDEX)
list(APPEND SOURCES
CPUHybridSolver.cpp
CPUHybridSolver.hpp
Expand Down
5 changes: 5 additions & 0 deletions src/polysolve/linear/SaddlePointSolver.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,13 @@ namespace polysolve::linear
conv_tol_ = 1e-8;
max_iter_ = 50;

#ifdef POLYSOLVE_LARGE_INDEX
asymmetric_solver_name_ = "Eigen::SparseLU";
symmetric_solver_name_ = "Eigen::SimplicialLDLT";
#else
asymmetric_solver_name_ = "Eigen::GMRES";
symmetric_solver_name_ = "Eigen::GMRES";
#endif

asymmetric_solver_params_ = {"tolerance", 1e-4};
symmetric_solver_params_ = {"tolerance", 1e-4};
Expand Down
4 changes: 4 additions & 0 deletions src/polysolve/linear/Solver.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -548,8 +548,10 @@ namespace polysolve::linear
"Eigen::CholmodSimplicialLDLT",
#endif
#ifdef POLYSOLVE_WITH_UMFPACK
#ifndef POLYSOLVE_LARGE_INDEX
"Eigen::UmfPackLU",
#endif
#endif
#ifdef POLYSOLVE_WITH_SUPERLU
"Eigen::SuperLU",
#endif
Expand Down Expand Up @@ -594,10 +596,12 @@ namespace polysolve::linear
"Eigen::DGMRES",
#endif
#endif
#ifndef POLYSOLVE_LARGE_INDEX
"Eigen::ConjugateGradient",
"Eigen::BiCGSTAB",
"Eigen::GMRES",
"Eigen::MINRES",
#endif
"Eigen::PartialPivLU",
"Eigen::FullPivLU",
"Eigen::HouseholderQR",
Expand Down
Loading