IntenseWebs/openvino
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use relative paths in error messages (#1963)

Browse Source
This commit is contained in:
Ilya Churaev 2020-08-27 14:04:02 +03:00 committed by GitHub
parent b6b536f23c
commit e60331a232
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 50 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ngraph/CMakeLists.txt
View File

@ -424,7 +424,7 @@ if(NGRAPH_DEPRECATED_ENABLE)
add_definitions(-DNGRAPH_DEPRECATED_ENABLE)
endif()
add_definitions(-DPROJECT_ROOT_DIR="${CMAKE_CURRENT_SOURCE_DIR}")
add_definitions(-DPROJECT_ROOT_DIR="${CMAKE_SOURCE_DIR}")
#-----------------------------------------------------------------------------------------------
# Print Global Options

17
ngraph/core/include/ngraph/check.hpp
View File

@ -52,22 +52,7 @@ namespace ngraph
private:
static std::string make_what(const CheckLocInfo& check_loc_info,
const std::string& context_info,
const std::string& explanation)
{
std::stringstream ss;
ss << "Check '" << check_loc_info.check_string << "' failed at " << check_loc_info.file
<< ":" << check_loc_info.line;
if (!context_info.empty())
{
ss << ":" << std::endl << context_info;
}
if (!explanation.empty())
{
ss << ":" << std::endl << explanation;
}
ss << std::endl;
return ss.str();
}
const std::string& explanation);
};
}

48
ngraph/core/src/check.cpp Normal file
View File

@ -0,0 +1,48 @@
//*****************************************************************************
// Copyright 2017-2020 Intel Corporation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//*****************************************************************************
#include "ngraph/check.hpp"
using namespace ngraph;
std::string CheckFailure::make_what(const CheckLocInfo& check_loc_info,
const std::string& context_info,
const std::string& explanation)
{
// Use relative path only for internal code
auto getRelativePath = [](const std::string& path) -> std::string {
// Path to local OpenVINO repository
static const std::string project_root(PROJECT_ROOT_DIR);
// All internal paths start from project root
if (path.find(project_root) != 0)
return path;
// Add +1 to remove first /
return path.substr(project_root.length() + 1);
};
std::stringstream ss;
ss << "Check '" << check_loc_info.check_string << "' failed at "
<< getRelativePath(check_loc_info.file) << ":" << check_loc_info.line;
if (!context_info.empty())
{
ss << ":" << std::endl << context_info;
}
if (!explanation.empty())
{
ss << ":" << std::endl << explanation;
}
ss << std::endl;
return ss.str();
}