Merge pull request #121 from mrava87/dev

Prepare for v0.6.0

Author: mrava87

CHANGELOG.md

@@ -1,9 +1,19 @@
+# 0.6.0
+
+:vertical_traffic_light: :vertical_traffic_light: This is the first release supporting PyLops v2.
+:vertical_traffic_light: :vertical_traffic_light:
+
+* Added ``grad`` method to ``pyproximal.utils.bilinear.LowRankFactorizedMatrix`` operator
+* Allow passing optional arguments to solvers in ``pyproximal.proximal.L2``
+* Modified codebase to integrate with pylops's ``cupy`` backend.
+* Modified codebase to integrate with ``pylops`` v2.
+
 # 0.5.0
 
 :vertical_traffic_light: :vertical_traffic_light: This is the latest release supporting PyLops v1.
 :vertical_traffic_light: :vertical_traffic_light:
 
-* Added  ``pyproximal.proximal.Log1`` operator
+* Added ``pyproximal.proximal.Log1`` operator
 * Allow ``radius`` parameter of ``pyproximal.optimization.primal.L0`` to be a function
 * Allow ``tau`` parameter of ``pyproximal.optimization.primal.HQS`` to be a vector
   and change over iterations

docs/source/changelog.rst

@@ -3,6 +3,18 @@
 Changelog
 =========
 
+Version 0.6.0
+--------------
+*Released on: 18/03/2023*
+
+|:vertical_traffic_light:| |:vertical_traffic_light:| This is the first release supporting PyLops v2.
+|:vertical_traffic_light:| |:vertical_traffic_light:|
+
+* Added ``grad`` method to :py:class:`pyproximal.utils.bilinear.LowRankFactorizedMatrix` operator
+* Allow passing optional arguments to solvers in :py:class:`pyproximal.proximal.L2`
+* Modified codebase to integrate with pylops's ``cupy`` backend.
+* Modified codebase to integrate with ``pylops`` v2.
+
 Version 0.5.0
 --------------
 *Released on: 20/08/2022*

docs/source/installation.rst

@@ -6,8 +6,8 @@ Installation
 To install the PyProximal library you will need **Python 3.8 or greater**.
 
 .. note::
-    Versions prior to v0.3.0 work alsi with Python 3.6 or greater, however they
-    require scipy version to be lower than v1.8.0
+    Versions prior to v0.3.0 require Python 3.6 or greater, and scipy version
+    lower than v1.8.0.
 
 Dependencies
 ------------

pyproximal/proximal/TV.py

@@ -211,7 +211,7 @@ def prox(self, x, tau):
 
             #  Update divergence vectors and project
             if self.ndim == 1:
-                dx = derivOp(sol)
+                dx = derivOp @ sol
                 r -= 1. / (4 * gamma * mt**2) * dx
                 weights = np.maximum(1, np.abs(r))
             elif self.ndim == 2: