Merge pull request #256 from slimgroup/fs-fix

Fs fix

Author: mloubout

.github/workflows/ci-examples.yml

@@ -63,7 +63,7 @@ jobs:
       - name: Set julia python
         run: |
           python3 -m pip install -U pip
-          python3 -m pip install matplotlib seiscm colorcet
+          python3 -m pip install "matplotlib<3.9" seiscm colorcet
           echo "PYTHON=$(which python3)" >> $GITHUB_ENV
           julia -e 'using Pkg;Pkg.add(["PyCall", "PyPlot", "SlimPlotting"])'
 

.github/workflows/ci-judi.yml

@@ -19,6 +19,7 @@ jobs:
     name: JUDI base on Julia ${{ matrix.version }} - ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     env:
+      DEVITO_ARCH: gcc-11
       DEVITO_LANGUAGE: "openmp"
       OMP_NUM_THREADS: 4
       GROUP: "JUDI"
@@ -28,21 +29,12 @@ jobs:
 
       matrix:
         version: ['1.6', '1.7', '1.8', '1.9', '1.10']
-        os: [ubuntu-latest, macos-latest]
+        os: [ubuntu-latest, macos-13]
 
     steps:
       - name: Checkout JUDI
         uses: actions/checkout@v4
 
-      - name: Cache julia install
-        uses: actions/cache@v4
-        env:
-          cache-name: cache-julia-pkgs
-        with:
-          # julia is installed in ~/.julia
-          path: ~/.julia
-          key: ${{ matrix.os }}-${{ matrix.version }}-${{ env.cache-name }}
-
       - name: Setup julia
         uses: julia-actions/setup-julia@v1
         with:
@@ -54,19 +46,6 @@ jobs:
         with:
           python-version: 3.9
 
-      - name: setup devito config
-        run: |
-          if [ "${{matrix.os}}" = "macos-latest" ]; then
-              brew install llvm libomp
-              echo "/opt/homebrew/bin:/opt/homebrew/opt/llvm/bin" >> GITHUB_PATH
-              echo "LD_LIBRARY_PATH=/opt/homebrew/opt/llvm/lib" >> GITHUB_ENV
-              echo "DEVITO_ARCH=clang" >> $GITHUB_ENV
-              echo "DEVITO_PLATFORM=m1" >> $GITHUB_ENV
-          else
-              echo "DEVITO_ARCH=gcc-12" >> $GITHUB_ENV
-              echo "DEVITO_PLATFORM=cpu64" >> $GITHUB_ENV        
-          fi
-
       - name: Set julia python
         run: |
           PYTHON=$(which python3) julia -e 'using Pkg;Pkg.add("PyCall");Pkg.build("PyCall")'
@@ -82,4 +61,4 @@ jobs:
       - uses: julia-actions/julia-processcoverage@v1
       - uses: codecov/codecov-action@v3
         with:
-          file: lcov.info
+          file: lcov.info

.github/workflows/ci-op.yml

@@ -19,6 +19,7 @@ jobs:
     name: ${{ matrix.op }} on Julia ${{ matrix.version }} - ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     env:
+      DEVITO_ARCH: gcc-11
       DEVITO_LANGUAGE: "openmp"
       DEVITO_LOGGING: "INFO"
       OMP_NUM_THREADS: ${{ matrix.omp }}
@@ -34,17 +35,17 @@ jobs:
         omp: [2]
 
         include:
-          - os: macos-latest
+          - os: macos-13
             version: '1.6'
             op: "ISO_OP"
             omp: 1
 
-          - os: macos-latest
+          - os: macos-13
             version: '1.8'
             op: "ISO_OP"
             omp: 1
 
-          - os: macos-latest
+          - os: macos-13
             version: '1.9'
             op: "ISO_OP"
             omp: 1
@@ -63,15 +64,6 @@ jobs:
       - name: Checkout JUDI
         uses: actions/checkout@v4
 
