1
0
mirror of https://github.com/TREX-CoE/qmckl.git synced 2024-12-22 20:36:01 +01:00

Fix TREXIO installation in the Verificarlo workflow (#55)

* specify CC and FC at configure time

* use verificarlo-c instead of verificarlo-f

* install TREXIO in ci_install.sh script

* use GNU compiler instead of verificarlo ones to build TREXIO

* install BLAS and LAPACK due to the recent change in configure of QMCkl

* Fix QMCkl pre-build issue

* move TREXIO installation back to .yml file and downgrade to v.1.1.0

* formatting .yml
This commit is contained in:
Evgeny Posenitskiy 2021-12-14 10:43:36 +01:00 committed by GitHub
parent ff25969349
commit 12fc6533da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 7 deletions

View File

@ -25,7 +25,7 @@ jobs:
run: | run: |
ln -s /usr/bin/python3 /usr/bin/python ln -s /usr/bin/python3 /usr/bin/python
apt update apt update
apt -y install emacs pkg-config wget libhdf5-dev apt -y install emacs pkg-config wget libhdf5-dev libblas-dev liblapack-dev
- name: Install trexio - name: Install trexio
run: | run: |
@ -33,9 +33,10 @@ jobs:
wget https://github.com/TREX-CoE/trexio/releases/download/v${VERSION}/trexio-${VERSION}.tar.gz wget https://github.com/TREX-CoE/trexio/releases/download/v${VERSION}/trexio-${VERSION}.tar.gz
tar -zxf trexio-${VERSION}.tar.gz tar -zxf trexio-${VERSION}.tar.gz
cd trexio-${VERSION} cd trexio-${VERSION}
./configure --prefix=/usr ./configure --prefix=/usr CC="gcc-7" FC="gfortran-7"
make -j 8 # modify LDFLAGS to include -lhdf5_hl because autoconf sometime fails to detect the HL component
sudo make install make LDFLAGS="-L/usr/lib/x86_64-linux-gnu/hdf5/serial -lhdf5_hl"
make install
- name: Run tests - name: Run tests
run: vfc_ci test -g -r run: vfc_ci test -g -r

View File

@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
export srcdir="." export srcdir="."
${PYTHON} ${srcdir}/tools/build_makefile.py python ${srcdir}/tools/build_makefile.py
autoreconf -i -Wall --no-recursive autoreconf -i -Wall --no-recursive

View File

@ -250,8 +250,8 @@ def main():
tmp = "EXTRA_DIST += " tmp = "EXTRA_DIST += "
r = subprocess.check_output("git ls-tree --name-only -r HEAD".split()) r = subprocess.check_output("git ls-tree --name-only -r HEAD".split())
for line in r.splitlines(): for line in r.splitlines():
if "share/qmckl/test_data/" in line: if b"share/qmckl/test_data/" in line:
tmp += " \\\n " + line tmp += " \\\n " + line.decode('utf8')
tmp += "\n" tmp += "\n"
output += tmp.split("\n") output += tmp.split("\n")