Merge pull request #543 from PyLops/dev

Merge for v2.2.0

Author: mrava87

.github/workflows/build.yaml

@@ -7,22 +7,27 @@ jobs:
     strategy:
       matrix:
         platform: [ ubuntu-latest, macos-latest ]
-        python-version: ["3.7", "3.8", "3.9", "3.10"]
+        python-version: ["3.8", "3.9", "3.10"]
 
     runs-on: ${{ matrix.platform }}
     steps:
     - uses: actions/checkout@v3
+    - 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
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
       run: |
-        python -m pip install --upgrade pip
+        python -m pip install --upgrade pip setuptools
         pip install flake8 pytest
         if [ -f requirements.txt ]; then pip install -r requirements-dev.txt; fi
     - name: Install pylops
       run: |
+        python -m setuptools_scm
         pip install .
     - name: Test with pytest
       run: |

.github/workflows/codacy-coverage-reporter.yaml

@@ -6,22 +6,27 @@ on: [push, pull_request_target]
 
 jobs:
   build:
+    strategy:
+      matrix:
+        platform: [ ubuntu-latest, ]
+        python-version: ["3.8", ]
 
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.platform }}
     steps:
     - uses: actions/checkout@v3
-    - name: Set up Python
+    - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v4
       with:
-        python-version: 3.9
+        python-version: ${{ matrix.python-version }}
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install flake8 pytest coverage
+        pip install flake8 pytest
         if [ -f requirements.txt ]; then pip install -r requirements-dev.txt; fi
     - name: Install pylops
       run: |
         pip install .
+        pip install coverage
     - name: Code coverage with coverage
       run: |
         coverage run -m pytest

.pre-commit-config.yaml

@@ -15,7 +15,7 @@ repos:
           - --line-length=88
 
   - repo: https://github.com/pycqa/isort
-    rev: 5.10.1
+    rev: 5.12.0
     hooks:
       - id: isort
         name: isort (python)

.readthedocs.yaml

@@ -0,0 +1,23 @@
+# .readthedocs.yaml
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+# Set the version of Python and other tools you might need
+build:
+  os: ubuntu-20.04
+  tools:
+    python: "3.9"
+
+# Build documentation in the docs/ directory with Sphinx
+sphinx:
+  configuration: docs/source/conf.py
+
+# Declare the Python requirements required to build your docs
+python:
+  install:
+    - requirements: requirements-dev.txt
+    - method: pip
+      path: .

CHANGELOG.md

@@ -1,3 +1,18 @@
+# 2.2.0
+
+* Added `pylops.signalprocessing.NonStationaryConvolve3D` operator
+* Added nd-array capabilities to `pylops.basicoperators.Identity` and `pylops.basicoperators.Zero`
+* Added second implementation in `pylops.waveeqprocessing.BlendingContinuous` which is more
+  performant when dealing with small number of receivers
+* Added `forceflat` property to operators with ambiguous `rmatvec` (`pylops.basicoperators.Block`,
+  `pylops.basicoperators.Bilinear`, `pylops.basicoperators.BlockDiag`, `pylops.basicoperators.HStack`,
+  `pylops.basicoperators.MatrixMult`, `pylops.basicoperators.VStack`, and `pylops.basicoperators.Zero`)
+* Improved `dynamic` mode of `pylops.waveeqprocessing.Kirchhoff` operator
+* Modified `pylops.signalprocessing.Convolve1D` to allow both filters that are both shorter and longer of the
+  input vector
+* Modified all solvers to use `matvec/rmatvec` instead of `@/.H @` to improve performance
+
+
 # 2.1.0
 * Added `pylops.signalprocessing.DCT`, `pylops.signalprocessing.NonStationaryConvolve1D`,
   `pylops.signalprocessing.NonStationaryConvolve2D`, `pylops.signalprocessing.NonStationaryFilters1D`, and

MIGRATION_V1_V2.md

@@ -10,7 +10,7 @@ should be used as a checklist when converting a piece of code using PyLops from
   for every operator by default. While the change is mostly backwards compatible, there are some operators (e.g. the ``Bilinear``
   transpose/conjugate) which can output reshaped arrays instead of 1d-arrays. To ensure no breakage, you can entirely disable this
   feature either globally by setting ``pylops.set_ndarray_multiplication(False)``, or locally with the context manager
-  ``pylops.disabled_ndarray_multiplication()``. Both will revert to v1.x behavior. At this time, PyLops sparse solvers do
+  ``pylops.disabled_ndarray_multiplication()``. Both will revert to v1.x behavior. At this time, PyLops solvers do
   *not* support N-D array multiplication.
 
   See the table at the end of this document for support ndarray operations.

Makefile

@@ -31,7 +31,7 @@ dev-install_conda:
 
 tests:
 	make pythoncheck
-	$(PYTHON) setup.py test
+	pytest
 
 doc:
 	cd docs  && rm -rf source/api/generated && rm -rf source/gallery &&\

README.md

@@ -147,3 +147,5 @@ A list of video tutorials to learn more about PyLops:
 * Juan Daniel Romero, jdromerom
 * Aniket Singh Rawat, dikwickley
 * Rohan Babbar, rohanbabbar04
+* Wei Zhang, ZhangWeiGeo
+* Fedor Goncharov, fedor-goncharov

azure-pipelines.yml

@@ -55,7 +55,7 @@ jobs:
   steps:
   - task: UsePythonVersion@0
     inputs:
-      versionSpec: '3.7'
+      versionSpec: '3.8'
       architecture: 'x64'
 
   - script: |
@@ -65,7 +65,7 @@ jobs:
     displayName: 'Install prerequisites and library'
 
   - script: |
-      python setup.py test
+      pytest
     condition: succeededOrFailed()
     displayName: 'Run tests'
 
@@ -84,7 +84,7 @@ jobs:
   steps:
   - task: UsePythonVersion@0
     inputs:
-      versionSpec: '3.7'
+      versionSpec: '3.8'
       architecture: 'x64'
 
   - script: |
@@ -94,6 +94,6 @@ jobs:
     displayName: 'Install prerequisites and library'
 
   - script: |
-      python setup.py test
+      pytest
     condition: succeededOrFailed()
     displayName: 'Run tests'

docs/source/api/index.rst

@@ -91,6 +91,7 @@ Signal processing
     ConvolveND
     NonStationaryConvolve1D
     NonStationaryConvolve2D
+    NonStationaryConvolve3D
     NonStationaryFilters1D
     NonStationaryFilters2D
     Interp