From 57efc2bf956af1140c00675aca7c8bd8a67f29bf Mon Sep 17 00:00:00 2001 From: AlexDBlack Date: Sun, 21 Jul 2019 00:03:30 +1000 Subject: [PATCH] Fix bad merge Signed-off-by: AlexDBlack --- libnd4j/include/ops/declarable/helpers/cpu/scatter.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libnd4j/include/ops/declarable/helpers/cpu/scatter.cpp b/libnd4j/include/ops/declarable/helpers/cpu/scatter.cpp index dfdc3119c..20d9dd05d 100644 --- a/libnd4j/include/ops/declarable/helpers/cpu/scatter.cpp +++ b/libnd4j/include/ops/declarable/helpers/cpu/scatter.cpp @@ -35,10 +35,8 @@ void scatter(nd4j::LaunchContext *context, pairwise::Ops op, const NDArray& ind if(outRank == 1) { -<<<<<<< HEAD // PRAGMA_OMP_PARALLEL_FOR_ARGS(if(indLen > Environment::getInstance()->elementwiseThreshold()) schedule(guided)) PRAGMA_OMP_PARALLEL_FOR_ARGS(if(!lock) schedule(guided)) - for(Nd4jLong i = 0; i < indLen; ++i) { for(Nd4jLong i = 0; i < indLen; ++i) { Nd4jLong idx = indices.e(i); @@ -141,3 +139,7 @@ PRAGMA_OMP_PARALLEL_FOR_ARGS(schedule(guided)) } } } + +} +} +}