more cleanup

Author: fschlimb

src/EWBinOp.cpp

@@ -410,104 +410,3 @@ ddptensor * EWBinOp::op(EWBinOpId op, const ddptensor & a, const py::object & b)
 }
 
 FACTORY_INIT(DeferredEWBinOp, F_EWBINOP);
-
-#if 0
-
-        template<typename OP, typename A, typename B>
-        static ptr_type do_split_op(OP && op,
-                                    const A & a, const B & b,
-                                    const shape_type & gshape, const PVSlice & res_slc, 
-                                    const Buffer & rbuffa, const Buffer & rbuffb,
-                                    uint64_t abuffsz, uint64_t bbuffsz, uint64_t asz,
-                                    const std::array<uint64_t, 2> & adispl, const std::array<uint64_t, 2> & bdispl,
-                                    const std::array<uint64_t, 5> & regs)
-        {
-            return do_split_op_<typename promote<typename A::value_type, typename B::value_type>::type>
-                (std::move(op), a, b, gshape, res_slc, rbuffa, rbuffb, abuffsz, bbuffsz, asz, adispl, bdispl, regs);
-        }
-
-        template<typename R, typename OP, typename A, typename B>
-        static ptr_type do_split_op_(OP && op,
-                                     const A & a, const B & b,
-                                     const shape_type & gshape, const PVSlice & res_slc, 
-                                     const Buffer & rbuffa, const Buffer & rbuffb,
-                                     uint64_t abuffsz, uint64_t bbuffsz, uint64_t asz,
-                                     const std::array<uint64_t, 2> & adispl, const std::array<uint64_t, 2> & bdispl,
-                                     const std::array<uint64_t, 5> & regs)
-        {
-            // allocate result
-            typename xt::xarray<R>::shape_type shpx = {res_slc.local_size()};
-            auto res_x = xt::empty<R>(shpx);
-
-            if(regs[0]) {
-                // both from buffer
-                auto av = xt::adapt(rbuffa, {regs[0]});
-                auto bv = xt::adapt(rbuffb, {regs[0]});
-                auto rv = xt::view(res_x, xt::range(_, regs[0]));
-                rv = op(std::move(av), std::move(bv));
-            } // else nothing in any buffer prepending local data
-            uint64_t aoff = 0, boff = 0;
-            if(regs[1] > regs[0]) {
-                uint64_t _cnt = regs[1] - regs[0];
-                if(regs[1] == adispl[1]) {
-                    // b comes from local, a from buffer
-                    const auto _a = reinterpret_cast<const typename A::value_type*>(rbuffa.data()); // raw pointer to buffer data of remote a
-                    auto av = xt::adapt(_a+regs[0], {_cnt});
-                    auto bv = xt::view(xt::reshape_view(b, {b.size()}), xt::range(bdispl[0], bdispl[0] + _cnt));
-                    auto rv = xt::view(res_x, xt::range(regs[0], regs[1]));
-                    rv = op(std::move(av), std::move(bv));
-                    boff = _cnt;
-                } else {
-                    // a comes from local, b from buffer
-                    const auto _b = reinterpret_cast<const typename B::value_type*>(rbuffb.data()); // raw pointer to buffer data of remote b
-                    auto av = xt::view(xt::reshape_view(a, {a.size()}), xt::range(adispl[0], adispl[0] + _cnt));
-                    auto bv = xt::adapt(_b+regs[0], {_cnt});
-                    auto rv = xt::view(res_x, xt::range(regs[0], regs[1]));
-                    rv = op(std::move(av), std::move(bv));
-                    aoff = _cnt;
-                }
-            } // else both buffers have same amount of prepending data
-            if(regs[2] > regs[1]) {
-                // both come from local
-                uint64_t _cnt = regs[2] - regs[1];
-                auto av = xt::view(xt::reshape_view(a, {a.size()}), xt::range(adispl[0] + aoff, adispl[0] + aoff + _cnt));
-                auto bv = xt::view(xt::reshape_view(b, {b.size()}), xt::range(bdispl[0] + boff, bdispl[0] + boff + _cnt));
-                auto rv = xt::view(res_x, xt::range(regs[1], regs[2]));
-                rv = op(std::move(av), std::move(bv));
-                aoff += _cnt;
-                boff += _cnt;
-            } // else no overlap in local data
-            if(regs[3] > regs[2]) {
-                uint64_t _cnt = regs[3] - regs[2];
-                if(regs[3] == adispl[1] + asz) {
-                    // a from local, b from buffer
-                    const auto _b = reinterpret_cast<const typename B::value_type*>(rbuffb.data()); // raw pointer to buffer data of remote b
-                    auto av = xt::view(xt::reshape_view(a, {a.size()}), xt::range(adispl[0] + aoff, adispl[0] + aoff + _cnt));
-                    auto bv = xt::adapt(_b + bdispl[1], {_cnt});
-                    auto rv = xt::view(res_x, xt::range(regs[2], regs[3]));
-                    rv = op(std::move(av), std::move(bv));
-                } else {
-                    // b from local, a from buffer
-                    const auto _a = reinterpret_cast<const typename A::value_type*>(rbuffa.data()); // raw pointer to buffer data of remote a
-                    auto av = xt::adapt(_a + adispl[1], {_cnt});
-                    auto bv = xt::view(xt::reshape_view(b, {b.size()}), xt::range(bdispl[0] + boff, bdispl[0] + boff + _cnt));
-                    auto rv = xt::view(res_x, xt::range(regs[2], regs[3]));
-                    rv = op(std::move(av), std::move(bv));
-                }
-            } // local data of a an b end equally
-            if(regs[4] > regs[3]) {
-                // both from buffer
-                uint64_t _cnt = regs[4] - regs[3];
-                const auto _a = reinterpret_cast<const typename A::value_type*>(rbuffa.data()); // raw pointer to buffer data of remote a
-                const auto _b = reinterpret_cast<const typename B::value_type*>(rbuffb.data()); // raw pointer to buffer data of remote b
-                auto av = xt::adapt(_a + abuffsz - _cnt, {_cnt});
-                auto bv = xt::adapt(_b + bbuffsz - _cnt, {_cnt});
-                auto rv = xt::view(res_x, xt::range(regs[3], regs[4]));
-                rv = op(std::move(av), std::move(bv));
-            } // data data after last local
-                    
-            res_x.reshape(res_slc.local_shape());
-            return operatorx<R>::mk_tx(gshape, res_x);
-        }
-
-#endif