summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 44e912b)
raw | patch | inline | side by side (parent: 44e912b)
author | Yuan Zhao <yuanzhao@ti.com> | |
Thu, 20 Jun 2019 17:01:24 +0000 (12:01 -0500) | ||
committer | Yuan Zhao <yuanzhao@ti.com> | |
Thu, 20 Jun 2019 17:36:10 +0000 (12:36 -0500) |
- Fix a syntax allowed in g++ 7.2.1 (PSDK5.3) but not in 8.3.0 (PSDK6.0)
- Make should report error from loop
- MCT-1199
- Make should report error from loop
- MCT-1199
examples/Makefile | patch | blob | history | |
examples/classification/main.cpp | patch | blob | history | |
examples/imagenet/main.cpp | patch | blob | history |
diff --git a/examples/Makefile b/examples/Makefile
index 52b3ff6508b233093e8ff3b83a20f9b473351146..9217380d00d1c235dcc66307193f77c7b87bf8b6 100644 (file)
--- a/examples/Makefile
+++ b/examples/Makefile
define make_in_dirs
@for dir in $(1); do \
echo "=============== " $$dir " =================" ; \
- $(MAKE) --no-print-directory $(MAKEFILE) -C $$dir $(2); \
+ $(MAKE) --no-print-directory $(MAKEFILE) -C $$dir $(2) || exit 1; \
done
endef
index 020004bb2263322e3660f9ebf05274ec66402e03..25361f8a210a1de37c37a3030d6d3bfc55adf988 100644 (file)
int rpt_id = -1;
typedef std::pair<uchar, int> val_index;
- auto constexpr cmp = [](val_index &left, val_index &right) { return left.first > right.first; };
+ auto cmp = [](val_index &left, val_index &right) { return left.first > right.first; };
std::priority_queue<val_index, std::vector<val_index>, decltype(cmp)> queue(cmp);
// initialize priority queue with smallest value on top
for (int i = 0; i < k; i++) {
index 937f4671fdb2bda3099d4c3e6874bf8853d4296c..dc1035be9442a76b567bb994be12c1e6ace5e632 100644 (file)
// sort and get k largest values and corresponding indices
typedef pair<unsigned char, int> val_index;
- auto constexpr cmp = [](val_index &left, val_index &right)
+ auto cmp = [](val_index &left, val_index &right)
{ return left.first > right.first; };
priority_queue<val_index, vector<val_index>, decltype(cmp)> queue(cmp);
// initialize priority queue with smallest value on top