From ce1f7d18b9edd25297d5ecc747e60d387e3f97cb Mon Sep 17 00:00:00 2001
From: Charlier Benjamin <benjamin.charlier@umontpellier.fr>
Date: Thu, 8 Aug 2019 16:16:30 +0200
Subject: [PATCH] v1.1.2

---
 CHANGELOG.md                | 5 +++++
 keops/core/formulas/maths.h | 8 ++++----
 pykeops/__init__.py         | 2 +-
 pykeops/numpy/__init__.py   | 2 +-
 pykeops/torch/__init__.py   | 2 +-
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7a08b7896..0cfec6ec2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+* v1.1.2
+    - Fix bug in bashed computations
+    - Add to wheel pykeops package licence file
+
+
 * v1.1.1
     - Change LazyTensor imports. One should use: from pykeops.{numpy,torch} import LazyTensor.
     - Add to wheel pykeops package a 'devtools' option that install cmake and gcc.
diff --git a/keops/core/formulas/maths.h b/keops/core/formulas/maths.h
index 81467eb8c..17eb40043 100644
--- a/keops/core/formulas/maths.h
+++ b/keops/core/formulas/maths.h
@@ -1219,11 +1219,11 @@ template<class V, class GRADIN>
                                 DIMFB,
                                 typename parameters::list_indices_keepdim_b_inout,
                                 typename parameters::indices_keepdim_b_t>>,
-                    DiffTB<V, TensorDot<GRADIN, A,
-                                typename parameters::keepdim_t,
+                    DiffTB<V, TensorDot<A,GRADIN,
                                 DIMFA,
-                                typename parameters::list_indices_keepdim_a_inout,
-                                typename parameters::indices_keepdim_a_t >>
+                                typename parameters::keepdim_t,
+                                typename parameters::indices_keepdim_a_t,
+                                typename parameters::list_indices_keepdim_a_inout >>
                     >;
 
 
diff --git a/pykeops/__init__.py b/pykeops/__init__.py
index 2c5b361ca..45a69764d 100644
--- a/pykeops/__init__.py
+++ b/pykeops/__init__.py
@@ -3,7 +3,7 @@
 
 from .common.set_path import set_build_folder
 
-__version__ = '1.1.2b'
+__version__ = '1.1.2'
 
 ###########################################################
 # Initialize some variables: the values may be redefined 
diff --git a/pykeops/numpy/__init__.py b/pykeops/numpy/__init__.py
index ca32220f9..8bb1cbee0 100644
--- a/pykeops/numpy/__init__.py
+++ b/pykeops/numpy/__init__.py
@@ -21,7 +21,7 @@
 from .operations import KernelSolve
 from .convolutions.radial_kernel import RadialKernelConv, RadialKernelGrad1conv
 from .generic.generic_ops import generic_sum, generic_logsumexp, generic_argmin, generic_argkmin
-from pykeops.common.lazy_tensor import LazyTensor
+from pykeops.common.lazy_tensor import LazyTensor, Vi, Vj, Pm
 
 # N.B.: If "from pykeops.torch import LazyTensor" has already been run,
 #       the line above will *not* import "numpytools" and we'll end up with an error...
diff --git a/pykeops/torch/__init__.py b/pykeops/torch/__init__.py
index 7c159b900..1af2eae42 100644
--- a/pykeops/torch/__init__.py
+++ b/pykeops/torch/__init__.py
@@ -27,7 +27,7 @@
 from .kernel_product.kernels import Kernel, kernel_product, kernel_formulas
 from .generic.generic_ops import generic_sum, generic_logsumexp, generic_argmin, generic_argkmin
 from .kernel_product.formula import Formula
-from pykeops.common.lazy_tensor import LazyTensor
+from pykeops.common.lazy_tensor import LazyTensor, Vi, Vj, Pm
 
 # N.B.: If "from pykeops.numpy import LazyTensor" has already been run,
 #       the line above will *not* import "torchtools" and we'll end up with an error...