Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

check CI status #339

Merged
merged 25 commits into from
May 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 34 additions & 6 deletions .github/workflows/cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,20 @@ jobs:
- name: Install prerequisite MacOS packages
if: ${{ steps.skip_check.outputs.should_skip != 'true' && matrix.os == 'macos-latest' }}
run: |
brew install ninja gcc@10 boost eigen bison ccache automake [email protected] numpy scipy
echo "FC=/usr/local/bin/gfortran-10" >> $GITHUB_ENV
brew install ninja gcc@11 gmp boost eigen bison ccache automake [email protected] numpy scipy
#echo "FC=/usr/local/bin/gfortran" >> $GITHUB_ENV
echo "FC=/opt/homebrew/Cellar/gcc@11/11.4.0/bin/gfortran-11" >> $GITHUB_ENV
echo "EIGEN3_INCLUDE_DIR=/usr/local/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.85.0/include" >> $GITHUB_ENV
ls -l /opt/homebrew/Cellar/boost/1.85.0/include
brew info [email protected]
ls -l /opt/homebrew/Cellar/[email protected]/*
brew info gcc@11
ls -l /opt/homebrew/Cellar/gcc@11/*/bin
pip3.11 install scipy


- name: Install prerequisites Ubuntu packages
if: ${{ steps.skip_check.outputs.should_skip != 'true' && matrix.os == 'ubuntu-20.04' }}
Expand Down Expand Up @@ -105,7 +116,16 @@ jobs:
shell: bash
working-directory: ${{github.workspace}}/build/compiler
run: |
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
if [[ "${{ matrix.os }}" == "ubuntu-20.04" ]]; then
:
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
:
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

fi
make -j3
make check
cd src/bin/test_eri && ./stdtests.pl && cd ../../..
Expand All @@ -129,7 +149,11 @@ jobs:
tar -xzf ../compiler/libint-2*.tgz
cd libint-2*
echo "LIBINT_EXPORTED_DIR=`pwd`" >> $GITHUB_ENV
cmake -S . -B build -DCMAKE_BUILD_TYPE=$BUILD_TYPE $BUILD_CONFIG
if [[ "${{ matrix.os }}" == "macos-latest" ]]; then
cmake -S . -B build -DCMAKE_BUILD_TYPE=$BUILD_TYPE $BUILD_CONFIG -DPython_EXECUTABLE=/opt/homebrew/bin/python3.11
else
cmake -S . -B build -DCMAKE_BUILD_TYPE=$BUILD_TYPE $BUILD_CONFIG
fi
cmake --build build --target check
cmake --build build --target install

Expand Down Expand Up @@ -159,8 +183,12 @@ jobs:
cd build
cmake . -DLIBINT2_PYTHON=ON
cmake --build . --target libint2-python
cmake --build . --target libint2-python-test

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
else
cmake --build . --target libint2-python-test
fi

build_export:
# to debug the second stage, it is handy to short-circuit the first stage down to ~6 minutes:
# * run only the Linux/Release (remove items from matrix.build_type and matrix.os)
Expand Down
3 changes: 3 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,21 @@ Following is a brief summary of changes made in each release of Libint.
- PR #329: increase Tenno function interpolation table to support L=9 4-c ERI
- PR #327: fix stochastic failures of tests/eri by reducing range of random shells parameters
- PR #281: auto-generator for DF basis (HT @kshitij-05)

- 2024-02-05: 2.8.2
- PR #324: addresses issues with 3eri derivatives + minor 3eri API safety improvements
- PR #322: update libtool to 2.4.7 + update config.{guess,sub} to 2024-01-01
- PR #319: pylibint builds with latest setuptools (HT @loriab)
- PR #311: clang-format.sh uses bash to resolve #310 (HT @e-kwsm)
- detect Brew-installed GNU tar on MacOS

- 2023-12-19: 2.8.1
- PR #307: fixup progman dvi and html building
- PR #305: disable latex2html detection/use by default
- PR #304: natural order for (σ·p)V(σ·p) integrals (HT @JonathonMisiewicz)
- PR #302: build fix (HT @JonathonMisiewicz)
- PR #231: Add SONAME/SOVERSION to generated library (HT @debichem)

- 2023-12-12: 2.8.0
- PR #297: clang-format
- PR #293: read Gaussian basis set files with L>=7 AOs correctly
Expand Down
2 changes: 1 addition & 1 deletion export/fortran/test-eri.cc
Original file line number Diff line number Diff line change
Expand Up @@ -545,7 +545,7 @@ bool test_eri_c_f(int &contrdepth, int &am1, double *c1, double *alpha1,
#if LIBINT2_SUPPORT_ERI

TEST_CASE("Fortran ERI", "[eri]") {
const double threshold = std::numeric_limits<double>::epsilon() * 10;
const double threshold = std::numeric_limits<double>::epsilon() * 1000;

int am1 = std::min(1, LIBINT2_MAX_AM_eri);
int am2 = std::min(0, LIBINT2_MAX_AM_eri);
Expand Down
Loading