diff --git a/tasks/kapanova_s_sparse_matrix_mult_ccs_seq/common/include/common.hpp b/tasks/kapanova_s_sparse_matrix_mult_ccs/common/include/common.hpp similarity index 82% rename from tasks/kapanova_s_sparse_matrix_mult_ccs_seq/common/include/common.hpp rename to tasks/kapanova_s_sparse_matrix_mult_ccs/common/include/common.hpp index d599c2795..b1875a425 100644 --- a/tasks/kapanova_s_sparse_matrix_mult_ccs_seq/common/include/common.hpp +++ b/tasks/kapanova_s_sparse_matrix_mult_ccs/common/include/common.hpp @@ -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 values; @@ -24,4 +24,4 @@ using OutType = CCSMatrix; using TestType = std::tuple; using BaseTask = ppc::task::Task; -} // namespace kapanova_s_sparse_matrix_mult_ccs_seq +} // namespace kapanova_s_sparse_matrix_mult_ccs diff --git a/tasks/kapanova_s_sparse_matrix_mult_ccs_seq/info.json b/tasks/kapanova_s_sparse_matrix_mult_ccs/info.json similarity index 100% rename from tasks/kapanova_s_sparse_matrix_mult_ccs_seq/info.json rename to tasks/kapanova_s_sparse_matrix_mult_ccs/info.json diff --git a/tasks/kapanova_s_sparse_matrix_mult_ccs_seq/seq/include/ops_seq.hpp b/tasks/kapanova_s_sparse_matrix_mult_ccs/seq/include/ops_seq.hpp similarity index 70% rename from tasks/kapanova_s_sparse_matrix_mult_ccs_seq/seq/include/ops_seq.hpp rename to tasks/kapanova_s_sparse_matrix_mult_ccs/seq/include/ops_seq.hpp index feb4b0228..d8181bb64 100644 --- a/tasks/kapanova_s_sparse_matrix_mult_ccs_seq/seq/include/ops_seq.hpp +++ b/tasks/kapanova_s_sparse_matrix_mult_ccs/seq/include/ops_seq.hpp @@ -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: @@ -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 diff --git a/tasks/kapanova_s_sparse_matrix_mult_ccs_seq/seq/src/ops_seq.cpp b/tasks/kapanova_s_sparse_matrix_mult_ccs/seq/src/ops_seq.cpp similarity index 90% rename from tasks/kapanova_s_sparse_matrix_mult_ccs_seq/seq/src/ops_seq.cpp rename to tasks/kapanova_s_sparse_matrix_mult_ccs/seq/src/ops_seq.cpp index c8a2cedac..3ae7b2e45 100644 --- a/tasks/kapanova_s_sparse_matrix_mult_ccs_seq/seq/src/ops_seq.cpp +++ b/tasks/kapanova_s_sparse_matrix_mult_ccs/seq/src/ops_seq.cpp @@ -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 #include #include -#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()); @@ -109,4 +109,4 @@ bool KapanovaSSparseMatrixMultCCSSeq::PostProcessingImpl() { return true; } -} // namespace kapanova_s_sparse_matrix_mult_ccs_seq +} // namespace kapanova_s_sparse_matrix_mult_ccs diff --git a/tasks/kapanova_s_sparse_matrix_mult_ccs_seq/settings.json b/tasks/kapanova_s_sparse_matrix_mult_ccs/settings.json similarity index 100% rename from tasks/kapanova_s_sparse_matrix_mult_ccs_seq/settings.json rename to tasks/kapanova_s_sparse_matrix_mult_ccs/settings.json diff --git a/tasks/kapanova_s_sparse_matrix_mult_ccs_seq/tests/functional/main.cpp b/tasks/kapanova_s_sparse_matrix_mult_ccs/tests/functional/main.cpp similarity index 95% rename from tasks/kapanova_s_sparse_matrix_mult_ccs_seq/tests/functional/main.cpp rename to tasks/kapanova_s_sparse_matrix_mult_ccs/tests/functional/main.cpp index 2fb7c725e..1f078ab55 100644 --- a/tasks/kapanova_s_sparse_matrix_mult_ccs_seq/tests/functional/main.cpp +++ b/tasks/kapanova_s_sparse_matrix_mult_ccs/tests/functional/main.cpp @@ -9,12 +9,12 @@ #include #include -#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 { public: @@ -209,7 +209,7 @@ const std::array kFixedTestParams = {std::make_tuple(1, ""), std::m std::make_tuple(5, "")}; const auto kTestTasksList = std::tuple_cat(ppc::util::AddFuncTask( - 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); @@ -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 diff --git a/tasks/kapanova_s_sparse_matrix_mult_ccs_seq/tests/performance/main.cpp b/tasks/kapanova_s_sparse_matrix_mult_ccs/tests/performance/main.cpp similarity index 90% rename from tasks/kapanova_s_sparse_matrix_mult_ccs_seq/tests/performance/main.cpp rename to tasks/kapanova_s_sparse_matrix_mult_ccs/tests/performance/main.cpp index 43214c440..ce8dc3f9a 100644 --- a/tasks/kapanova_s_sparse_matrix_mult_ccs_seq/tests/performance/main.cpp +++ b/tasks/kapanova_s_sparse_matrix_mult_ccs/tests/performance/main.cpp @@ -5,11 +5,11 @@ #include #include -#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 { @@ -110,7 +110,7 @@ TEST_P(KapanovaSMatrixMultiplyPerfTest, RunPerfModes) { namespace { const auto kAllPerfTasks = ppc::util::MakeAllPerfTasks( - PPC_SETTINGS_kapanova_s_sparse_matrix_mult_ccs_seq); + PPC_SETTINGS_kapanova_s_sparse_matrix_mult_ccs); const auto kGtestValues = ppc::util::TupleToGTestValues(kAllPerfTasks); @@ -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