Merge pull request #193 from PyLops/dev

v0.10.0

.github/workflows/build.yaml

@@ -6,18 +6,18 @@ jobs:
   build:
     strategy:
       matrix:
-        platform: [ ubuntu-latest, macos-latest ]
-        python-version: ["3.8", "3.9", "3.10", "3.11"]
+        platform: [ ubuntu-latest ] # temporarily removed macos-latest because of different behavior with numpy v2
+        python-version: ["3.9", "3.10", "3.11"]
 
     runs-on: ${{ matrix.platform }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Get history and tags for SCM versioning to work
       run: |
         git fetch --prune --unshallow
         git fetch --depth=1 origin +refs/tags/*:refs/tags/*
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies

.readthedocs.yaml

@@ -18,6 +18,6 @@ sphinx:
 # Declare the Python requirements required to build your docs
 python:
   install:
-    - requirements: requirements-dev.txt
+    - requirements: requirements-doc.txt
     - method: pip
       path: .

CHANGELOG.md

@@ -1,14 +1,23 @@
 Changelog
 =========
 
+# 0.10.0
+
+* Added ``pyproximal.optimization.primal.AndersonProximalGradient`` solver
+* Added ``pyproximal.proximal.HuberCircular`` operator
+* Added `fungrad` method to ``pyproximal.proximal.Nonlinear``
+* Modified ``pyproximal.proximal.Huber`` operator as previously 
+  erroneously implemented using the definition of Circular Huber norm
+
+
 # 0.9.0
 
-* Added :py:class:`pyproximal.optimization.palm.iPALM` solver
-* Added :py:func:`pyproximal.optimization.palm._backtracking` method to be used when `gammaf=None` and/or `gammag=None`
-* Added :py:func:`pyproximal.utils.gradtest.gradtest_proximal` and :py:func:`pyproximal.utils.gradtest.gradtest_bilinear` methods
-* Added `tol` to :py:class:`pyproximal.optimization.primal.ProximalPoint` and
-  :py:class:`pyproximal.optimization.primal.ProximalGradient` solvers
-* Modified :py:class:`pyproximal.ProxOperator.precomposition` to allow `b` being also a vector
+* Added ``pyproximal.optimization.palm.iPALM`` solver
+* Added ``pyproximal.optimization.palm._backtracking`` method to be used when `gammaf=None` and/or `gammag=None`
+* Added ``pyproximal.utils.gradtest.gradtest_proximal`` and ``pyproximal.utils.gradtest.gradtest_bilinear`` methods
+* Added `tol` to ``pyproximal.optimization.primal.ProximalPoint`` and
+  ``pyproximal.optimization.primal.ProximalGradient`` solvers
+* Modified ``pyproximal.ProxOperator.precomposition`` to allow `b` being also a vector
 
 
 # 0.8.0

azure-pipelines.yml

@@ -25,7 +25,7 @@ jobs:
 #   steps:
 #   - task: UsePythonVersion@0
 #     inputs:
-#       versionSpec: '3.8'
+#       versionSpec: '3.9'
 #       architecture: 'x64'
 #
 #   - script: |
@@ -54,7 +54,7 @@ jobs:
   steps:
   - task: UsePythonVersion@0
     inputs:
-      versionSpec: '3.8'
+      versionSpec: '3.9'
       architecture: 'x64'
 
   - script: |
@@ -83,7 +83,7 @@ jobs:
   steps:
   - task: UsePythonVersion@0
     inputs:
-      versionSpec: '3.8'
+      versionSpec: '3.9'
       architecture: 'x64'
 
   - script: |

docs/source/api/index.rst

@@ -66,6 +66,7 @@ Convex
     EuclideanBall
     Hankel
     Huber
+    HuberCircular
     Intersection
     L0
     L0Ball
@@ -157,6 +158,7 @@ Primal
     AcceleratedProximalGradient
     ADMM
     ADMML2
+    AndersonProximalGradient
     GeneralizedProximalGradient
     HQS
     LinearizedADMM

docs/source/changelog.rst

@@ -3,6 +3,17 @@
 Changelog
 =========
 
+Version 0.10.0
+--------------
+*Released on: 11/12/2024*
+
+* Added :py:func:`pyproximal.optimization.primal.AndersonProximalGradient` solver
+* Added :py:class:`pyproximal.proximal.HuberCircular` operator
+* Added `fungrad` method to :py:class:`pyproximal.proximal.Nonlinear`
+* Modified :py:class:`pyproximal.proximal.Huber` operator as previously 
+  erroneously implemented using the definition of Circular Huber norm
+
+
 Version 0.9.0
 --------------
 *Released on: 16/08/2024*

environment-dev-arm.yml

@@ -5,8 +5,8 @@ channels:
   - numba
 dependencies:
   - python>=3.8.12
-  - numpy>=1.15.0, <2.0.0
-  - scipy>=1.8.0
+  - numpy>=1.21.0
+  - scipy>=1.11.0
   - pylops>=2.0.0
   - scikit-image
   - matplotlib

environment-dev.yml

@@ -5,8 +5,8 @@ channels:
   - numba
 dependencies:
   - python>=3.8.12
-  - numpy>=1.15.0, <2.0.0
-  - scipy>=1.8.0
+  - numpy>=1.21.0
+  - scipy>=1.11.0
   - pylops>=2.0.0
   - scikit-image
   - matplotlib

environment.yml

@@ -3,6 +3,6 @@ channels:
   - defaults
 dependencies:
   - python>=3.8.12
-  - numpy>=1.15.0, <2.0.0
-  - scipy>=1.8.0
+  - numpy>=1.21.0
+  - scipy>=1.11.0
   - pylops>=2.0.0

pyproject.toml

@@ -30,8 +30,8 @@ classifiers = [
     "Topic :: Scientific/Engineering :: Mathematics",
 ]
 dependencies = [
-    "numpy >= 1.15.0, <2.0.0",
-    "scipy >= 1.8.0",
+    "numpy >= 1.21.0",
+    "scipy >= 1.11.0",
     "pylops >= 2.0.0",
 ]
 dynamic = ["version"]

pyproximal/optimization/__init__.py

@@ -11,6 +11,8 @@
     ProximalPoint                   Proximal point algorithm (or proximal min.)
     ProximalGradient                Proximal gradient algorithm
     AcceleratedProximalGradient     Accelerated Proximal gradient algorithm
+    AndersonProximalGradient        Proximal gradient algorithm with Anderson acceleration
+    GeneralizedProximalGradient     Generalized Proximal gradient algorithm
     HQS                             Half Quadrating Splitting
     ADMM                            Alternating Direction Method of Multipliers
     ADMML2                          ADMM with L2 misfit term