Merge public

.github/workflows/Build.yml

@@ -1,162 +1,168 @@
 name: Build
 
-# Controls when the action will run. 
+# Controls when the action will run.
 on:
   # Triggers the workflow on push or pull request events but only for the public branch
   push:
-    branches: [ public ]
+    branches: [ public, mesonify ]
   pull_request:
-    branches: [ public ]
+    branches: [ public, mesonify ]
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
-  # This workflow contains a single job called "build"
+  # Build and test QUIP with meson
   build:
-    # The type of runner that the job will run on
-    runs-on: ubuntu-latest
+    name: Build QUIP (${{ matrix.os }}, Python ${{ matrix.python-version }})
+    runs-on: ${{ matrix.os }}
 
     strategy:
+      fail-fast: false
       matrix:
-        arch: [ linux_x86_64_gfortran, linux_x86_64_gfortran_openmp ]
-        gcc_version: [ 9 ]
-        have_gap: [ 0, 1 ]
-        have_scalapack: [ 0 ]
-        include:
-          - arch: linux_x86_64_gfortran_openmp
-            gcc_version: 10
-            have_gap: 1
-            have_scalapack: 0
-          - arch: linux_x86_64_gfortran_openmpi+openmp
-            gcc_version: 9
-            have_gap: 1
-            have_scalapack: 1
-
-    # Steps represent a sequence of tasks that will be executed as part of the job
+        os: [ubuntu-latest, macos-14]  # macos-14 is native ARM64
+        python-version: ['3.9', '3.10', '3.11', '3.12']
+
     steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v3
+      - name: Checkout repository
+        uses: actions/checkout@v4
         with:
           submodules: 'recursive'
 
-      - name: Install dependencies
-        env:
-          QUIP_ARCH: ${{ matrix.arch }}
-          HAVE_GAP: ${{ matrix.have_gap }}
-          HAVE_SCALAPACK: ${{ matrix.have_scalapack }}
-          gcc_version: ${{ matrix.gcc_version }}
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install system dependencies (Linux)
+        if: runner.os == 'Linux'
         run: |
           sudo apt-get update -y
-          sudo apt-get install -y  gfortran libblas-dev liblapack-dev \
-            openmpi-bin libopenmpi-dev netcdf-bin libnetcdf-dev libhdf5-serial-dev \
-            python3-numpy
-
-          if [[ "$HAVE_SCALAPACK" == 1 ]]; then
-            sudo apt-get install -y libscalapack-openmpi-dev
-          fi
-
-          if [[ "$gcc_version" == 10 ]]; then
-              # compilers explicitly pointing to gcc-10
-
-              export F77=gfortran-10
-              export F90=gfortran-10
-              export F95=gfortran-10
-              export CC=gcc-10
-              export CPLUSPLUS=g++-10
-          fi
-
-      # substitute for make config
-      - name: Include Config
-        env:
-          QUIP_ARCH: ${{ matrix.arch }}
-          HAVE_SCALAPACK: ${{ matrix.have_scalapack }}
+          sudo apt-get install -y gfortran meson ninja-build \
+            libopenblas-dev liblapack-dev \
+            libnetcdf-dev libhdf5-serial-dev
+
+      - name: Install system dependencies (macOS)
+        if: runner.os == 'macOS'
+        run: |
+          brew install gcc meson ninja openblas
+          # Create gfortran symlink since homebrew installs versioned binaries
+          for gfortran_bin in /opt/homebrew/bin/gfortran-* /usr/local/bin/gfortran-*; do
+            if [ -f "$gfortran_bin" ]; then
+              sudo ln -sf "$gfortran_bin" /usr/local/bin/gfortran
+              break
+            fi
+          done
+          gfortran --version
+
+      - name: Install Python dependencies
         run: |
-          mkdir -p build/${QUIP_ARCH}
-
-          if [[ "$HAVE_SCALAPACK" == 1 ]]; then
-              cp -v .github/workflows/Makefile.openmpi+openmp.inc build/${QUIP_ARCH}/Makefile.inc
-          elif [[ "$gcc_version" == 10 ]]; then
-              cp -v .github/workflows/Makefile.gcc10.inc build/${QUIP_ARCH}/Makefile.inc
-          else
-              # gcc-9 is the default one in github actions containers (last checked: 2021 Aug)
-              cp -v .github/workflows/Makefile.inc build/${QUIP_ARCH}/Makefile.inc
-          fi
-
-      - name: Build QUIP
+          python -m pip install --upgrade pip
+          pip install numpy ase meson-python build
+          pip install 'f90wrap>=0.3.0'
         env:
