1
0
mirror of https://github.com/TREX-CoE/qmckl.git synced 2025-04-30 04:15:00 +02:00

Merge branch 'master' into master

This commit is contained in:
Anthony Scemama 2025-04-02 14:53:28 +02:00 committed by GitHub
commit 16e5e8f98f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 2189 additions and 36 deletions

View File

@ -17,7 +17,7 @@ jobs:
- uses: actions/checkout@v3
- name: Install dependencies
run: sudo apt-get install emacs autoconf libhdf5-dev
run: sudo apt-get install emacs autoconf libhdf5-dev libblas-dev liblapack-dev
- name: Install the latest TREXIO from the GitHub clone
run: |
@ -78,7 +78,7 @@ jobs:
- uses: actions/checkout@v3
- name: Install dependencies
run: sudo apt-get install emacs autoconf libhdf5-dev
run: sudo apt-get install emacs autoconf libhdf5-dev libblas-dev liblapack-dev
- name: Install the latest TREXIO from the GitHub clone
run: |
@ -117,7 +117,7 @@ jobs:
- uses: actions/checkout@v3
- name: Install dependencies
run: sudo apt-get install emacs autoconf libhdf5-dev
run: sudo apt-get install emacs autoconf libhdf5-dev libblas-dev liblapack-dev
- name: Install the latest TREXIO from the GitHub clone
run: |
@ -162,6 +162,7 @@ jobs:
brew install hdf5
brew install gcc
brew install gfortran
brew install openblas
brew --prefix hdf5
- name: Install the latest TREXIO from the GitHub clone

View File

@ -46,49 +46,67 @@ AS_IF([test -f ${srcdir}/.maintainer_mode],
[enable_maintainer_mode="no"]
)
# Intel Fortran compiler
# Intel Fortran compilers
AC_ARG_WITH([ifort],
[AS_HELP_STRING([--with-ifort],
[Use Intel Fortran compiler])],
[Use Intel ifort Fortran compiler])],
[with_ifort=$withval],
[with_ifort=no])
AS_IF([test "x$with_ifort" = "xyes"], [
FC=ifort
FCFLAGS="-march=native -ip -O3 -finline -g -mkl=sequential" ])
FCFLAGS="-march=native -ip -O3 -ftz -finline -g -qmkl=sequential" ]
ax_blas_ok="yes"
ax_lapack_ok="yes"
BLAS_LIBS=""
LAPACK_LIBS=""
])
AC_ARG_WITH([ifx],
[AS_HELP_STRING([--with-ifx],
[Use Intel ifx Fortran compiler])],
[with_ifx=$withval],
[with_ifx=no])
AS_IF([test "x$with_ifx" = "xyes"], [
FC=ifx
FCFLAGS="-march=native -O3 -ftz -g -qmkl=sequential"
ax_blas_ok="yes"
ax_lapack_ok="yes"
BLAS_LIBS=""
LAPACK_LIBS=""
])
# Intel C compiler
AC_ARG_WITH([icx],
[AS_HELP_STRING([--with-icx],
[Use Intel C compiler])],
[Use Intel icx C compiler])],
[with_icx=$withval],
[with_icx=no])
AS_IF([test "x$with_icx" = "xyes"], [
CC=icx
CFLAGS="-march=native -O3 -finline -g -qmkl=sequential" ])
AS_IF([test "x$with_icx.$with_ifort" = "xyes.yes"], [
CFLAGS="-march=native -O3 -ftz -finline -g -qmkl=sequential"
ax_blas_ok="yes"
ax_lapack_ok="yes"
BLAS_LIBS=""
LAPACK_LIBS=""])
LAPACK_LIBS=""
])
AC_ARG_WITH([icc],
[AS_HELP_STRING([--with-icc],
[Use Intel C compiler])],
[Use Intel icc C compiler])],
[with_icc=$withval],
[with_icc=no])
AS_IF([test "x$with_icc" = "xyes"], [
CC=icc
CFLAGS="-march=native -ip -O3 -finline -g -mkl=sequential" ])
AS_IF([test "x$with_icc.$with_ifort" = "xyes.yes"], [
CFLAGS="-march=native -ip -O3 -ftz -finline -g -mkl=sequential"
ax_blas_ok="yes"
ax_lapack_ok="yes"
BLAS_LIBS=""
LAPACK_LIBS=""])
LAPACK_LIBS=""
])
# Default Automake variables
F77=$FC

File diff suppressed because it is too large Load Diff