docker: build arm base

devitocodes · Apr 24, 2024 · 13d0ead · 13d0ead
1 parent 1646687
commit 13d0ead
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 15 deletions.
diff --git a/.github/workflows/docker-bases.yml b/.github/workflows/docker-bases.yml
@@ -52,14 +52,16 @@ jobs:
         run: docker system prune -a -f
 
       - name: GCC image
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: './docker/Dockerfile.cpu'
           push: true
           target: 'gcc'
           build-args: 'arch=gcc'
           tags: 'devitocodes/bases:cpu-gcc'
+          platforms: linux/amd64,linux/arm64
+
 
 #######################################################
 ############## Intel OneApi CPU #######################

diff --git a/.github/workflows/pytest-core-nompi.yml b/.github/workflows/pytest-core-nompi.yml
@@ -36,7 +36,7 @@ jobs:
            pytest-ubuntu-py310-gcc10-noomp,
            pytest-ubuntu-py312-gcc13-omp,
            pytest-ubuntu-py39-gcc9-omp,
-           pytest-osx-py37-clang-omp,
+           pytest-osx-py312-clang-omp,
            pytest-docker-py39-gcc-omp,
            pytest-docker-py39-icx-omp
         ]
@@ -84,8 +84,8 @@ jobs:
           language: "openmp"
           sympy: "1.9"
 
-        - name: pytest-osx-py37-clang-omp
-          python-version: '3.7'
+        - name: pytest-osx-py312-clang-omp
+          python-version: '3.12'
           os: macos-latest
           arch: "clang"
           language: "C"
@@ -112,7 +112,7 @@ jobs:
           test-set: 'adjoint'
 
         exclude:
-        - name: pytest-osx-py37-clang-omp
+        - name: pytest-osx-py312-clang-omp
           set: adjoint
 
     steps:

diff --git a/.github/workflows/tutorials.yml b/.github/workflows/tutorials.yml
@@ -22,30 +22,30 @@ jobs:
     env:
       DEVITO_ARCH: "${{ matrix.compiler }}"
       DEVITO_LANGUAGE: ${{ matrix.language }}
-      PYTHON_VERSION: "3.9"
+      PYTHON_VERSION: "3.11"
 
     strategy:
       # Prevent all build to stop if a single one fails
       fail-fast: false
       matrix:
         name: [
-          tutos-ubuntu-gcc-py39,
-          tutos-osx-clang-py39,
-          tutos-docker-gcc-py39
+          tutos-ubuntu-gcc-py311,
+          tutos-osx-clang-py311,
+          tutos-docker-gcc-py311
           ]
 
         include:
-          - name: tutos-ubuntu-gcc-py39
+          - name: tutos-ubuntu-gcc-py311
             os: ubuntu-latest
             compiler: gcc
             language: "openmp"
 
-          - name: tutos-osx-clang-py39
+          - name: tutos-osx-clang-py311
             os: macos-latest
             compiler: clang
             language: "C"
 
-          - name: tutos-docker-gcc-py39
+          - name: tutos-docker-gcc-py311
             os: ubuntu-latest
             compiler: gcc
             language: "openmp"
@@ -72,15 +72,15 @@ jobs:
 
     - name: Set run prefix
       run: |
-          if [ "${{ matrix.name }}" == 'tutos-docker-gcc-py39' ]; then
+          if [ "${{ matrix.name }}" == 'tutos-docker-gcc-py311' ]; then
               echo "RUN_CMD=docker run --rm --name testrun devito_img" >> $GITHUB_ENV
           else
               echo "RUN_CMD=" >> $GITHUB_ENV
           fi
       id: set-run
 
     - name: Install dependencies
-      if: matrix.name != 'tutos-docker-gcc-py39'
+      if: matrix.name != 'tutos-docker-gcc-py311'
       run: |
         python -m pip install --upgrade pip
         pip install -e .[tests,extras]

diff --git a/docker/Dockerfile.nvidia b/docker/Dockerfile.nvidia
@@ -130,7 +130,7 @@ RUN python3 -m venv /venv && \
     /venv/bin/pip install --no-cache-dir -r https://raw.githubusercontent.com/devitocodes/devito/master/requirements-nvidia.txt && \
     # Install jupyter and setup nvidia configs.
     /venv/bin/pip install --no-cache-dir jupyter && \
-    /venv/bin/jupyter serverextension enable dask_labextension && \
+    /venv/bin/jupyter server extension enable dask_labextension && \
     rm -rf ~/.cache/pip
 
 RUN apt-get clean && apt-get autoclean && apt-get autoremove -y && \