-          QUIP_ARCH: ${{ matrix.arch }}
-          HAVE_GAP: ${{ matrix.have_gap }}
-          HAVE_SCALAPACK: ${{ matrix.have_scalapack }}
+          FC: gfortran
+          CC: gcc
+
+      - name: Build QUIP libraries
         run: |
-          make
-          make libquip
-          make quippy
-          make install-quippy
-
-      # Uncomment to get SSH access for testing
-#       - name: Setup tmate session
-#         if: failure()
-#         uses: mxschmitt/action-tmate@v3            
+          meson setup builddir
+          meson compile -C builddir
+        env:
+          PKG_CONFIG_PATH: ${{ runner.os == 'macOS' && '/opt/homebrew/opt/openblas/lib/pkgconfig:/usr/local/opt/openblas/lib/pkgconfig' || '' }}
 
-      - name: Test QUIP
+      - name: Build and install quippy
+        run: |
+          cd quippy
+          pip install .
         env:
-          QUIP_ARCH: ${{ matrix.arch }}
-          HAVE_GAP: ${{ matrix.have_gap }}
-          HAVE_SCALAPACK: ${{ matrix.have_scalapack }}
+          PKG_CONFIG_PATH: ${{ runner.os == 'macOS' && '/opt/homebrew/opt/openblas/lib/pkgconfig:/usr/local/opt/openblas/lib/pkgconfig' || '' }}
+
+      - name: Run quippy tests
         run: |
-          export QUIP_ROOT=$PWD
-          ulimit -n 256
-          make test
+          cd tests
+          python run_all.py
+        env:
+          BUILDDIR: ${{ github.workspace }}/builddir/src/Programs
 
-  # Builds the QUIP docs webpage image. This only happens ON the public 
+      # Uncomment to get SSH access for testing
+      # - name: Setup tmate session
+      #   if: failure()
+      #   uses: mxschmitt/action-tmate@v3
+      #   timeout-minutes: 15
+
+  # Builds the QUIP docs webpage image. This only happens ON the public
   # branch, after tests pass and pull requests are completed
+  # TEMPORARILY DISABLED - needs investigation
   docs:
     runs-on: ubuntu-latest
     needs: build
-    if: github.ref == 'refs/heads/public'
+    if: false  # github.ref == 'refs/heads/public'
 
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          submodules: 'recursive'
 
-      - name: Build documentation
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.11'
+
+      - name: Install system dependencies
+        run: |
+          sudo apt-get update -y
+          sudo apt-get install -y gfortran meson ninja-build \
+            libopenblas-dev pandoc
+
+      - name: Install Python dependencies
         run: |
-          sudo apt-get install -y libgsl0-dev libxpm-dev pandoc
-          pip install sphinx sphinx-rtd-theme nbsphinx numpydoc pygments==2.5.2 nbconvert[execute] ipython
+          python -m pip install --upgrade pip
+          pip install sphinx sphinx-rtd-theme nbsphinx numpydoc \
+            pygments nbconvert ipython numpy ase meson-python
 
-          # FIXME: currently we use the released version of quippy package to build docs, 
-          # would be better to cache wheel from step above
-          pip install quippy-ase
+      - name: Build QUIP and quippy
+        run: |
+          meson setup builddir
+          meson compile -C builddir
+          cd quippy
+          pip install --no-build-isolation .
 
+      - name: Build documentation
+        run: |
           cd doc
           python -m sphinx . _build/html
 
       - name: Deploy documentation
-        uses: peaceiris/actions-gh-pages@v3
+        uses: peaceiris/actions-gh-pages@v4
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: doc/_build/html
 
   # Builds the QUIP docker image. This takes about 1h 20min
   # this only happens ON the public branch, after pull requests
   # are completed
+  # TEMPORARILY DISABLED - needs investigation
   docker:
     runs-on: ubuntu-latest
     needs: build # depends on the previous matrix jobs to succeed
-    if: github.ref == 'refs/heads/public'
+    if: false  # github.ref == 'refs/heads/public'
 
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          submodules: 'recursive'
 
       - name: Log in to Docker Hub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
-      # with dev tag for now
-      - name: Build quip
+      - name: Build and push QUIP Docker image
         run: |
           docker build --tag libatomsquip/quip:public docker
           docker push libatomsquip/quip:public