diff options
| author | Edoardo Pasca <edo.paskino@gmail.com> | 2019-06-03 10:42:48 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-03 10:42:48 +0000 |
| commit | 74dd85988e86ebd441c5b0848f6d7b58f22b3dff (patch) | |
| tree | f83d445353b73732c45c2d3841e528e7e23cc11c | |
| parent | b6c18977a20b1751c181545a7555c0d2d9a3f2d3 (diff) | |
| parent | 424230bbe06d24604fa8db4c5ebc5f36f0791355 (diff) | |
| download | framework-74dd85988e86ebd441c5b0848f6d7b58f22b3dff.tar.gz framework-74dd85988e86ebd441c5b0848f6d7b58f22b3dff.tar.bz2 framework-74dd85988e86ebd441c5b0848f6d7b58f22b3dff.tar.xz framework-74dd85988e86ebd441c5b0848f6d7b58f22b3dff.zip | |
Merge pull request #294 from vais-ral/fix_dot
fix dot for numpy method
| -rwxr-xr-x | Wrappers/Python/ccpi/framework/framework.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Wrappers/Python/ccpi/framework/framework.py b/Wrappers/Python/ccpi/framework/framework.py index 3840f2c..e906ca6 100755 --- a/Wrappers/Python/ccpi/framework/framework.py +++ b/Wrappers/Python/ccpi/framework/framework.py @@ -821,7 +821,7 @@ class DataContainer(object): if self.shape == other.shape: # return (self*other).sum() if method == 'numpy': - return numpy.dot(self.as_array().ravel(), other.as_array()) + return numpy.dot(self.as_array().ravel(), other.as_array().ravel()) elif method == 'reduce': # see https://github.com/vais-ral/CCPi-Framework/pull/273 # notice that Python seems to be smart enough to use |