Skip to content

Commit 6a64c38

Browse files
committed
fix using, acc_check
1 parent a4da632 commit 6a64c38

3 files changed

Lines changed: 30 additions & 11 deletions

File tree

app/Graph/acc_check.cpp

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,33 @@ int main(int argc, char* argv[]) {
1919
model_name = argv[++i];
2020
} else if (std::string(argv[i]) == "--onednn") {
2121
options.backend = Backend::kOneDnn;
22-
} else if (std::string(argv[i]) == "--parallel") {
23-
options.parallel = true;
22+
if (options.isParallel()) {
23+
std::cout << "Warning: oneDNN backend is not compatible with parallel "
24+
"execution. Disabling parallelism."
25+
<< '\n';
26+
options.setParallelBackend(ParBackend::kSeq);
27+
}
28+
} else if (std::string(argv[i]) == "--parallel" && i + 1 < argc) {
29+
if (options.backend == Backend::kOneDnn) {
30+
std::cout << "Warning: Parallel execution is not compatible with "
31+
"oneDNN backend. Ignoring --parallel option."
32+
<< '\n';
33+
i++;
34+
continue;
35+
}
36+
37+
std::string backend_str = argv[++i];
38+
if (backend_str == "tbb") {
39+
options.setParallelBackend(ParBackend::kTbb);
40+
} else if (backend_str == "threads" || backend_str == "stl") {
41+
options.setParallelBackend(ParBackend::kThreads);
42+
} else if (backend_str == "omp") {
43+
options.setParallelBackend(ParBackend::kOmp);
44+
} else {
45+
std::cerr << "Unknown parallel backend: " << backend_str
46+
<< ". Using default (Threads)." << '\n';
47+
options.setParallelBackend(ParBackend::kThreads);
48+
}
2449
} else if (std::string(argv[i]) == "--threads" && i + 1 < argc) {
2550
options.threads = std::stoi(argv[++i]);
2651
}

app/Graph/build.hpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@
3434
#include "layers/TransposeLayer.hpp"
3535
#include "layers_oneDNN/EWLayer.hpp"
3636

37-
using namespace it_lab_ai;
38-
3937
extern std::unordered_map<std::string, std::string> model_paths;
4038

4139
struct ParseResult {
@@ -55,14 +53,14 @@ struct ParseResult {
5553

5654
void build_graph(it_lab_ai::Graph& graph, it_lab_ai::Tensor& input,
5755
it_lab_ai::Tensor& output, const std::string& json_path,
58-
RuntimeOptions options, bool comments);
56+
it_lab_ai::RuntimeOptions options, bool comments);
5957
void build_graph_linear(it_lab_ai::Graph& graph, it_lab_ai::Tensor& input,
60-
it_lab_ai::Tensor& output, RuntimeOptions options,
58+
it_lab_ai::Tensor& output, it_lab_ai::RuntimeOptions options,
6159
bool comments);
6260
std::unordered_map<int, std::string> load_class_names(
6361
const std::string& filename);
6462

65-
ParseResult parse_json_model(RuntimeOptions options,
63+
ParseResult parse_json_model(it_lab_ai::RuntimeOptions options,
6664
const std::string& json_path, bool comments);
6765

6866
std::vector<int> get_input_shape_from_json(const std::string& json_path);

src/layers/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
file(GLOB_RECURSE layers_src *.cpp)
22
add_library(layers_lib STATIC "${LAYERS_HEADERS}" "${layers_src}")
33

4-
target_include_directories(layers_lib PUBLIC
5-
${CMAKE_CURRENT_SOURCE_DIR}/../include
6-
)
7-
84
target_link_libraries(layers_lib PUBLIC TBB_unified)
95
target_link_libraries(layers_lib PUBLIC OpenMP::OpenMP_CXX)
106
target_link_libraries(layers_lib PUBLIC dnnl)

0 commit comments

Comments
 (0)