Skip to content

部分左除算の処理を改善 #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
claude-a merged 5 commits into from
Jun 8, 2025
Merged

部分左除算の処理を改善 #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e9a8671
作成中
claude-a Jun 8, 2025
ff5c38b
作成中
claude-a Jun 8, 2025
789a2b2
作成中
claude-a Jun 8, 2025
d203327
テスト
claude-a Jun 8, 2025
55950b9
テスト
claude-a Jun 8, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/run_test_vs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Run test VS

on:
push:
branches: [ develop ]
branches: [ develop, feature/* ]

jobs:
build:
Expand Down
197 changes: 166 additions & 31 deletions python_numpy/python_numpy_linalg_solver.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,9 @@ class LinalgSolver {
division_min(std::move(other.division_min)), rho(std::move(other.rho)),
rep_num(std::move(other.rep_num)) {}

LinalgSolver<T, M, K, SparseAvailable_A, SparseAvailable_B> &operator=(
LinalgSolver<T, M, K, SparseAvailable_A, SparseAvailable_B> &&other) {
LinalgSolver<T, M, K, SparseAvailable_A, SparseAvailable_B> &
operator=(LinalgSolver<T, M, K, SparseAvailable_A, SparseAvailable_B>
&&other) noexcept {
if (this != &other) {
this->X_1 = std::move(other.X_1);
this->decay_rate = std::move(other.decay_rate);
Expand Down Expand Up @@ -626,21 +627,23 @@ class LinalgPartitionSolver {
public:
/* Constructor */
LinalgPartitionSolver()
: decay_rate(static_cast<Value_Type>(0)),
: X_1(), decay_rate(static_cast<Value_Type>(0)),
division_min(
static_cast<Value_Type>(DEFAULT_DIVISION_MIN_LINALG_SOLVER)),
rho({}), rep_num({}) {}

/* Copy Constructor */
LinalgPartitionSolver(const LinalgPartitionSolver<T, M, K, SparseAvailable_A,
SparseAvailable_B> &other)
: decay_rate(other.decay_rate), division_min(other.division_min),
rho(other.rho), rep_num(other.rep_num) {}
: X_1(other.X_1), decay_rate(other.decay_rate),
division_min(other.division_min), rho(other.rho),
rep_num(other.rep_num) {}

LinalgPartitionSolver<T, M, K, SparseAvailable_A, SparseAvailable_B> &
operator=(const LinalgPartitionSolver<T, M, K, SparseAvailable_A,
SparseAvailable_B> &other) {
if (this != &other) {
this->X_1 = other.X_1;
this->decay_rate = other.decay_rate;
this->division_min = other.division_min;
this->rho = other.rho;
Expand All @@ -653,14 +656,15 @@ class LinalgPartitionSolver {
LinalgPartitionSolver(
LinalgPartitionSolver<T, M, K, SparseAvailable_A, SparseAvailable_B>
&&other) noexcept
: decay_rate(std::move(other.decay_rate)),
: X_1(std::move(other.X_1)), decay_rate(std::move(other.decay_rate)),
division_min(std::move(other.division_min)), rho(std::move(other.rho)),
rep_num(std::move(other.rep_num)) {}

LinalgPartitionSolver<T, M, K, SparseAvailable_A, SparseAvailable_B> &
operator=(LinalgPartitionSolver<T, M, K, SparseAvailable_A, SparseAvailable_B>
&&other) noexcept {
if (this != &other) {
this->X_1 = std::move(other.X_1);
this->decay_rate = std::move(other.decay_rate);
this->division_min = std::move(other.division_min);
this->rho = std::move(other.rho);
Expand All @@ -674,41 +678,89 @@ class LinalgPartitionSolver {
const Matrix<DefDense, T, M, K> &B, std::size_t matrix_size)
-> Matrix<DefDense, T, M, K> {

Base::Matrix::Matrix<T, M, K> X_1;
if (matrix_size > M) {
matrix_size = M;
}

Base::Matrix::gmres_k_partition_matrix(
A.matrix, B.matrix, this->X_1, this->decay_rate, this->division_min,
this->rho, this->rep_num, matrix_size);

return Matrix<DefDense, T, M, K>(this->X_1);
}

inline auto cold_solve(const Matrix<DefDense, T, M, M> &A,
const Matrix<DefDense, T, M, K> &B,
std::size_t matrix_size) -> Matrix<DefDense, T, M, K> {

Base::Matrix::Matrix<T, M, K> X_1_temporary;

if (matrix_size > M) {
matrix_size = M;
}

Base::Matrix::gmres_k_partition_matrix(
A.matrix, B.matrix, X_1, this->decay_rate, this->division_min,
A.matrix, B.matrix, X_1_temporary, this->decay_rate, this->division_min,
this->rho, this->rep_num, matrix_size);

return Matrix<DefDense, T, M, K>(X_1);
return Matrix<DefDense, T, M, K>(X_1_temporary);
}

inline auto solve(const Matrix<DefDense, T, M, M> &A,
const Matrix<DefDiag, T, M> &B, std::size_t matrix_size)
-> Matrix<DefDense, T, M, M> {

Base::Matrix::Matrix<T, M, K> X_1;
if (matrix_size > M) {
matrix_size = M;
}

Base::Matrix::gmres_k_partition_matrix(
A.matrix, B.matrix, this->X_1, this->decay_rate, this->division_min,
this->rho, this->rep_num, matrix_size);

return Matrix<DefDense, T, M, M>(this->X_1);
}

inline auto cold_solve(const Matrix<DefDense, T, M, M> &A,
const Matrix<DefDiag, T, M> &B,
std::size_t matrix_size) -> Matrix<DefDense, T, M, M> {

Base::Matrix::Matrix<T, M, K> X_1_temporary;

if (matrix_size > M) {
matrix_size = M;
}

Base::Matrix::gmres_k_partition_matrix(
A.matrix, B.matrix, X_1, this->decay_rate, this->division_min,
A.matrix, B.matrix, X_1_temporary, this->decay_rate, this->division_min,
this->rho, this->rep_num, matrix_size);

return Matrix<DefDense, T, M, M>(X_1);
return Matrix<DefDense, T, M, M>(X_1_temporary);
}

inline auto solve(const Matrix<DefDense, T, M, M> &A,
const Matrix<DefSparse, T, M, K, SparseAvailable_B> &B,
std::size_t matrix_size) -> Matrix<DefDense, T, M, K> {

Base::Matrix::Matrix<T, M, K> X_1;
if (matrix_size > M) {
matrix_size = M;
}

Base::Matrix::Matrix<T, M, K> B_dense_matrix =
Base::Matrix::output_dense_matrix(B.matrix);

Base::Matrix::gmres_k_partition_matrix(
A.matrix, B_dense_matrix, this->X_1, this->decay_rate,
this->division_min, this->rho, this->rep_num, matrix_size);

return Matrix<DefDense, T, M, K>(this->X_1);
}

inline auto cold_solve(const Matrix<DefDense, T, M, M> &A,
const Matrix<DefSparse, T, M, K, SparseAvailable_B> &B,
std::size_t matrix_size) -> Matrix<DefDense, T, M, K> {

Base::Matrix::Matrix<T, M, K> X_1_temporary;

if (matrix_size > M) {
matrix_size = M;
Expand All @@ -718,10 +770,10 @@ class LinalgPartitionSolver {
Base::Matrix::output_dense_matrix(B.matrix);

Base::Matrix::gmres_k_partition_matrix(
A.matrix, B_dense_matrix, X_1, this->decay_rate, this->division_min,
this->rho, this->rep_num, matrix_size);
A.matrix, B_dense_matrix, X_1_temporary, this->decay_rate,
this->division_min, this->rho, this->rep_num, matrix_size);

return Matrix<DefDense, T, M, K>(X_1);
return Matrix<DefDense, T, M, K>(X_1_temporary);
}

inline auto solve(const Matrix<DefDiag, T, M> &A,
Expand All @@ -732,11 +784,25 @@ class LinalgPartitionSolver {
matrix_size = M;
}

Base::Matrix::Matrix<T, M, K> X_1 =
this->X_1 = Base::Matrix::diag_inv_multiply_dense_partition(
A.matrix, B.matrix, this->division_min, matrix_size);

return Matrix<DefDense, T, M, K>(this->X_1);
}

inline auto cold_solve(const Matrix<DefDiag, T, M> &A,
const Matrix<DefDense, T, M, K> &B,
std::size_t matrix_size) -> Matrix<DefDense, T, M, K> {

if (matrix_size > M) {
matrix_size = M;
}

Base::Matrix::Matrix<T, M, K> X_1_temporary =
Base::Matrix::diag_inv_multiply_dense_partition(
A.matrix, B.matrix, this->division_min, matrix_size);

return Matrix<DefDense, T, M, K>(X_1);
return Matrix<DefDense, T, M, K>(X_1_temporary);
}

inline auto solve(const Matrix<DefDiag, T, M> &A,
Expand All @@ -758,6 +824,21 @@ class LinalgPartitionSolver {
const Matrix<DefSparse, T, M, K, SparseAvailable_B> &B,
std::size_t matrix_size) -> Matrix<DefDense, T, M, K> {

if (matrix_size > M) {
matrix_size = M;
}

this->X_1 = Base::Matrix::output_dense_matrix(
Base::Matrix::diag_inv_multiply_sparse_partition(
A.matrix, B.matrix, this->division_min, matrix_size));

return Matrix<DefDense, T, M, K>(this->X_1);
}

inline auto cold_solve(const Matrix<DefDiag, T, M> &A,
const Matrix<DefSparse, T, M, K, SparseAvailable_B> &B,
std::size_t matrix_size) -> Matrix<DefDense, T, M, K> {

using RowIndices_B = RowIndicesFromSparseAvailable<SparseAvailable_B>;
using RowPointers_B = RowPointersFromSparseAvailable<SparseAvailable_B>;

Expand All @@ -766,34 +847,68 @@ class LinalgPartitionSolver {
}

Base::Matrix::CompiledSparseMatrix<T, M, K, RowIndices_B, RowPointers_B>
X_1 = Base::Matrix::diag_inv_multiply_sparse_partition(
X_1_temporary = Base::Matrix::diag_inv_multiply_sparse_partition(
A.matrix, B.matrix, this->division_min, matrix_size);

return Matrix<DefDense, T, M, K>(Base::Matrix::output_dense_matrix(X_1));
return Matrix<DefDense, T, M, K>(
Base::Matrix::output_dense_matrix(X_1_temporary));
}

inline auto solve(const Matrix<DefSparse, T, M, M, SparseAvailable_A> &A,
const Matrix<DefDense, T, M, K> &B, std::size_t matrix_size)
-> Matrix<DefDense, T, M, K> {

Base::Matrix::Matrix<T, M, K> X_1;
if (matrix_size > M) {
matrix_size = M;
}

Base::Matrix::sparse_gmres_k_partition_matrix(
A.matrix, B.matrix, this->X_1, this->decay_rate, this->division_min,
this->rho, this->rep_num, matrix_size);

return Matrix<DefDense, T, M, K>(this->X_1);
}

inline auto cold_solve(const Matrix<DefSparse, T, M, M, SparseAvailable_A> &A,
const Matrix<DefDense, T, M, K> &B,
std::size_t matrix_size) -> Matrix<DefDense, T, M, K> {

Base::Matrix::Matrix<T, M, K> X_1_temporary;

if (matrix_size > M) {
matrix_size = M;
}

Base::Matrix::sparse_gmres_k_partition_matrix(
A.matrix, B.matrix, X_1, this->decay_rate, this->division_min,
A.matrix, B.matrix, X_1_temporary, this->decay_rate, this->division_min,
this->rho, this->rep_num, matrix_size);

return Matrix<DefDense, T, M, K>(X_1);
return Matrix<DefDense, T, M, K>(X_1_temporary);
}

inline auto solve(const Matrix<DefSparse, T, M, M, SparseAvailable_A> &A,
const Matrix<DefDiag, T, M> &B, std::size_t matrix_size)
-> Matrix<DefDense, T, M, M> {

Base::Matrix::Matrix<T, M, K> X_1;
if (matrix_size > M) {
matrix_size = M;
}

Base::Matrix::Matrix<T, M, M> B_dense_matrix =
output_dense_matrix(B.matrix);

Base::Matrix::sparse_gmres_k_partition_matrix(
A.matrix, B_dense_matrix, this->X_1, this->decay_rate,
this->division_min, this->rho, this->rep_num, matrix_size);

return Matrix<DefDense, T, M, M>(this->X_1);
}

inline auto cold_solve(const Matrix<DefSparse, T, M, M, SparseAvailable_A> &A,
const Matrix<DefDiag, T, M> &B,
std::size_t matrix_size) -> Matrix<DefDense, T, M, M> {

Base::Matrix::Matrix<T, M, K> X_1_temporary;

if (matrix_size > M) {
matrix_size = M;
Expand All @@ -803,17 +918,35 @@ class LinalgPartitionSolver {
output_dense_matrix(B.matrix);

Base::Matrix::sparse_gmres_k_partition_matrix(
A.matrix, B_dense_matrix, X_1, this->decay_rate, this->division_min,
this->rho, this->rep_num, matrix_size);
A.matrix, B_dense_matrix, X_1_temporary, this->decay_rate,
this->division_min, this->rho, this->rep_num, matrix_size);

return Matrix<DefDense, T, M, M>(X_1);
return Matrix<DefDense, T, M, M>(X_1_temporary);
}

inline auto solve(const Matrix<DefSparse, T, M, M, SparseAvailable_A> &A,
const Matrix<DefSparse, T, M, K, SparseAvailable_B> &B,
std::size_t matrix_size) -> Matrix<DefDense, T, M, K> {

Base::Matrix::Matrix<T, M, K> X_1;
if (matrix_size > M) {
matrix_size = M;
}

Base::Matrix::Matrix<T, M, K> B_dense_matrix =
Base::Matrix::output_dense_matrix(B.matrix);

Base::Matrix::sparse_gmres_k_partition_matrix(
A.matrix, B_dense_matrix, this->X_1, this->decay_rate,
this->division_min, this->rho, this->rep_num, matrix_size);

return Matrix<DefDense, T, M, K>(this->X_1);
}

inline auto cold_solve(const Matrix<DefSparse, T, M, M, SparseAvailable_A> &A,
const Matrix<DefSparse, T, M, K, SparseAvailable_B> &B,
std::size_t matrix_size) -> Matrix<DefDense, T, M, K> {

Base::Matrix::Matrix<T, M, K> X_1_temporary;

if (matrix_size > M) {
matrix_size = M;
Expand All @@ -823,10 +956,10 @@ class LinalgPartitionSolver {
Base::Matrix::output_dense_matrix(B.matrix);

Base::Matrix::sparse_gmres_k_partition_matrix(
A.matrix, B_dense_matrix, X_1, this->decay_rate, this->division_min,
this->rho, this->rep_num, matrix_size);
A.matrix, B_dense_matrix, X_1_temporary, this->decay_rate,
this->division_min, this->rho, this->rep_num, matrix_size);

return Matrix<DefDense, T, M, K>(X_1);
return Matrix<DefDense, T, M, K>(X_1_temporary);
}

inline auto get_answer(void) -> Matrix<DefDense, T, M, K> {
Expand All @@ -850,6 +983,8 @@ class LinalgPartitionSolver {

public:
/* Variable */
Base::Matrix::Matrix<T, M, K> X_1;

Value_Type decay_rate;
Value_Type division_min;
std::array<Value_Type, K> rho;
Expand Down
Loading