Skip to content

Исправление: Лузан Егор. Технология SEQ. Умножение разреженных матриц. Элементы типа double. Формат хранения матрицы – столбцовый (CCS). Вариант 5. #687

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

Open
smallAbyss wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Исправление: Лузан Егор. Технология SEQ. Умножение разреженных матриц. Элементы типа double. Формат хранения матрицы – столбцовый (CCS). Вариант 5. #687

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
830f76a
Merge pull request #2 from learning-process/master
smallAbyss Mar 21, 2026
fa60d44
[FIX] change folders & namespaces names
smallAbyss Apr 18, 2026
896c704
[FIX] clang-tidy/add no-discard
smallAbyss Apr 18, 2026
8ba69b5
[FIX] delete old directory
smallAbyss Apr 19, 2026
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
6 changes: 3 additions & 3 deletions ...matrix_mult_seq/common/include/common.hpp → ...rse_matrix_mult/common/include/common.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

#include "task/include/task.hpp"

namespace luzan_e_double_sparse_matrix_mult_seq {
namespace luzan_e_double_sparse_matrix_mult {

const double kEPS = 1e-8;

Expand Down Expand Up @@ -116,7 +116,7 @@ class SparseMatrix {
return rows_;
}

std::vector<double> GetVal() {
[[nodiscard]] std::vector<double> GetVal() {
return value_;
}

Expand Down Expand Up @@ -244,4 +244,4 @@ using OutType = SparseMatrix;
using TestType = std::tuple<std::string, std::string>;
using BaseTask = ppc::task::Task<InType, OutType>;

} // namespace luzan_e_double_sparse_matrix_mult_seq
} // namespace luzan_e_double_sparse_matrix_mult
0 ...parse_matrix_mult_seq/data/ans_test_1.txt → ...le_sparse_matrix_mult/data/ans_test_1.txt
View file
Open in desktop
File renamed without changes.
0 ...parse_matrix_mult_seq/data/ans_test_2.txt → ...le_sparse_matrix_mult/data/ans_test_2.txt
View file
Open in desktop
File renamed without changes.
0 ...parse_matrix_mult_seq/data/ans_test_3.txt → ...le_sparse_matrix_mult/data/ans_test_3.txt
View file
Open in desktop
File renamed without changes.
0 ...parse_matrix_mult_seq/data/ans_test_4.txt → ...le_sparse_matrix_mult/data/ans_test_4.txt
View file
Open in desktop
File renamed without changes.
0 ...parse_matrix_mult_seq/data/ans_test_5.txt → ...le_sparse_matrix_mult/data/ans_test_5.txt
View file
Open in desktop
File renamed without changes.
0 ...parse_matrix_mult_seq/data/ans_test_6.txt → ...le_sparse_matrix_mult/data/ans_test_6.txt
View file
Open in desktop
File renamed without changes.
0 ...le_sparse_matrix_mult_seq/data/test_1.txt → ...double_sparse_matrix_mult/data/test_1.txt
View file
Open in desktop
File renamed without changes.
0 ...le_sparse_matrix_mult_seq/data/test_2.txt → ...double_sparse_matrix_mult/data/test_2.txt
View file
Open in desktop
File renamed without changes.
0 ...le_sparse_matrix_mult_seq/data/test_3.txt → ...double_sparse_matrix_mult/data/test_3.txt
View file
Open in desktop
File renamed without changes.
0 ...le_sparse_matrix_mult_seq/data/test_4.txt → ...double_sparse_matrix_mult/data/test_4.txt
View file
Open in desktop
File renamed without changes.
0 ...le_sparse_matrix_mult_seq/data/test_5.txt → ...double_sparse_matrix_mult/data/test_5.txt
View file
Open in desktop
File renamed without changes.
0 ...le_sparse_matrix_mult_seq/data/test_6.txt → ...double_sparse_matrix_mult/data/test_6.txt
View file
Open in desktop
File renamed without changes.
0 ...e_double_sparse_matrix_mult_seq/info.json → ...zan_e_double_sparse_matrix_mult/info.json
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions ...e_matrix_mult_seq/seq/include/ops_seq.hpp → ...parse_matrix_mult/seq/include/ops_seq.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#pragma once

#include "luzan_e_double_sparse_matrix_mult_seq/common/include/common.hpp"
#include "luzan_e_double_sparse_matrix_mult/common/include/common.hpp"
#include "task/include/task.hpp"

namespace luzan_e_double_sparse_matrix_mult_seq {
namespace luzan_e_double_sparse_matrix_mult {

class LuzanEDoubleSparseMatrixMultSeq : public BaseTask {
public:
Expand All @@ -19,4 +19,4 @@ class LuzanEDoubleSparseMatrixMultSeq : public BaseTask {
bool PostProcessingImpl() override;
};

} // namespace luzan_e_double_sparse_matrix_mult_seq
} // namespace luzan_e_double_sparse_matrix_mult
8 changes: 4 additions & 4 deletions ...parse_matrix_mult_seq/seq/src/ops_seq.cpp → ...le_sparse_matrix_mult/seq/src/ops_seq.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#include "luzan_e_double_sparse_matrix_mult_seq/seq/include/ops_seq.hpp"
#include "luzan_e_double_sparse_matrix_mult/seq/include/ops_seq.hpp"

#include "luzan_e_double_sparse_matrix_mult_seq/common/include/common.hpp"
#include "luzan_e_double_sparse_matrix_mult/common/include/common.hpp"
// #include "util/include/util.hpp"

namespace luzan_e_double_sparse_matrix_mult_seq {
namespace luzan_e_double_sparse_matrix_mult {

LuzanEDoubleSparseMatrixMultSeq::LuzanEDoubleSparseMatrixMultSeq(const InType &in) {
SetTypeOfTask(GetStaticTypeOfTask());
Expand Down Expand Up @@ -33,4 +33,4 @@ bool LuzanEDoubleSparseMatrixMultSeq::PostProcessingImpl() {
return true;
}

} // namespace luzan_e_double_sparse_matrix_mult_seq
} // namespace luzan_e_double_sparse_matrix_mult
0 ...uble_sparse_matrix_mult_seq/settings.json → ...e_double_sparse_matrix_mult/settings.json
View file
Open in desktop
File renamed without changes.
14 changes: 7 additions & 7 deletions ...matrix_mult_seq/tests/functional/main.cpp → ...rse_matrix_mult/tests/functional/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
#include <string>
#include <tuple>

#include "luzan_e_double_sparse_matrix_mult_seq/common/include/common.hpp"
#include "luzan_e_double_sparse_matrix_mult_seq/seq/include/ops_seq.hpp"
#include "luzan_e_double_sparse_matrix_mult/common/include/common.hpp"
#include "luzan_e_double_sparse_matrix_mult/seq/include/ops_seq.hpp"
#include "util/include/func_test_util.hpp"
#include "util/include/util.hpp"

namespace luzan_e_double_sparse_matrix_mult_seq {
namespace luzan_e_double_sparse_matrix_mult {

class LuzanEDoubleSparseMatrixMultSeqestsThreads : public ppc::util::BaseRunFuncTests<InType, OutType, TestType> {
public:
Expand All @@ -26,7 +26,7 @@ class LuzanEDoubleSparseMatrixMultSeqestsThreads : public ppc::util::BaseRunFunc
TestType params = std::get<static_cast<std::size_t>(ppc::util::GTestParamIndex::kTestParams)>(GetParam());
std::string file_name = std::get<0>(params);
std::string abs_path =
ppc::util::GetAbsoluteTaskPath(std::string(PPC_ID_luzan_e_double_sparse_matrix_mult_seq), file_name);
ppc::util::GetAbsoluteTaskPath(std::string(PPC_ID_luzan_e_double_sparse_matrix_mult), file_name);
std::ifstream test_file(abs_path);
if (!test_file) {
throw std::runtime_error("Cannot open task file");
Expand All @@ -39,7 +39,7 @@ class LuzanEDoubleSparseMatrixMultSeqestsThreads : public ppc::util::BaseRunFunc
input_data_ = std::make_tuple(a, b);

file_name = "ans_" + std::get<0>(params);
abs_path = ppc::util::GetAbsoluteTaskPath(std::string(PPC_ID_luzan_e_double_sparse_matrix_mult_seq), file_name);
abs_path = ppc::util::GetAbsoluteTaskPath(std::string(PPC_ID_luzan_e_double_sparse_matrix_mult), file_name);
std::ifstream ans_file(abs_path);
if (!ans_file) {
throw std::runtime_error("Cannot open asn file");
Expand Down Expand Up @@ -72,7 +72,7 @@ const std::array<TestType, 6> kTestParam = {std::make_tuple("test_1.txt", "01"),
std::make_tuple("test_5.txt", "05"), std::make_tuple("test_6.txt", "06")};

const auto kTestTasksList = std::tuple_cat(ppc::util::AddFuncTask<LuzanEDoubleSparseMatrixMultSeq, InType>(
kTestParam, PPC_SETTINGS_luzan_e_double_sparse_matrix_mult_seq));
kTestParam, PPC_SETTINGS_luzan_e_double_sparse_matrix_mult));

const auto kGtestValues = ppc::util::ExpandToValues(kTestTasksList);

Expand All @@ -83,4 +83,4 @@ INSTANTIATE_TEST_SUITE_P(FuncTests, LuzanEDoubleSparseMatrixMultSeqestsThreads,

} // namespace

} // namespace luzan_e_double_sparse_matrix_mult_seq
} // namespace luzan_e_double_sparse_matrix_mult
10 changes: 5 additions & 5 deletions ...atrix_mult_seq/tests/performance/main.cpp → ...se_matrix_mult/tests/performance/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
#include <tuple>
#include <vector>

#include "luzan_e_double_sparse_matrix_mult_seq/common/include/common.hpp"
#include "luzan_e_double_sparse_matrix_mult_seq/seq/include/ops_seq.hpp"
#include "luzan_e_double_sparse_matrix_mult/common/include/common.hpp"
#include "luzan_e_double_sparse_matrix_mult/seq/include/ops_seq.hpp"
#include "util/include/perf_test_util.hpp"

namespace luzan_e_double_sparse_matrix_mult_seq {
namespace luzan_e_double_sparse_matrix_mult {

class LuzanEDoubleSparseMatrixMultSeqPerfTestThreads : public ppc::util::BaseRunPerfTests<InType, OutType> {
const int kCount_ = 2500;
Expand Down Expand Up @@ -46,7 +46,7 @@ TEST_P(LuzanEDoubleSparseMatrixMultSeqPerfTestThreads, RunPerfModes) {
namespace {

const auto kAllPerfTasks = ppc::util::MakeAllPerfTasks<InType, LuzanEDoubleSparseMatrixMultSeq>(
PPC_SETTINGS_luzan_e_double_sparse_matrix_mult_seq);
PPC_SETTINGS_luzan_e_double_sparse_matrix_mult);

const auto kGtestValues = ppc::util::TupleToGTestValues(kAllPerfTasks);

Expand All @@ -56,4 +56,4 @@ INSTANTIATE_TEST_SUITE_P(RunModeTests, LuzanEDoubleSparseMatrixMultSeqPerfTestTh

} // namespace

} // namespace luzan_e_double_sparse_matrix_mult_seq
} // namespace luzan_e_double_sparse_matrix_mult
Loading