Skip to content

Commit f5fc04d

Browse files
allnesallnes
committed
update namespace and file paths for example_processes to version-specific directories; no functional changes
1 parent 76e5e39 commit f5fc04d

14 files changed

Lines changed: 60 additions & 60 deletions

File tree

‎tasks/example_processes_2/common/include/common.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55

66
#include "task/include/task.hpp"
77

8-
namespace nesterov_a_test_task_processes {
8+
namespace nesterov_a_test_task_processes_2 {
99

1010
using InType = int;
1111
using OutType = int;
1212
using TestType = std::tuple<int, std::string>;
1313
using BaseTask = ppc::task::Task<InType, OutType>;
1414

15-
} // namespace nesterov_a_test_task_processes
15+
} // namespace nesterov_a_test_task_processes_2

‎tasks/example_processes_2/mpi/include/ops_mpi.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#pragma once
22

3-
#include "example_processes/common/include/common.hpp"
3+
#include "example_processes_2/common/include/common.hpp"
44
#include "task/include/task.hpp"
55

6-
namespace nesterov_a_test_task_processes {
6+
namespace nesterov_a_test_task_processes_2 {
77

88
class NesterovATestTaskMPI : public BaseTask {
99
public:
@@ -19,4 +19,4 @@ class NesterovATestTaskMPI : public BaseTask {
1919
bool PostProcessingImpl() override;
2020
};
2121

22-
} // namespace nesterov_a_test_task_processes
22+
} // namespace nesterov_a_test_task_processes_2

‎tasks/example_processes_2/mpi/src/ops_mpi.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
#include "example_processes/mpi/include/ops_mpi.hpp"
1+
#include "example_processes_2/mpi/include/ops_mpi.hpp"
22

33
#include <mpi.h>
44

55
#include <numeric>
66
#include <vector>
77

8-
#include "example_processes/common/include/common.hpp"
8+
#include "example_processes_2/common/include/common.hpp"
99
#include "util/include/util.hpp"
1010

11-
namespace nesterov_a_test_task_processes {
11+
namespace nesterov_a_test_task_processes_2 {
1212

1313
NesterovATestTaskMPI::NesterovATestTaskMPI(const InType &in) {
1414
SetTypeOfTask(GetStaticTypeOfTask());
@@ -69,4 +69,4 @@ bool NesterovATestTaskMPI::PostProcessingImpl() {
6969
return GetOutput() > 0;
7070
}
7171

72-
} // namespace nesterov_a_test_task_processes
72+
} // namespace nesterov_a_test_task_processes_2

‎tasks/example_processes_2/seq/include/ops_seq.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#pragma once
22

3-
#include "example_processes/common/include/common.hpp"
3+
#include "example_processes_2/common/include/common.hpp"
44
#include "task/include/task.hpp"
55

6-
namespace nesterov_a_test_task_processes {
6+
namespace nesterov_a_test_task_processes_2 {
77

88
class NesterovATestTaskSEQ : public BaseTask {
99
public:
@@ -19,4 +19,4 @@ class NesterovATestTaskSEQ : public BaseTask {
1919
bool PostProcessingImpl() override;
2020
};
2121

22-
} // namespace nesterov_a_test_task_processes
22+
} // namespace nesterov_a_test_task_processes_2

‎tasks/example_processes_2/seq/src/ops_seq.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
#include "example_processes/seq/include/ops_seq.hpp"
1+
#include "example_processes_2/seq/include/ops_seq.hpp"
22

33
#include <numeric>
44
#include <vector>
55

6-
#include "example_processes/common/include/common.hpp"
6+
#include "example_processes_2/common/include/common.hpp"
77
#include "util/include/util.hpp"
88

9-
namespace nesterov_a_test_task_processes {
9+
namespace nesterov_a_test_task_processes_2 {
1010

1111
NesterovATestTaskSEQ::NesterovATestTaskSEQ(const InType &in) {
1212
SetTypeOfTask(GetStaticTypeOfTask());
@@ -57,4 +57,4 @@ bool NesterovATestTaskSEQ::PostProcessingImpl() {
5757
return GetOutput() > 0;
5858
}
5959

60-
} // namespace nesterov_a_test_task_processes
60+
} // namespace nesterov_a_test_task_processes_2

‎tasks/example_processes_2/tests/functional/main.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
#include <utility>
1313
#include <vector>
1414

15-
#include "example_processes/common/include/common.hpp"
16-
#include "example_processes/mpi/include/ops_mpi.hpp"
17-
#include "example_processes/seq/include/ops_seq.hpp"
15+
#include "example_processes_2/common/include/common.hpp"
16+
#include "example_processes_2/mpi/include/ops_mpi.hpp"
17+
#include "example_processes_2/seq/include/ops_seq.hpp"
1818
#include "util/include/func_test_util.hpp"
1919
#include "util/include/util.hpp"
2020

21-
namespace nesterov_a_test_task_processes {
21+
namespace nesterov_a_test_task_processes_2 {
2222

2323
class NesterovARunFuncTestsProcesses2 : public ppc::util::BaseRunFuncTests<InType, OutType, TestType> {
2424
public:
@@ -34,7 +34,7 @@ class NesterovARunFuncTestsProcesses2 : public ppc::util::BaseRunFuncTests<InTyp
3434
std::vector<uint8_t> img;
3535
// Read image
3636
{
37-
std::string abs_path = ppc::util::GetAbsoluteTaskPath(PPC_ID_example_processes, "pic.jpg");
37+
std::string abs_path = ppc::util::GetAbsoluteTaskPath(PPC_ID_example_processes_2, "pic.jpg");
3838
auto *data = stbi_load(abs_path.c_str(), &width, &height, &channels, 0);
3939
if (data == nullptr) {
4040
throw std::runtime_error("Failed to load image: " + std::string(stbi_failure_reason()));
@@ -71,8 +71,8 @@ TEST_P(NesterovARunFuncTestsProcesses2, MatmulFromPic) {
7171
const std::array<TestType, 3> kTestParam = {std::make_tuple(3, "3"), std::make_tuple(5, "5"), std::make_tuple(7, "7")};
7272

7373
const auto kTestTasksList =
74-
std::tuple_cat(ppc::util::AddFuncTask<NesterovATestTaskMPI, InType>(kTestParam, PPC_SETTINGS_example_processes),
75-
ppc::util::AddFuncTask<NesterovATestTaskSEQ, InType>(kTestParam, PPC_SETTINGS_example_processes));
74+
std::tuple_cat(ppc::util::AddFuncTask<NesterovATestTaskMPI, InType>(kTestParam, PPC_SETTINGS_example_processes_2),
75+
ppc::util::AddFuncTask<NesterovATestTaskSEQ, InType>(kTestParam, PPC_SETTINGS_example_processes_2));
7676

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

@@ -82,4 +82,4 @@ INSTANTIATE_TEST_SUITE_P(PicMatrixTests, NesterovARunFuncTestsProcesses2, kGtest
8282

8383
} // namespace
8484

85-
} // namespace nesterov_a_test_task_processes
85+
} // namespace nesterov_a_test_task_processes_2

‎tasks/example_processes_2/tests/performance/main.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#include <gtest/gtest.h>
22

3-
#include "example_processes/common/include/common.hpp"
4-
#include "example_processes/mpi/include/ops_mpi.hpp"
5-
#include "example_processes/seq/include/ops_seq.hpp"
3+
#include "example_processes_2/common/include/common.hpp"
4+
#include "example_processes_2/mpi/include/ops_mpi.hpp"
5+
#include "example_processes_2/seq/include/ops_seq.hpp"
66
#include "util/include/perf_test_util.hpp"
77

8-
namespace nesterov_a_test_task_processes {
8+
namespace nesterov_a_test_task_processes_2 {
99

1010
class ExampleRunPerfTestProcesses2 : public ppc::util::BaseRunPerfTests<InType, OutType> {
1111
const int kCount_ = 100;
@@ -29,12 +29,12 @@ TEST_P(ExampleRunPerfTestProcesses2, RunPerfModes) {
2929
}
3030

3131
const auto kAllPerfTasks =
32-
ppc::util::MakeAllPerfTasks<InType, NesterovATestTaskMPI, NesterovATestTaskSEQ>(PPC_SETTINGS_example_processes);
32+
ppc::util::MakeAllPerfTasks<InType, NesterovATestTaskMPI, NesterovATestTaskSEQ>(PPC_SETTINGS_example_processes_2);
3333

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

3636
const auto kPerfTestName = ExampleRunPerfTestProcesses2::CustomPerfTestName;
3737

3838
INSTANTIATE_TEST_SUITE_P(RunModeTests, ExampleRunPerfTestProcesses2, kGtestValues, kPerfTestName);
3939

40-
} // namespace nesterov_a_test_task_processes
40+
} // namespace nesterov_a_test_task_processes_2

‎tasks/example_processes_3/common/include/common.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55

66
#include "task/include/task.hpp"
77

8-
namespace nesterov_a_test_task_processes {
8+
namespace nesterov_a_test_task_processes_3 {
99

1010
using InType = int;
1111
using OutType = int;
1212
using TestType = std::tuple<int, std::string>;
1313
using BaseTask = ppc::task::Task<InType, OutType>;
1414

15-
} // namespace nesterov_a_test_task_processes
15+
} // namespace nesterov_a_test_task_processes_3

‎tasks/example_processes_3/mpi/include/ops_mpi.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#pragma once
22

3-
#include "example_processes/common/include/common.hpp"
3+
#include "example_processes_3/common/include/common.hpp"
44
#include "task/include/task.hpp"
55

6-
namespace nesterov_a_test_task_processes {
6+
namespace nesterov_a_test_task_processes_3 {
77

88
class NesterovATestTaskMPI : public BaseTask {
99
public:
@@ -19,4 +19,4 @@ class NesterovATestTaskMPI : public BaseTask {
1919
bool PostProcessingImpl() override;
2020
};
2121

22-
} // namespace nesterov_a_test_task_processes
22+
} // namespace nesterov_a_test_task_processes_3

‎tasks/example_processes_3/mpi/src/ops_mpi.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
#include "example_processes/mpi/include/ops_mpi.hpp"
1+
#include "example_processes_3/mpi/include/ops_mpi.hpp"
22

33
#include <mpi.h>
44

55
#include <numeric>
66
#include <vector>
77

8-
#include "example_processes/common/include/common.hpp"
8+
#include "example_processes_3/common/include/common.hpp"
99
#include "util/include/util.hpp"
1010

11-
namespace nesterov_a_test_task_processes {
11+
namespace nesterov_a_test_task_processes_3 {
1212

1313
NesterovATestTaskMPI::NesterovATestTaskMPI(const InType &in) {
1414
SetTypeOfTask(GetStaticTypeOfTask());
@@ -69,4 +69,4 @@ bool NesterovATestTaskMPI::PostProcessingImpl() {
6969
return GetOutput() > 0;
7070
}
7171

72-
} // namespace nesterov_a_test_task_processes
72+
} // namespace nesterov_a_test_task_processes_3

0 commit comments

Comments
 (0)