Skip to content

[FIXED] Капанова Софья. Технология SEQ. Умножение разреженных матриц. Элементы типа double. Формат хранения матрицы – столбцовый (CCS). Вариант 5. #682

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
sofyakapanova wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[FIXED] Капанова Софья. Технология SEQ. Умножение разреженных матриц. Элементы типа double. Формат хранения матрицы – столбцовый (CCS). Вариант 5. #682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions ...ix_mult_ccs_seq/common/include/common.hpp → ...matrix_mult_ccs/common/include/common.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#include "task/include/task.hpp"

namespace kapanova_s_sparse_matrix_mult_ccs_seq {
namespace kapanova_s_sparse_matrix_mult_ccs {

struct CCSMatrix {
std::vector<double> values;
Expand All @@ -24,4 +24,4 @@ using OutType = CCSMatrix;
using TestType = std::tuple<int, std::string>;
using BaseTask = ppc::task::Task<InType, OutType>;

} // namespace kapanova_s_sparse_matrix_mult_ccs_seq
} // namespace kapanova_s_sparse_matrix_mult_ccs
0 ...va_s_sparse_matrix_mult_ccs_seq/info.json → ...panova_s_sparse_matrix_mult_ccs/info.json
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions ...trix_mult_ccs_seq/seq/include/ops_seq.hpp → ...e_matrix_mult_ccs/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 "kapanova_s_sparse_matrix_mult_ccs_seq/common/include/common.hpp"
#include "kapanova_s_sparse_matrix_mult_ccs/common/include/common.hpp"
#include "task/include/task.hpp"

namespace kapanova_s_sparse_matrix_mult_ccs_seq {
namespace kapanova_s_sparse_matrix_mult_ccs {

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

} // namespace kapanova_s_sparse_matrix_mult_ccs_seq
} // namespace kapanova_s_sparse_matrix_mult_ccs
8 changes: 4 additions & 4 deletions ...e_matrix_mult_ccs_seq/seq/src/ops_seq.cpp → ...parse_matrix_mult_ccs/seq/src/ops_seq.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#include "kapanova_s_sparse_matrix_mult_ccs_seq/seq/include/ops_seq.hpp"
#include "kapanova_s_sparse_matrix_mult_ccs/seq/include/ops_seq.hpp"

#include <algorithm>
#include <cstddef>
#include <vector>

#include "kapanova_s_sparse_matrix_mult_ccs_seq/common/include/common.hpp"
#include "kapanova_s_sparse_matrix_mult_ccs/common/include/common.hpp"

namespace kapanova_s_sparse_matrix_mult_ccs_seq {
namespace kapanova_s_sparse_matrix_mult_ccs {

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

} // namespace kapanova_s_sparse_matrix_mult_ccs_seq
} // namespace kapanova_s_sparse_matrix_mult_ccs
0 ..._sparse_matrix_mult_ccs_seq/settings.json → ...va_s_sparse_matrix_mult_ccs/settings.json
View file
Open in desktop
File renamed without changes.
10 changes: 5 additions & 5 deletions ...ix_mult_ccs_seq/tests/functional/main.cpp → ...matrix_mult_ccs/tests/functional/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
#include <utility>
#include <vector>

#include "kapanova_s_sparse_matrix_mult_ccs_seq/common/include/common.hpp"
#include "kapanova_s_sparse_matrix_mult_ccs_seq/seq/include/ops_seq.hpp"
#include "kapanova_s_sparse_matrix_mult_ccs/common/include/common.hpp"
#include "kapanova_s_sparse_matrix_mult_ccs/seq/include/ops_seq.hpp"
#include "util/include/func_test_util.hpp"
#include "util/include/util.hpp"

namespace kapanova_s_sparse_matrix_mult_ccs_seq {
namespace kapanova_s_sparse_matrix_mult_ccs {

class KapanovaSMatrixMultiplyTest : public ppc::util::BaseRunFuncTests<InType, OutType, TestType> {
public:
Expand Down Expand Up @@ -209,7 +209,7 @@ const std::array<TestType, 5> kFixedTestParams = {std::make_tuple(1, ""), std::m
std::make_tuple(5, "")};

const auto kTestTasksList = std::tuple_cat(ppc::util::AddFuncTask<KapanovaSSparseMatrixMultCCSSeq, InType>(
kFixedTestParams, PPC_SETTINGS_kapanova_s_sparse_matrix_mult_ccs_seq));
kFixedTestParams, PPC_SETTINGS_kapanova_s_sparse_matrix_mult_ccs));

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

Expand All @@ -219,4 +219,4 @@ INSTANTIATE_TEST_SUITE_P(FixedMatrixTests, KapanovaSMatrixMultiplyTest, kGtestVa

} // namespace

} // namespace kapanova_s_sparse_matrix_mult_ccs_seq
} // namespace kapanova_s_sparse_matrix_mult_ccs
10 changes: 5 additions & 5 deletions ...x_mult_ccs_seq/tests/performance/main.cpp → ...atrix_mult_ccs/tests/performance/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
#include <utility>
#include <vector>

#include "kapanova_s_sparse_matrix_mult_ccs_seq/common/include/common.hpp"
#include "kapanova_s_sparse_matrix_mult_ccs_seq/seq/include/ops_seq.hpp"
#include "kapanova_s_sparse_matrix_mult_ccs/common/include/common.hpp"
#include "kapanova_s_sparse_matrix_mult_ccs/seq/include/ops_seq.hpp"
#include "util/include/perf_test_util.hpp"

namespace kapanova_s_sparse_matrix_mult_ccs_seq {
namespace kapanova_s_sparse_matrix_mult_ccs {

namespace {

Expand Down Expand Up @@ -110,7 +110,7 @@ TEST_P(KapanovaSMatrixMultiplyPerfTest, RunPerfModes) {
namespace {

const auto kAllPerfTasks = ppc::util::MakeAllPerfTasks<InType, KapanovaSSparseMatrixMultCCSSeq>(
PPC_SETTINGS_kapanova_s_sparse_matrix_mult_ccs_seq);
PPC_SETTINGS_kapanova_s_sparse_matrix_mult_ccs);

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

Expand All @@ -120,4 +120,4 @@ INSTANTIATE_TEST_SUITE_P(MatrixMultiplyPerfTests, KapanovaSMatrixMultiplyPerfTes

} // namespace

} // namespace kapanova_s_sparse_matrix_mult_ccs_seq
} // namespace kapanova_s_sparse_matrix_mult_ccs
Loading