CI: misc docker deploy fixes

Author: mloubout

.github/workflows/docker-bases.yaml

@@ -40,7 +40,7 @@ jobs:
   ############## Basic gcc CPU ##########################
   #######################################################
   deploy-cpu-bases:
-    if: inputs.cpu
+    if: ${{ github.event_name != 'workflow_dispatch' || inputs.cpu }}
     name: "cpu-base-${{ matrix.arch }}-gcc${{ matrix.gcc }}"
     runs-on: ${{ matrix.runner }}
     env:
@@ -88,7 +88,7 @@ jobs:
           tags: "devitocodes/bases:cpu-gcc${{ matrix.gcc }}-${{ matrix.arch }}"
 
   deploy-cpu-bases-manifest:
-    if: inputs.cpu
+    if: ${{ github.event_name != 'workflow_dispatch' || inputs.cpu }}
     name: "cpu-base-manifest"
     runs-on: ubuntu-latest
     needs: deploy-cpu-bases
@@ -123,7 +123,7 @@ jobs:
   ############## Intel OneApi CPU #######################
   #######################################################
   deploy-oneapi-bases:
-    if: inputs.intel
+    if: ${{ github.event_name != 'workflow_dispatch' || inputs.intel }}
     name: "oneapi-base"
     runs-on: ubuntu-latest
     env:
@@ -181,7 +181,7 @@ jobs:
   ################### Nvidia nvhpc ######################
   #######################################################
   deploy-nvidia-bases:
-    if: inputs.nvidia
+    if: ${{ github.event_name != 'workflow_dispatch' || inputs.nvidia }}
     name: "nvidia-bases-${{ matrix.arch }}"
     runs-on: ${{ matrix.runner }}
     env:
@@ -270,7 +270,7 @@ jobs:
           tags: "devitocodes/bases:cpu-nvc${{ matrix.extra_tag }}-${{ matrix.arch }}"
 
   deploy-nvidia-bases-manifest:
-    if: inputs.nvidia
+    if: ${{ github.event_name != 'workflow_dispatch' || inputs.nvidia }}
     name: "nvidia-base-manifest"
     runs-on: ubuntu-latest
     needs: deploy-nvidia-bases
@@ -305,7 +305,7 @@ jobs:
   ##################### AMD #############################
   #######################################################
   deploy-amd-bases:
-    if: inputs.amd
+    if: ${{ github.event_name != 'workflow_dispatch' || inputs.amd }}
     name: "amd-base"
     runs-on: ["self-hosted", "amdgpu"]
     env:

devito/ir/clusters/algorithms.py

@@ -286,7 +286,8 @@ def guard(clusters):
                     conditionals.pop(cd, None)
                     exprs[i] = e.func(*e.args, conditionals=conditionals)
 
-            # Combination mode is And by default and Or if all conditions are
+            # Combination `mode` is And by default.
+            # If all conditions are Or then Or combination `mode` is used.
             guards = {d: mode(*v, evaluate=False) for d, v in guards.items()}
 
             # Construct a guarded Cluster

devito/types/dimension.py

@@ -861,7 +861,10 @@ class ConditionalDimension(DerivedDimension):
         index into arrays. A typical use case is when arrays are accessed
         indirectly via the ``condition`` expression.
     relation: Or/And, default=And
-        How this ConditionalDimension will be combined with other ones.
+        How this ConditionalDimension will be combined with other ones during
+        lowering for example combining Function's ConditionalDimension with
+        an Equation's implicit_dim. All Dimensions within an equation
+        must have `Or` relation for the final combined condition to be Or.
 
     Examples
     --------

docker/Dockerfile.intel

@@ -26,7 +26,7 @@ FROM base AS oneapi
 
 # Download the key to system keyring
 # https://www.intel.com/content/www/us/en/develop/documentation/installation-guide-for-intel-oneapi-toolkits-linux/top/installation/install-using-package-managers/apt.html#apt
-SHELL /bin/bash -o pipefail
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN wget --progress=dot:giga -O- https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB | gpg --dearmor > /usr/share/keyrings/oneapi-archive-keyring.gpg
 RUN echo "deb [signed-by=/usr/share/keyrings/oneapi-archive-keyring.gpg] https://apt.repos.intel.com/oneapi all main" > /etc/apt/sources.list.d/oneAPI.list
 
@@ -37,7 +37,7 @@ RUN apt-get update -y && \
 
 # Drivers mandatory for intel gpu
 # https://dgpu-docs.intel.com/driver/installation.html#ubuntu-install-steps
-SHELL /bin/bash -o pipefail
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN wget -qO - https://repositories.intel.com/graphics/intel-graphics.key | gpg --dearmor > /usr/share/keyrings/intel-graphics.gpg
 RUN echo "deb [arch=amd64 signed-by=/usr/share/keyrings/intel-graphics.gpg] https://repositories.intel.com/graphics/ubuntu jammy unified" >  /etc/apt/sources.list.d/intel-gpu-jammy.list
 

docker/Dockerfile.nvidia

@@ -19,7 +19,7 @@ RUN apt-get update && \
                           dh-autoreconf python3-venv python3-dev python3-pip
 
 # nodesource: nvdashboard requires nodejs>=10
-SHELL /bin/bash -o pipefail
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN curl https://developer.download.nvidia.com/hpc-sdk/ubuntu/DEB-GPG-KEY-NVIDIA-HPC-SDK | gpg --yes --dearmor -o /usr/share/keyrings/nvidia-hpcsdk-archive-keyring.gpg
 RUN arch="$(uname -m)" && \
     case "$arch" in \
@@ -92,7 +92,7 @@ ENV UCX_TLS=cuda,cuda_copy,cuda_ipc,sm,shm,self
 #ENV UCX_TLS=cuda,cuda_copy,cuda_ipc,sm,shm,self,rc_x,gdr_copy
 
 # Make simlink for path setup since ENV doesn't accept shell commands.
-SHELL /bin/bash -o pipefail
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN arch="$(uname -m)" && \
     case "$arch" in \
         x86_64) linux=Linux_x86_64 ;; \

examples/seismic/tutorials/02_rtm.ipynb

@@ -87,7 +87,7 @@
     "        return demo_model('marmousi2d-isotropic', data_path='../../../../data/',\n",
     "                          grid=grid, nbl=20)\n",
     "    filter_sigma = (6, 6)\n",
-    "    nshots = 301  # Need good covergae in shots, one every two grid points\n",
+    "    nshots = 301  # Need good coverage in shots, one every two grid points\n",
     "    nreceivers = 601  # One receiver every grid point\n",
     "    t0 = 0.\n",
     "    tn = 3500.  # Simulation last 3.5 second (3500 ms)\n",