-      - name: Cache julia install
-        uses: actions/cache@v4
-        env:
-          cache-name: cache-julia-pkgs
-        with:
-          # julia is installed in ~/.julia
-          path: ~/.julia
-          key: ${{ matrix.os }}-${{ matrix.version }}-${{ env.cache-name }}
-
       - name: Setup julia
         uses: julia-actions/setup-julia@v1
         with:
@@ -83,19 +75,6 @@ jobs:
         with:
           python-version: 3.9
 
-      - name: setup devito config
-        run: |
-          if [ "${{matrix.os}}" = "macos-latest" ]; then
-              brew install llvm libomp
-              echo "/opt/homebrew/bin:/opt/homebrew/opt/llvm/bin" >> GITHUB_PATH
-              echo "LD_LIBRARY_PATH=/opt/homebrew/opt/llvm/lib" >> GITHUB_ENV
-              echo "DEVITO_ARCH=clang" >> $GITHUB_ENV
-              echo "DEVITO_PLATFORM=m1" >> $GITHUB_ENV
-          else
-              echo "DEVITO_ARCH=gcc-12" >> $GITHUB_ENV
-              echo "DEVITO_PLATFORM=cpu64" >> $GITHUB_ENV        
-          fi
-
       - name: Set julia python
         run: |
           PYTHON=$(which python3) julia -e 'using Pkg;Pkg.add("PyCall");Pkg.build("PyCall")'
@@ -111,4 +90,4 @@ jobs:
       - uses: julia-actions/julia-processcoverage@v1
       - uses: codecov/codecov-action@v3
         with:
-          file: lcov.info
+          file: lcov.info

Project.toml

@@ -1,7 +1,7 @@
 name = "JUDI"
 uuid = "f3b833dc-6b2e-5b9c-b940-873ed6319979"
 authors = ["Philipp Witte, Mathias Louboutin"]
-version = "3.4.2"
+version = "3.4.3"
 
 [deps]
 ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"

src/TimeModeling/Preconditioners/DataPreconditioners.jl

@@ -198,9 +198,9 @@ transpose(I::FrequencyFilter{T}) where T = I
 
 function tracefilt!(x, y, ypad, filter)
     n = length(y)
-    ypad[1:n-1] .= view(y, n:-1:2)
-    ypad[n:end] .= y
-    x .= filtfilt(filter, ypad)[n:end]
+    ypad[1:n] .= y
+    ypad[n:end] .= view(y, n:-1:1)
+    x .= filtfilt(filter, ypad)[1:n]
     nothing
 end
 

src/pysource/fields_exprs.py

@@ -102,7 +102,7 @@ def extended_rec(model, wavelet, v):
     return [Inc(ws, model.grid.time_dim.spacing * wf * wt)]
 
 
-def freesurface(model, eq, mfuncs=None):
+def freesurface(model, eq, mfuncs=None, fd_only=False):
     """
     Generate the stencil that mirrors the field as a free surface modeling for
     the acoustic wave equation
@@ -145,7 +145,8 @@ def freesurface(model, eq, mfuncs=None):
 
             dzmapper = {d: v.subs(mapper) for d, v in Dz.items()}
             fs_eq.append(p.func(lhs, rhs.subs(dzmapper), subdomain=fsdomain))
-            fs_eq.append(p.func(lhs._subs(z, 0), 0, subdomain=fsdomain))
+            if not fd_only:
+                fs_eq.append(p.func(lhs._subs(z, 0), 0, subdomain=fsdomain))
 
     return fs_eq
 

src/pysource/sensitivity.py

@@ -46,7 +46,7 @@ def grad_expr(gradm, u, v, model, w=None, freq=None, dft_sub=None, ic="as"):
     if model.fs and ic in ["fwi", "isic"]:
         # Only need `fs` processing for isic for the spatial derivatives.
         eq_g = [Eq(gradm, gradm - expr, subdomain=model.grid.subdomains['nofsdomain'])]
-        eq_g += freesurface(model, eq_g, (*as_tuple(u), *as_tuple(v)))
+        eq_g += freesurface(model, eq_g, (*as_tuple(u), *as_tuple(v)), fd_only=True)
     else:
         eq_g = [Eq(gradm, gradm - expr)]
     return eq_g