Fixed. Patch v2 submitted. Thanks! - Yuan -----Original Message----- From: Dmytriyenko, Denys Sent: Thursday, June 20, 2019 4:04 PM To: Zhao, Yuan Cc: [email protected] Subject: Re: [meta-arago] [thud/ti2019.01][PATCH] tidl-api: fix g++ 8.3.0 compilation error
On Thu, Jun 20, 2019 at 01:22:30PM -0500, Yuan Zhao wrote: > Signed-off-by: Yuan Zhao <[email protected]> > --- > .../0002-tidl-api_gcc_8.3.0_compilation.patch | 52 > ++++++++++++++++++++++ > meta-arago-extras/recipes-ti/tidl-api/tidl-api.inc | 3 +- > .../recipes-ti/tidl-api/tidl-api_git.bb | 2 +- > 3 files changed, 55 insertions(+), 2 deletions(-) > create mode 100644 > meta-arago-extras/recipes-ti/tidl-api/files/0002-tidl-api_gcc_8.3.0_compilation.patch > > diff --git > a/meta-arago-extras/recipes-ti/tidl-api/files/0002-tidl-api_gcc_8.3.0_compilation.patch > > b/meta-arago-extras/recipes-ti/tidl-api/files/0002-tidl-api_gcc_8.3.0_compilation.patch > new file mode 100644 > index 00000000..6a48203e > --- /dev/null > +++ > b/meta-arago-extras/recipes-ti/tidl-api/files/0002-tidl-api_gcc_8.3.0_compilation.patch > @@ -0,0 +1,52 @@ > +commit aa7101256aefcea11d326740c111bf37a48b191e (HEAD -> master_patch) > +Author: Yuan Zhao <[email protected]> > +Date: Thu Jun 20 12:01:24 2019 -0500 > + > + Fix g++ 8.3.0 compilation error > + > + - Fix a syntax allowed in g++ 7.2.1 but not in 8.3.0 > + - Make should report error from loop > + > + Upstream-Status: Submitted [Remove this patch when next release is out] > + > + Signed-off-by: Yuan Zhao <[email protected]> This doesn't look like a proper git patch, but rather the output of git log? Please use git format-patch command. Thanks. > +diff --git a/examples/Makefile b/examples/Makefile > +index 52b3ff6..9217380 100644 > +--- a/examples/Makefile > ++++ b/examples/Makefile > +@@ -34,7 +34,7 @@ RUN_DIRS := $(filter-out classification, $(DIRS)) > + 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 > + > +diff --git a/examples/classification/main.cpp > b/examples/classification/main.cpp > +index 020004b..25361f8 100644 > +--- a/examples/classification/main.cpp > ++++ b/examples/classification/main.cpp > +@@ -699,7 +699,7 @@ int tf_postprocess(uchar *in, int size, int roi_idx, int > frame_idx, int f_id) > + 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++) { > +diff --git a/examples/imagenet/main.cpp b/examples/imagenet/main.cpp > +index 937f467..dc1035b 100644 > +--- a/examples/imagenet/main.cpp > ++++ b/examples/imagenet/main.cpp > +@@ -309,7 +309,7 @@ bool WriteFrameOutput(const ExecutionObjectPipeline &eop, > + > + // 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 > diff --git a/meta-arago-extras/recipes-ti/tidl-api/tidl-api.inc > b/meta-arago-extras/recipes-ti/tidl-api/tidl-api.inc > index 04049e73..d93aec82 100644 > --- a/meta-arago-extras/recipes-ti/tidl-api/tidl-api.inc > +++ b/meta-arago-extras/recipes-ti/tidl-api/tidl-api.inc > @@ -1,5 +1,5 @@ > PV = "1.3.0" > -INC_PR = "r1" > +INC_PR = "r2" > > LIC_FILES_CHKSUM = "file://license.txt;md5=e3daeabffb9fc131a73f16d16cbdb118" > > @@ -12,4 +12,5 @@ SRCREV = "785170685ca6a5c11876b05ddf74741c419393be" > > # default patchdir is ${S} > SRC_URI += "file://0001-tidl-api_l2_cache_size.patch" > +SRC_URI += "file://0002-tidl-api_gcc_8.3.0_compilation.patch" > S = "${WORKDIR}/git" > diff --git a/meta-arago-extras/recipes-ti/tidl-api/tidl-api_git.bb > b/meta-arago-extras/recipes-ti/tidl-api/tidl-api_git.bb > index 1deb59e3..48f4db1d 100644 > --- a/meta-arago-extras/recipes-ti/tidl-api/tidl-api_git.bb > +++ b/meta-arago-extras/recipes-ti/tidl-api/tidl-api_git.bb > @@ -8,7 +8,7 @@ require recipes-ti/includes/ti-paths.inc > > PR = "${INC_PR}.0" > > -COMPATIBLE_MACHINE = "dra7xx-evm|m57xx-evm|am57xx-hs-evm" > +COMPATIBLE_MACHINE = "dra7xx-evm|am57xx-evm|am57xx-hs-evm" > PACKAGE_ARCH = "${MACHINE_ARCH}" > > inherit python3native > -- > 2.14.1 > > _______________________________________________ > meta-arago mailing list > [email protected] > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago _______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
