allow scalars at right operand to binops

Author: fschlimb

setup.py

@@ -29,7 +29,7 @@ def build_cmake(self, ext):
         extdir.parent.mkdir(parents=True, exist_ok=True)
 
         # example of cmake args
-        config = 'Debug' if self.debug else 'Release'
+        config = 'Debug' # if self.debug else 'Release'
         cmake_args = [
             '-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=' + str(extdir.parent.absolute()),
             '-DCMAKE_BUILD_TYPE=' + config

src/EWBinOp.cpp

@@ -113,7 +113,8 @@ namespace x {
     };
 } // namespace x
 
-tensor_i::ptr_type EWBinOp::op(EWBinOpId op, x::DPTensorBaseX::ptr_type a, x::DPTensorBaseX::ptr_type b)
+tensor_i::ptr_type EWBinOp::op(EWBinOpId op, x::DPTensorBaseX::ptr_type a, py::object b)
 {
-    return TypeDispatch<x::EWBinOp>(a, b, op);
+    auto bb = x::mk_tx(b);
+    return TypeDispatch<x::EWBinOp>(a, bb, op);
 }

src/IEWBinOp.cpp

@@ -62,7 +62,8 @@ namespace x {
     };
 } // namespace x
 
-void IEWBinOp::op(IEWBinOpId op, x::DPTensorBaseX::ptr_type a, x::DPTensorBaseX::ptr_type b)
+void IEWBinOp::op(IEWBinOpId op, x::DPTensorBaseX::ptr_type a, py::object b)
 {
-    TypeDispatch<x::IEWBinOp>(a, b, op);
+    auto bb = x::mk_tx(b);
+    TypeDispatch<x::IEWBinOp>(a, bb, op);
 }

src/include/ddptensor/Operations.hpp

@@ -15,12 +15,12 @@ struct Creator
 
 struct IEWBinOp
 {
-    static void op(IEWBinOpId op, x::DPTensorBaseX::ptr_type a, x::DPTensorBaseX::ptr_type b);
+    static void op(IEWBinOpId op, x::DPTensorBaseX::ptr_type a, py::object b);
 };
 
 struct EWBinOp
 {
-    static tensor_i::ptr_type op(EWBinOpId op, x::DPTensorBaseX::ptr_type a, x::DPTensorBaseX::ptr_type b);
+    static tensor_i::ptr_type op(EWBinOpId op, x::DPTensorBaseX::ptr_type a, py::object b);
 };
 
 struct EWUnyOp

src/include/ddptensor/x.hpp

@@ -85,6 +85,16 @@ namespace x
             _xarray = org;
         }
 
+        DPTensorX(const T & v)
+            : _owner(theTransceiver->rank()),
+              _slice(shape_type{1}),
+              _lslice({xt::newaxis()}), //to_xt(_slice.slice())),
+              _xarray(std::make_shared<xt::xarray<T>>(1)),
+              _replica(v)
+        {
+            *_xarray = v;
+        }
+
         virtual std::string __repr__() const
         {
             auto v = xt::strided_view(xarray(), lslice());
@@ -235,6 +245,11 @@ namespace x
     {
     public:
 
+        static DPTensorBaseX::ptr_type mk_tx(py::object & o)
+        {
+            return std::make_shared<DPTensorX<T>>(o.cast<T>());
+        }
+
         template<typename ...Ts>
         static DPTensorBaseX::ptr_type mk_tx(Ts&&... args)
         {
@@ -254,4 +269,16 @@ namespace x
         }
     };
 
+    static DPTensorBaseX::ptr_type mk_tx(py::object & b)
+    {
+        if(py::isinstance<x::DPTensorBaseX::ptr_type>(b)) {
+            return b.cast<x::DPTensorBaseX::ptr_type>();
+        } else if(py::isinstance<py::float_>(b)) {
+            return x::operatorx<double>::mk_tx(b);
+        } else if(py::isinstance<py::int_>(b)) {
+            return x::operatorx<int64_t>::mk_tx(b);
+        }
+        throw std::runtime_error("Invalid right operand to elementwise binary operation");
+    };
+
 } // namespace x

test/test_scalar.py

@@ -0,0 +1,4 @@
+import ddptensor as dt
+a = dt.ones((8,8), dt.float64)
+b = a + 1
+print(b)