[rebase] Rebase fix
authorParichay Kapoor <pk.kapoor@samsung.com>
Wed, 6 Oct 2021 02:35:50 +0000 (11:35 +0900)
committerJijoong Moon <jijoong.moon@samsung.com>
Wed, 6 Oct 2021 08:07:09 +0000 (17:07 +0900)
commitbf029bd96b351c8873e5f9dfd9c735e2cfa66252
treef5bdcf73a9ba505bc7ee77180b6e26a69bbbab8f
parentde970e93147cdf072cdef70b64f6c1f225a9a94b
[rebase] Rebase fix

This patch adds rebase fix.
Further some of the temporary fixes in the previous commits are also
removed.

Signed-off-by: Parichay Kapoor <pk.kapoor@samsung.com>
nntrainer/tensor/manager.cpp
nntrainer/tensor/var_grad.cpp
test/unittest/memory/memory_planner_validate.cpp