Skip to content

Commit 33d8c81

Browse files
committed
Merged PR 1148: Add Min & Max ops
More simple element wise ops, I think I have the version field correct for these. Related work items: #158
1 parent 33d78bc commit 33d8c81

File tree

9 files changed

+2365
-2269
lines changed

9 files changed

+2365
-2269
lines changed

cmake/lotus_providers.cmake

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
file(GLOB_RECURSE lotus_providers_srcs
2-
"${LOTUS_ROOT}/core/providers/cpu/*.h"
3-
"${LOTUS_ROOT}/core/providers/cpu/*.cc"
4-
)
5-
6-
source_group(TREE ${LOTUS_ROOT}/core FILES ${lotus_providers_srcs})
7-
8-
add_library(lotus_providers_obj OBJECT ${lotus_providers_srcs})
9-
10-
add_dependencies(lotus_providers_obj eigen gsl)
11-
12-
set_target_properties(lotus_providers_obj PROPERTIES LINKER_LANGUAGE CXX)
13-
set_target_properties(lotus_providers_obj PROPERTIES FOLDER "Lotus")
14-
15-
add_library(lotus_providers $<TARGET_OBJECTS:lotus_providers_obj>)
16-
target_link_libraries(lotus_providers PUBLIC lotus_framework lotus_common PRIVATE ${lotus_EXTERNAL_LIBRARIES})
17-
set_target_properties(lotus_providers PROPERTIES FOLDER "Lotus")
1+
file(GLOB_RECURSE lotus_providers_srcs
2+
"${LOTUS_ROOT}/core/providers/cpu/*.h"
3+
"${LOTUS_ROOT}/core/providers/cpu/*.cc"
4+
)
5+
6+
source_group(TREE ${LOTUS_ROOT}/core FILES ${lotus_providers_srcs})
7+
8+
add_library(lotus_providers_obj OBJECT ${lotus_providers_srcs})
9+
10+
add_dependencies(lotus_providers_obj eigen gsl)
11+
12+
set_target_properties(lotus_providers_obj PROPERTIES LINKER_LANGUAGE CXX)
13+
set_target_properties(lotus_providers_obj PROPERTIES FOLDER "Lotus")
14+
15+
add_library(lotus_providers $<TARGET_OBJECTS:lotus_providers_obj>)
16+
target_link_libraries(lotus_providers PUBLIC lotus_framework lotus_common PRIVATE ${lotus_EXTERNAL_LIBRARIES})
17+
set_target_properties(lotus_providers PROPERTIES FOLDER "Lotus")

lotus/core/common/exception.cc

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,46 @@
1-
#include <functional>
2-
#include "core/common/exceptions.h"
3-
4-
namespace Lotus {
5-
6-
static std::function<string(void)> FetchStackTrace = []() { return ""; };
7-
8-
EnforceNotMet::EnforceNotMet(
9-
const char* file,
10-
const int line,
11-
const char* condition,
12-
const string& msg,
13-
const void* caller)
14-
: msg_stack_{MakeString(
15-
"[enforce fail at ",
16-
StripBasename(std::string(file)),
17-
":",
18-
line,
19-
"] ",
20-
condition,
21-
". ",
22-
msg,
23-
" ")},
24-
stack_trace_(FetchStackTrace()) {
25-
caller_ = caller;
26-
full_msg_ = this->Msg();
27-
}
28-
29-
void EnforceNotMet::AppendMessage(const string& msg) {
30-
msg_stack_.push_back(msg);
31-
full_msg_ = this->Msg();
32-
}
33-
34-
string EnforceNotMet::Msg() const {
35-
return std::accumulate(msg_stack_.begin(), msg_stack_.end(), string("")) +
36-
stack_trace_;
37-
}
38-
39-
const char* EnforceNotMet::what() const noexcept {
40-
return full_msg_.c_str();
41-
}
42-
43-
const void* EnforceNotMet::Caller() const noexcept {
44-
return caller_;
45-
}
46-
} // namespace Lotus
1+
#include <functional>
2+
#include "core/common/exceptions.h"
3+
4+
namespace Lotus {
5+
6+
static std::function<string(void)> FetchStackTrace = []() { return ""; };
7+
8+
EnforceNotMet::EnforceNotMet(
9+
const char* file,
10+
const int line,
11+
const char* condition,
12+
const string& msg,
13+
const void* caller)
14+
: msg_stack_{MakeString(
15+
"[enforce fail at ",
16+
StripBasename(std::string(file)),
17+
":",
18+
line,
19+
"] ",
20+
condition,
21+
". ",
22+
msg,
23+
" ")},
24+
stack_trace_(FetchStackTrace()) {
25+
caller_ = caller;
26+
full_msg_ = this->Msg();
27+
}
28+
29+
void EnforceNotMet::AppendMessage(const string& msg) {
30+
msg_stack_.push_back(msg);
31+
full_msg_ = this->Msg();
32+
}
33+
34+
string EnforceNotMet::Msg() const {
35+
return std::accumulate(msg_stack_.begin(), msg_stack_.end(), string("")) +
36+
stack_trace_;
37+
}
38+
39+
const char* EnforceNotMet::what() const noexcept {
40+
return full_msg_.c_str();
41+
}
42+
43+
const void* EnforceNotMet::Caller() const noexcept {
44+
return caller_;
45+
}
46+
} // namespace Lotus

0 commit comments

Comments
 (0)