3
0
mirror of https://github.com/triqs/dft_tools synced 2024-12-22 20:34:38 +01:00

Merge remote-tracking branch 'app4triqs-remote/unstable' into unstable

This commit is contained in:
Nils Wentzell 2024-03-05 10:52:20 -05:00
commit ae8d373c72
2 changed files with 8 additions and 2 deletions

View File

@ -85,8 +85,13 @@ jobs:
if: matrix.os == 'macos-12' if: matrix.os == 'macos-12'
run: | run: |
brew install ccache gcc@12 llvm boost fftw hdf5 open-mpi openblas brew install ccache gcc@12 llvm boost fftw hdf5 open-mpi openblas
pip3 install mako numpy scipy mpi4py mkdir $HOME/.venv
pip3 install -r requirements.txt python3 -m venv $HOME/.venv/my_python
source $HOME/.venv/my_python/bin/activate
pip install mako numpy scipy mpi4py
pip install -r requirements.txt
echo "VIRTUAL_ENV=$VIRTUAL_ENV" >> $GITHUB_ENV
echo "PATH=$PATH" >> $GITHUB_ENV
- name: add clang cxxflags - name: add clang cxxflags
if: ${{ contains(matrix.cxx, 'clang') }} if: ${{ contains(matrix.cxx, 'clang') }}

1
Jenkinsfile vendored
View File

@ -89,6 +89,7 @@ for (int i = 0; i < osxPlatforms.size(); i++) {
"LD_LIBRARY_PATH=$hdf5/lib", "LD_LIBRARY_PATH=$hdf5/lib",
"PYTHONPATH=$installDir/lib/python3.9/site-packages", "PYTHONPATH=$installDir/lib/python3.9/site-packages",
"CMAKE_PREFIX_PATH=$venv/lib/cmake/triqs", "CMAKE_PREFIX_PATH=$venv/lib/cmake/triqs",
"VIRTUAL_ENV=$venv",
"OMP_NUM_THREADS=2"]) { "OMP_NUM_THREADS=2"]) {
deleteDir() deleteDir()
/* note: this is installing into the parent (triqs) venv (install dir), which is thus shared among apps and so not be completely safe */ /* note: this is installing into the parent (triqs) venv (install dir), which is thus shared among apps and so not be completely safe */