Toast 3 Work in Progress

.github/dependabot.yml

@@ -0,0 +1,9 @@
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/workflows/deploy.yml

@@ -7,128 +7,126 @@ on:
     tags:
       - '*'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 env:
   TWINE_USERNAME: __token__
   TWINE_PASSWORD: ${{ secrets.TWINE_TOKEN }}
 
 jobs:
-  sdist:
-    name: Python source dist
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v2
-        with:
-          python-version: 3.7
-      - name: Install Dependencies
-        run: pip install twine
-      - name: Pull Dependency Image
-        run: docker pull hpc4cmb/toast-deps-py37:latest
-      - name: Create dist directory
-        run: mkdir -p dist && rm -f dist/*
-      - name: Build source package
-        run: docker run -v "$(pwd)":/home/toast hpc4cmb/toast-deps-py37:latest /home/toast/wheels/build_sdist.sh
-      - name: Upload to PyPI
-        run: |
-          python -m twine upload dist/toast*.tar.gz
-  wheels-36:
-    name: Python 3.6 wheels for ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-latest, macos-latest]
-    env:
-      CIBW_BUILD: cp36-macosx_x86_64 cp36-manylinux_x86_64
-      CIBW_MANYLINUX_X86_64_IMAGE: manylinux2010
-      CIBW_MANYLINUX_I686_IMAGE: manylinux2010
-      CIBW_BUILD_VERBOSITY: 3
-      CIBW_ENVIRONMENT_LINUX: "PATH=/usr/lib64/mpich-3.2/bin:${PATH} TOAST_BUILD_BLAS_LIBRARIES='-lopenblas -fopenmp -lm -lgfortran' TOAST_BUILD_LAPACK_LIBRARIES='-lopenblas -fopenmp -lm -lgfortran' TOAST_BUILD_CMAKE_VERBOSE_MAKEFILE=ON"
-      CIBW_ENVIRONMENT_MACOS:
-      CIBW_BEFORE_BUILD_LINUX: ./wheels/install_deps_linux.sh
-      CIBW_BEFORE_BUILD_MACOS: ./wheels/install_deps_osx.sh
-      CIBW_BEFORE_TEST: pip3 install numpy && pip3 install mpi4py
-      CIBW_TEST_COMMAND: export OMP_NUM_THREADS=2; python -c 'import toast.tests; toast.tests.run()'
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
-        name: Install Python
-        with:
-          python-version: '3.7'
-      - name: Install cibuildwheel
-        run: |
-          python -m pip install twine cibuildwheel==1.6.3
-      - name: Build wheel
-        run: |
-          python -m cibuildwheel --output-dir wheelhouse
-      - name: Upload to PyPI
-        run: |
-          python -m twine upload wheelhouse/toast*.whl
-  wheels-37:
-    name: Python 3.7 wheels for ${{ matrix.os }}
+  build_wheels:
+    name: Build wheel for cp${{ matrix.python }}-${{ matrix.builder }}_${{ matrix.arch }}
     runs-on: ${{ matrix.os }}
     strategy:
+      # Ensure that a wheel builder finishes even if another fails.  Useful for
+      # debugging multiple problems in parallel.
+      fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-latest]
-    env:
-      CIBW_BUILD: cp37-macosx_x86_64 cp37-manylinux_x86_64
-      CIBW_MANYLINUX_X86_64_IMAGE: manylinux2010
-      CIBW_MANYLINUX_I686_IMAGE: manylinux2010
-      CIBW_BUILD_VERBOSITY: 3
-      CIBW_ENVIRONMENT_LINUX: "PATH=/usr/lib64/mpich-3.2/bin:${PATH} TOAST_BUILD_BLAS_LIBRARIES='-lopenblas -fopenmp -lm -lgfortran' TOAST_BUILD_LAPACK_LIBRARIES='-lopenblas -fopenmp -lm -lgfortran' TOAST_BUILD_CMAKE_VERBOSE_MAKEFILE=ON"
-      CIBW_ENVIRONMENT_MACOS:
-      CIBW_BEFORE_BUILD_LINUX: ./wheels/install_deps_linux.sh
-      CIBW_BEFORE_BUILD_MACOS: ./wheels/install_deps_osx.sh
-      CIBW_BEFORE_TEST: pip3 install numpy && pip3 install mpi4py
-      CIBW_TEST_COMMAND: export OMP_NUM_THREADS=2; python -c 'import toast.tests; toast.tests.run()'
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
-        name: Install Python
-        with:
-          python-version: '3.7'
-      - name: Install cibuildwheel
-        run: |
-          python -m pip install twine cibuildwheel==1.6.3
-      - name: Build wheel
-        run: |
-          python -m cibuildwheel --output-dir wheelhouse
-      - name: Upload to PyPI
-        run: |
-          python -m twine upload wheelhouse/toast*.whl
-  wheels-38:
-    name: Python 3.8 wheels for ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-latest, macos-latest]
+        include:
+          # Linux 64 bit manylinux
+          - os: ubuntu-latest
+            arch: x86_64
+            python: 39
+            builder: manylinux
+          - os: ubuntu-latest
+            arch: x86_64
+            python: 310
+            builder: manylinux
+          - os: ubuntu-latest
+            arch: x86_64
+            python: 311
+            builder: manylinux
+          - os: ubuntu-latest
+            arch: x86_64
+            python: 312
+            builder: manylinux
+
+          # MacOS x86_64.  The macos-13 runner is the last
+          # Intel-based runner version.  At some point we'll
+          # need to switch to macos-latest and test cross compiling.
+          - os: macos-13
+            arch: x86_64
+            python: 310
+            builder: macosx
+            deploy: 13.0
+          - os: macos-13
+            arch: x86_64
+            python: 311
+            builder: macosx
+            deploy: 13.0
+          - os: macos-13
+            arch: x86_64
+            python: 312
+            builder: macosx
+            deploy: 13.0
+
+          # MacOS arm64
+          - os: macos-latest
+            arch: arm64
+            python: 310
+            builder: macosx
+            deploy: 14.0
+          - os: macos-latest
+            arch: arm64
+            python: 311
+            builder: macosx
+            deploy: 14.0
+          - os: macos-latest
+            arch: arm64
+            python: 312
+            builder: macosx
+            deploy: 14.0
     env:
-      CIBW_BUILD: cp38-macosx_x86_64 cp38-manylinux_x86_64
-      CIBW_MANYLINUX_X86_64_IMAGE: manylinux2010
-      CIBW_MANYLINUX_I686_IMAGE: manylinux2010
+      CIBW_BUILD: cp${{ matrix.python }}-${{ matrix.builder }}_${{ matrix.arch }}
+      CIBW_MANYLINUX_X86_64_IMAGE: ${{ matrix.builder }}2014
+      CIBW_MANYLINUX_I686_IMAGE: ${{ matrix.builder }}2014
       CIBW_BUILD_VERBOSITY: 3
-      CIBW_ENVIRONMENT_LINUX: "PATH=/usr/lib64/mpich-3.2/bin:${PATH} TOAST_BUILD_BLAS_LIBRARIES='-lopenblas -fopenmp -lm -lgfortran' TOAST_BUILD_LAPACK_LIBRARIES='-lopenblas -fopenmp -lm -lgfortran' TOAST_BUILD_CMAKE_VERBOSE_MAKEFILE=ON"
-      CIBW_ENVIRONMENT_MACOS:
-      CIBW_BEFORE_BUILD_LINUX: ./wheels/install_deps_linux.sh
-      CIBW_BEFORE_BUILD_MACOS: ./wheels/install_deps_osx.sh
-      CIBW_BEFORE_TEST: pip3 install numpy && pip3 install mpi4py
-      CIBW_TEST_COMMAND: export OMP_NUM_THREADS=2; python -c 'import toast.tests; toast.tests.run()'
+      CIBW_ENVIRONMENT_LINUX: >
+        TOAST_BUILD_CMAKE_VERBOSE_MAKEFILE=ON
+        TOAST_BUILD_TOAST_STATIC_DEPS=ON
+        TOAST_BUILD_BLAS_LIBRARIES='-L/usr/local/lib -lopenblas -fopenmp -lm -lgfortran'
+        TOAST_BUILD_LAPACK_LIBRARIES='-L/usr/local/lib -lopenblas -fopenmp -lm -lgfortran'
+        TOAST_BUILD_FFTW_ROOT=/usr/local
+        TOAST_BUILD_AATM_ROOT=/usr/local
+        TOAST_BUILD_SUITESPARSE_INCLUDE_DIR_HINTS=/usr/local/include
+        TOAST_BUILD_SUITESPARSE_LIBRARY_DIR_HINTS=/usr/local/lib
+      CIBW_ENVIRONMENT_MACOS: >
+        MACOSX_DEPLOYMENT_TARGET=${{ matrix.deploy }}
+        TOAST_BUILD_CMAKE_C_COMPILER=clang
+        TOAST_BUILD_CMAKE_CXX_COMPILER=clang++
+        TOAST_BUILD_CMAKE_C_FLAGS='-O3 -fPIC'
+        TOAST_BUILD_CMAKE_CXX_FLAGS='-O3 -fPIC -std=c++11 -stdlib=libc++'
+        TOAST_BUILD_CMAKE_VERBOSE_MAKEFILE=ON
+        TOAST_BUILD_DISABLE_OPENMP=1
+        TOAST_BUILD_BLAS_LIBRARIES='/usr/local/lib/libopenblas.dylib'
+        TOAST_BUILD_LAPACK_LIBRARIES='/usr/local/lib/libopenblas.dylib'
+        TOAST_BUILD_FFTW_ROOT=/usr/local
+        TOAST_BUILD_AATM_ROOT=/usr/local
+        TOAST_BUILD_SUITESPARSE_INCLUDE_DIR_HINTS=/usr/local/include
+        TOAST_BUILD_SUITESPARSE_LIBRARY_DIR_HINTS=/usr/local/lib
+      CIBW_BEFORE_BUILD_LINUX: ./packaging/wheels/install_deps_linux.sh
+      CIBW_BEFORE_BUILD_MACOS: ./packaging/wheels/install_deps_osx.sh
+      CIBW_BEFORE_TEST: export OMP_NUM_THREADS=1
+      CIBW_TEST_COMMAND: source {project}/packaging/wheels/cibw_run_tests.sh
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+        uses: actions/checkout@v4
+
+      - uses: actions/setup-python@v5
         name: Install Python
         with:
-          python-version: '3.7'
+          python-version: '3.10'
+
       - name: Install cibuildwheel
         run: |
-          python -m pip install twine cibuildwheel==1.6.3
+          python -m pip install twine cibuildwheel==2.20.0
+
       - name: Build wheel
         run: |
           python -m cibuildwheel --output-dir wheelhouse
+
       - name: Upload to PyPI
         run: |
-          python -m twine upload wheelhouse/toast*.whl
+          python -m twine upload wheelhouse/toast*cp${{ matrix.python }}-${{ matrix.builder }}*${{ matrix.arch }}*.whl