Merge fdabfa5d5c
into 453b9e4886
This commit is contained in:
commit
044f622140
|
@ -45,7 +45,7 @@ jobs:
|
||||||
run: |
|
run: |
|
||||||
if [ "$RUNNER_OS" == "Linux" ]; then
|
if [ "$RUNNER_OS" == "Linux" ]; then
|
||||||
sudo apt update
|
sudo apt update
|
||||||
sudo apt-get install -y gfortran cmake ccache libtinfo5
|
sudo apt-get install -y gfortran cmake ccache libtinfo5 python-is-python3
|
||||||
else
|
else
|
||||||
echo "::error::$RUNNER_OS not supported"
|
echo "::error::$RUNNER_OS not supported"
|
||||||
exit 1
|
exit 1
|
||||||
|
@ -128,6 +128,8 @@ jobs:
|
||||||
echo "::group::Tests in 'utest' directory"
|
echo "::group::Tests in 'utest' directory"
|
||||||
make -C utest $MAKE_FLAGS FC="ccache ${{ matrix.fortran }}"
|
make -C utest $MAKE_FLAGS FC="ccache ${{ matrix.fortran }}"
|
||||||
echo "::endgroup::"
|
echo "::endgroup::"
|
||||||
|
make $MAKE_FLAGS FC="ccache ${{ matrix.fortran }}" lapack-test
|
||||||
|
echo "::endgroup::"
|
||||||
;;
|
;;
|
||||||
"cmake")
|
"cmake")
|
||||||
cd build && ctest
|
cd build && ctest
|
||||||
|
|
2
Makefile
2
Makefile
|
@ -309,7 +309,7 @@ prof_lapack : lapack_prebuild
|
||||||
lapack_prebuild :
|
lapack_prebuild :
|
||||||
ifeq ($(NO_LAPACK), $(filter 0,$(NO_LAPACK)))
|
ifeq ($(NO_LAPACK), $(filter 0,$(NO_LAPACK)))
|
||||||
-@echo "FC = $(FC)" > $(NETLIB_LAPACK_DIR)/make.inc
|
-@echo "FC = $(FC)" > $(NETLIB_LAPACK_DIR)/make.inc
|
||||||
ifeq ($(F_COMPILER), GFORTRAN)
|
ifeq ($(F_COMPILER), GORAN)
|
||||||
-@echo "override FFLAGS = $(LAPACK_FFLAGS) -fno-tree-vectorize" >> $(NETLIB_LAPACK_DIR)/make.inc
|
-@echo "override FFLAGS = $(LAPACK_FFLAGS) -fno-tree-vectorize" >> $(NETLIB_LAPACK_DIR)/make.inc
|
||||||
else
|
else
|
||||||
-@echo "override FFLAGS = $(LAPACK_FFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc
|
-@echo "override FFLAGS = $(LAPACK_FFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc
|
||||||
|
|
Loading…
Reference in New Issue