This commit is contained in:
Martin Kroeker 2024-11-02 12:55:05 +00:00 committed by GitHub
commit 044f622140
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 2 deletions

View File

@ -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

View File

@ -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