projects / platform / core / ml / nnfw.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 669e6b0) | patch
Fix merge issues (#505)
authorVladimir Plazun/AI Tools Lab /SRR/Engineer/삼성전자 <v.plazun@partner.samsung.com>
Thu, 5 Jul 2018 10:00:21 +0000 (14:00 +0400)
committerSergey Vostokov/AI Tools Lab /SRR/Staff Engineer/삼성전자 <s.vostokov@samsung.com>
Thu, 5 Jul 2018 10:00:21 +0000 (19:00 +0900)
commit7391b881e798fdbb31f5f6bf2898c790b51c9836
tree68a6fe323a3966c4eeeac5ac7f1736a9e20f097ctree | snapshot
parent669e6b0acf254e36ed5b8ad0726ea9f015923be7commit | diff
Fix merge issues (#505)

This commit fixes merge issues from #404

Signed-off-by: Vladimir Plazun <v.plazun@partner.samsung.com>
contrib/nnc/libs/backend/interpreter/core/include/interpreter/ops/common.h diff | blob | history
contrib/nnc/libs/backend/interpreter/core/src/ops/common.cpp diff | blob | history
Domain: Machine Learning / ML Framework;