From 85cd9c57cdc7b67d03ab0617fb6fd1308a9fcfa0 Mon Sep 17 00:00:00 2001 From: Eduard Valeyev Date: Sat, 10 Jan 2026 15:44:18 -0500 Subject: [PATCH 1/2] [ci] misc macos fixups: hardwire to macos-15, python 3.14, eigen 3.4, boost 1.90 --- .github/workflows/cmake.yml | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 3d16e4655..2242f279c 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -12,12 +12,12 @@ jobs: fail-fast: false matrix: build_type : [ Release, Debug ] - os : [ macos-latest, ubuntu-24.04 ] + os : [ macos-15, ubuntu-24.04 ] include: - os: ubuntu-24.04 cxx: g++ cc: gcc - - os: macos-latest + - os: macos-15 cxx: clang++ cc: clang @@ -38,7 +38,7 @@ jobs: -DMPIEXEC_PREFLAGS='--bind-to;none;--allow-run-as-root' -DENABLE_FORTRAN=ON -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/build/library/install - -DPython_EXECUTABLE=${{ matrix.os == 'macos-latest' && '/usr/local/Frameworks/Python.framework/Versions/3.11/bin/python3.11' || '/usr/bin/python3' }} + -DPython_EXECUTABLE=${{ matrix.os == 'macos-15' && '/opt/homebrew/bin/python3.14' || '/usr/bin/python3' }} outputs: should_skip: ${{ steps.skip_check.outputs.should_skip }} @@ -61,21 +61,21 @@ jobs: cmake -E make_directory ${{github.workspace}}/build/library_test - name: Install prerequisite MacOS packages - if: ${{ steps.skip_check.outputs.should_skip != 'true' && matrix.os == 'macos-latest' }} + if: ${{ steps.skip_check.outputs.should_skip != 'true' && matrix.os == 'macos-15' }} run: | - brew install ninja gcc@11 gmp boost eigen bison ccache automake python@3.11 numpy scipy + brew install ninja gcc@11 gmp boost@1.90 eigen@3 bison ccache automake python@3.14 numpy scipy #echo "FC=/usr/local/bin/gfortran" >> $GITHUB_ENV echo "FC=/opt/homebrew/Cellar/gcc@11/11.5.0/bin/gfortran-11" >> $GITHUB_ENV - echo "EIGEN3_INCLUDE_DIR=/usr/local/include/eigen3" >> $GITHUB_ENV + echo "EIGEN3_INCLUDE_DIR=/opt/homebrew/opt/eigen@3/include/eigen3" >> $GITHUB_ENV echo "GMP_INCLUDE_DIR=/opt/homebrew/Cellar/gmp/6.3.0/include" >> $GITHUB_ENV echo "GMP_LIBRARY_DIR=/opt/homebrew/Cellar/gmp/6.3.0/lib" >> $GITHUB_ENV - echo "BOOST_INCLUDE_DIR=/opt/homebrew/Cellar/boost/1.89.0/include" >> $GITHUB_ENV - ls -l /opt/homebrew/Cellar/boost/1.89.0/include - brew info python@3.11 - ls -l /opt/homebrew/Cellar/python@3.11/* + echo "BOOST_INCLUDE_DIR=/opt/homebrew/Cellar/boost/1.90.0/include" >> $GITHUB_ENV + ls -l /opt/homebrew/Cellar/boost/1.90.0/include + brew info python@3.14 + ls -l /opt/homebrew/Cellar/python@3.14/* brew info gcc@11 ls -l /opt/homebrew/Cellar/gcc@11/*/bin - pip3.11 install scipy scikit-build-core build pytest + pip3.14 install --break-system-packages scipy scikit-build-core build pytest - name: Install prerequisites Ubuntu packages if: ${{ steps.skip_check.outputs.should_skip != 'true' && matrix.os == 'ubuntu-24.04' }} @@ -121,7 +121,7 @@ jobs: CPPFLAGS="-I$EIGEN3_INCLUDE_DIR" CXXFLAGS="-std=c++11 -Wno-enum-compare" ${{github.workspace}}/configure --with-max-am=2,1 --with-eri-max-am=2,2 --with-eri3-max-am=3,2 --with-eri2-max-am=3,2 --enable-eri=1 --enable-eri3=1 --enable-eri2=0 --enable-1body=1 --disable-1body-property-derivs --with-multipole-max-order=2 fi - if [[ "${{ matrix.os }}" == "macos-latest" ]]; then + if [[ "${{ matrix.os }}" == "macos-15" ]]; then : LDFLAGS="-L$GMP_LIBRARY_DIR" CPPFLAGS="-I$EIGEN3_INCLUDE_DIR -I$BOOST_INCLUDE_DIR -I$GMP_INCLUDE_DIR" CXXFLAGS="-std=c++11 -Wno-enum-compare" ${{github.workspace}}/configure --with-max-am=2,1 --with-eri-max-am=2,2 --with-eri3-max-am=3,2 --with-eri2-max-am=3,2 --enable-eri=1 --enable-eri3=1 --enable-eri2=0 --enable-1body=1 --disable-1body-property-derivs --with-multipole-max-order=2 @@ -152,8 +152,8 @@ jobs: echo LIBINT_VERSION=$LIBINT_VERSION cd libint-2* echo "LIBINT_EXPORTED_DIR=`pwd`" >> $GITHUB_ENV - if [[ "${{ matrix.os }}" == "macos-latest" ]]; then - cmake -S . -B build -DCMAKE_BUILD_TYPE=$BUILD_TYPE $BUILD_CONFIG -DPython_EXECUTABLE=/opt/homebrew/bin/python3.11 + if [[ "${{ matrix.os }}" == "macos-15" ]]; then + cmake -S . -B build -DCMAKE_BUILD_TYPE=$BUILD_TYPE $BUILD_CONFIG -DPython_EXECUTABLE=/opt/homebrew/bin/python3.14 -DCMAKE_PREFIX_PATH=/opt/homebrew/opt/eigen@3 else cmake -S . -B build -DCMAKE_BUILD_TYPE=$BUILD_TYPE $BUILD_CONFIG fi @@ -189,8 +189,8 @@ jobs: cd build cmake . -DLIBINT2_PYTHON=ON cmake --build . --target libint2-python - if [[ "${{ matrix.os }}" == "macos-latest" ]]; then - PATH=-DPython_EXECUTABLE=/opt/homebrew/bin:$PATH PYTHONPATH=/opt/homebrew/lib/python3.11/ cmake --build . --target libint2-python-test + if [[ "${{ matrix.os }}" == "macos-15" ]]; then + PATH=-DPython_EXECUTABLE=/opt/homebrew/bin:$PATH PYTHONPATH=/opt/homebrew/lib/python3.14/ cmake --build . --target libint2-python-test else cmake --build . --target libint2-python-test fi @@ -230,7 +230,7 @@ jobs: -DCMAKE_CXX_COMPILER=clang-cl -DCMAKE_C_COMPILER=clang-cl - - runs-on: macos-latest + - runs-on: macos-15 lane: macos-clang libargs: > -DBUILD_SHARED_LIBS=ON From 60cb84f5eaaceb8d9450f5533c214272e5c44fe6 Mon Sep 17 00:00:00 2001 From: Eduard Valeyev Date: Sat, 10 Jan 2026 16:35:15 -0500 Subject: [PATCH 2/2] [ci] try installing `python-build` conda package, instead of `build` --- .github/workflows/cmake.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 2242f279c..bd56eee19 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -269,7 +269,7 @@ jobs: - scipy - pybind11 - scikit-build-core - - build + - python-build - pytest #- dpcpp_linux-64 EOF