From a203645eaf56ad9c1e1efa49bfc69403ea24ad4d Mon Sep 17 00:00:00 2001
From: ZUO Zhihua <zuo.zhihua@qq.com>
Date: Wed, 3 Jul 2024 11:33:14 +0800
Subject: [PATCH 01/13] Add findBLAS support to CMakeLists.txt
---
CMakeLists.txt | 10 ++++++++++
src/CMakeLists.txt | 8 ++++++++
2 files changed, 18 insertions(+)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b10e1f73d..c7a02f911 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,6 +42,16 @@ if(NOT DEFINED CMAKE_MAXIMUM_RANK)
set(CMAKE_MAXIMUM_RANK 4 CACHE STRING "Maximum array rank for generated procedures")
endif()
+# --- find BLAS and LAPACK
+find_package(BLAS)
+if(BLAS_FOUND)
+ add_compile_definitions(STDLIB_EXTERNAL_BLAS)
+endif()
+find_package(LAPACK)
+if(LAPACK_FOUND)
+ add_compile_definitions(STDLIB_EXTERNAL_LAPACK)
+endif()
+
# --- find preprocessor
find_program(FYPP fypp)
if(NOT FYPP)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fa1831e98..c7c738bbe 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -120,6 +120,14 @@ set(SRC
add_library(${PROJECT_NAME} ${SRC})
+# Link to BLAS and LAPACK
+if(BLAS_FOUND)
+ target_link_libraries(${PROJECT_NAME} BLAS::BLAS)
+endif()
+if(LAPACK_FOUND)
+ target_link_libraries(${PROJECT_NAME} LAPACK::LAPACK)
+endif()
+
set_target_properties(
${PROJECT_NAME}
PROPERTIES
From 6e36e6b418b7cd197a03d6d860face85cbbf440b Mon Sep 17 00:00:00 2001
From: Federico Perini <federico.perini@gmail.com>
Date: Wed, 3 Jul 2024 09:15:34 +0200
Subject: [PATCH 02/13] find BLAS, LAPACK
---
CMakeLists.txt | 10 ++++++++++
src/CMakeLists.txt | 8 ++++++++
2 files changed, 18 insertions(+)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b10e1f73d..c7a02f911 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,6 +42,16 @@ if(NOT DEFINED CMAKE_MAXIMUM_RANK)
set(CMAKE_MAXIMUM_RANK 4 CACHE STRING "Maximum array rank for generated procedures")
endif()
+# --- find BLAS and LAPACK
+find_package(BLAS)
+if(BLAS_FOUND)
+ add_compile_definitions(STDLIB_EXTERNAL_BLAS)
+endif()
+find_package(LAPACK)
+if(LAPACK_FOUND)
+ add_compile_definitions(STDLIB_EXTERNAL_LAPACK)
+endif()
+
# --- find preprocessor
find_program(FYPP fypp)
if(NOT FYPP)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fa1831e98..7bf60fd4f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -120,6 +120,14 @@ set(SRC
add_library(${PROJECT_NAME} ${SRC})
+# Link to BLAS and LAPACK
+if(BLAS_FOUND)
+ target_link_libraries(${PROJECT_NAME} BLAS::BLAS)
+endif()
+if(LAPACK_FOUND)
+ target_link_libraries(${PROJECT_NAME} LAPACK::LAPACK)
+endif()
+
set_target_properties(
${PROJECT_NAME}
PROPERTIES
From 68622098db3320a560ff9eb0414f9e8579a31a33 Mon Sep 17 00:00:00 2001
From: Federico Perini <federico.perini@gmail.com>
Date: Wed, 3 Jul 2024 09:15:42 +0200
Subject: [PATCH 03/13] add tests
---
test/CMakeLists.txt | 11 ++++-
test/linalg/CMakeLists.txt | 11 ++++-
test/linalg/test_blas_lapack.fypp | 73 ++++++++++++++++++++++++++++++-
3 files changed, 91 insertions(+), 4 deletions(-)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 4d83548db..92d2675e4 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -10,6 +10,15 @@ macro(ADDTEST name)
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
endmacro(ADDTEST)
+macro(ADDTESTPP name)
+ add_executable(test_${name} test_${name}.F90)
+ target_link_libraries(test_${name} "${PROJECT_NAME}" "test-drive::test-drive")
+ add_test(NAME ${name}
+ COMMAND $<TARGET_FILE:test_${name}> ${CMAKE_CURRENT_BINARY_DIR}
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+endmacro(ADDTESTPP)
+
+
add_subdirectory(array)
add_subdirectory(ascii)
add_subdirectory(bitsets)
@@ -30,4 +39,4 @@ add_subdirectory(system)
add_subdirectory(quadrature)
add_subdirectory(math)
add_subdirectory(stringlist)
-add_subdirectory(terminal)
\ No newline at end of file
+add_subdirectory(terminal)
diff --git a/test/linalg/CMakeLists.txt b/test/linalg/CMakeLists.txt
index cff60532d..af0e30966 100644
--- a/test/linalg/CMakeLists.txt
+++ b/test/linalg/CMakeLists.txt
@@ -1,7 +1,6 @@
set(
fppFiles
"test_linalg.fypp"
- "test_blas_lapack.fypp"
"test_linalg_eigenvalues.fypp"
"test_linalg_solve.fypp"
"test_linalg_lstsq.fypp"
@@ -9,7 +8,15 @@ set(
"test_linalg_svd.fypp"
"test_linalg_matrix_property_checks.fypp"
)
+
+# Preprocessed files to contain preprocessor directives -> .F90
+set(
+ cppFiles
+ "test_blas_lapack.fypp"
+)
+
fypp_f90("${fyppFlags}" "${fppFiles}" outFiles)
+fypp_f90pp("${fyppFlags}" "${cppFiles}" outPreprocFiles)
ADDTEST(linalg)
ADDTEST(linalg_determinant)
@@ -18,4 +25,4 @@ ADDTEST(linalg_matrix_property_checks)
ADDTEST(linalg_solve)
ADDTEST(linalg_lstsq)
ADDTEST(linalg_svd)
-ADDTEST(blas_lapack)
+ADDTESTPP(blas_lapack)
diff --git a/test/linalg/test_blas_lapack.fypp b/test/linalg/test_blas_lapack.fypp
index e36ac2717..0c1d0592c 100644
--- a/test/linalg/test_blas_lapack.fypp
+++ b/test/linalg/test_blas_lapack.fypp
@@ -30,7 +30,9 @@ contains
new_unittest("test_gemv${t1[0]}$${k1}$", test_gemv${t1[0]}$${k1}$), &
new_unittest("test_getri${t1[0]}$${k1}$", test_getri${t1[0]}$${k1}$), &
#:endfor
- new_unittest("test_idamax", test_idamax) &
+ new_unittest("test_idamax", test_idamax), &
+ new_unittest("test_external_blas",external_blas_test), &
+ new_unittest("test_external_lapack",external_lapack_test) &
]
end subroutine collect_blas_lapack
@@ -117,6 +119,75 @@ contains
end subroutine test_idamax
+ !> Test availability of the external BLAS interface
+ subroutine external_blas_test(error)
+ !> Error handling
+ type(error_type), allocatable, intent(out) :: error
+
+#ifdef STDLIB_EXTERNAL_BLAS
+ interface
+ subroutine saxpy(n,sa,sx,incx,sy,incy)
+ import sp,ilp
+ implicit none(type,external)
+ real(sp), intent(in) :: sa,sx(*)
+ integer(ilp), intent(in) :: incx,incy,n
+ real(sp), intent(inout) :: sy(*)
+ end subroutine saxpy
+ end interface
+
+ integer(ilp), parameter :: n = 5, inc=1
+ real(sp) :: a,x(n),y(n)
+
+ x = 1.0_sp
+ y = 2.0_sp
+ a = 3.0_sp
+
+ call saxpy(n,a,x,inc,y,inc)
+ call check(error, all(abs(y-5.0_sp)<sqrt(epsilon(0.0_sp))), "saxpy: check result")
+ if (allocated(error)) return
+
+#else
+ call skip_test(error, "Not using an external BLAS")
+#endif
+
+ end subroutine external_blas_test
+
+ !> Test availability of the external BLAS interface
+ subroutine external_lapack_test(error)
+ !> Error handling
+ type(error_type), allocatable, intent(out) :: error
+
+#ifdef STDLIB_EXTERNAL_LAPACK
+ interface
+ subroutine dgetrf( m, n, a, lda, ipiv, info )
+ import dp,ilp
+ implicit none(type,external)
+ integer(ilp), intent(out) :: info,ipiv(*)
+ integer(ilp), intent(in) :: lda,m,n
+ real(dp), intent(inout) :: a(lda,*)
+ end subroutine dgetrf
+ end interface
+
+ integer(ilp), parameter :: n = 3
+ real(dp) :: A(n,n)
+ integer(ilp) :: ipiv(n),info
+
+
+ A = eye(n)
+ info = 123
+
+ ! Factorize matrix
+ call dgetrf(n,n,A,n,ipiv,info)
+
+ call check(error, info==0, "dgetrf: check result")
+ if (allocated(error)) return
+
+#else
+ call skip_test(error, "Not using an external LAPACK")
+#endif
+
+ end subroutine external_lapack_test
+
end module test_blas_lapack
From 095ee160ab06d311585419340d48a4f90aa2eea5 Mon Sep 17 00:00:00 2001
From: ZUO Zhihua <zuo.zhihua@qq.com>
Date: Sat, 13 Jul 2024 03:46:24 +0800
Subject: [PATCH 04/13] Link to OpenBLAS for MINGW64 of MSYS2
---
.github/workflows/ci_windows.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.github/workflows/ci_windows.yml b/.github/workflows/ci_windows.yml
index 27d49f6c5..777fb9cfb 100644
--- a/.github/workflows/ci_windows.yml
+++ b/.github/workflows/ci_windows.yml
@@ -38,6 +38,7 @@ jobs:
mingw-w64-${{ matrix.arch }}-python-setuptools
mingw-w64-${{ matrix.arch }}-cmake
mingw-w64-${{ matrix.arch }}-ninja
+ mingw-w64-${{ matrix.arch }}-openblas
- name: Setup msys POSIX environment
uses: msys2/setup-msys2@v2
From d47559509424a2107ebae8a8c9db3b643e427abe Mon Sep 17 00:00:00 2001
From: ZUO Zhihua <zuo.zhihua@qq.com>
Date: Sat, 13 Jul 2024 04:06:48 +0800
Subject: [PATCH 05/13] add FIND_BLAS option
---
.github/workflows/ci_windows.yml | 36 ++++++++++++++++++++++++++++++++
CMakeLists.txt | 18 +++++++++-------
2 files changed, 47 insertions(+), 7 deletions(-)
diff --git a/.github/workflows/ci_windows.yml b/.github/workflows/ci_windows.yml
index 777fb9cfb..4ba480f7b 100644
--- a/.github/workflows/ci_windows.yml
+++ b/.github/workflows/ci_windows.yml
@@ -58,6 +58,7 @@ jobs:
- name: Install fypp
run: pip install fypp
+ # Build and test with build-in BLAS and LAPACK
- run: >-
PATH=$PATH:/mingw64/bin/ cmake
-Wdev
@@ -66,6 +67,7 @@ jobs:
-DCMAKE_Fortran_FLAGS_DEBUG="-Wall -Wextra -Wimplicit-interface -fPIC -g -fcheck=all -fbacktrace"
-DCMAKE_MAXIMUM_RANK:String=4
-DCMAKE_INSTALL_PREFIX=$PWD/_dist
+ -DFIND_BLAS:STRING=FALSE
env:
FC: gfortran
CC: gcc
@@ -89,3 +91,37 @@ jobs:
- name: Install project
run: PATH=$PATH:/mingw64/bin/ cmake --install build
+
+ # Build and test with external BLAS and LAPACK (OpenBLAS)
+ - run: >-
+ PATH=$PATH:/mingw64/bin/ cmake
+ -Wdev
+ -B build_openblas
+ -DCMAKE_BUILD_TYPE=Debug
+ -DCMAKE_Fortran_FLAGS_DEBUG="-Wall -Wextra -Wimplicit-interface -fPIC -g -fcheck=all -fbacktrace"
+ -DCMAKE_MAXIMUM_RANK:String=4
+ -DCMAKE_INSTALL_PREFIX=$PWD/_dist
+ -DFIND_BLAS:STRING=TRUE
+ env:
+ FC: gfortran
+ CC: gcc
+ CXX: g++
+
+ - name: CMake build with OpenBLAS
+ run: PATH=$PATH:/mingw64/bin/ cmake --build build_openblas --parallel
+
+ - name: catch build fail
+ run: PATH=$PATH:/mingw64/bin/ cmake --build build_openblas --verbose --parallel 1
+ if: failure()
+
+ - name: CTest with OpenBLAS
+ run: PATH=$PATH:/mingw64/bin/ ctest --test-dir build_openblas --output-on-failure --parallel -V -LE quadruple_precision
+
+ - uses: actions/upload-artifact@v1
+ if: failure()
+ with:
+ name: WindowsCMakeTestlog_openblas
+ path: build_openblas/Testing/Temporary/LastTest.log
+
+ - name: Install project with OpenBLAS
+ run: PATH=$PATH:/mingw64/bin/ cmake --install build_openblas
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c7a02f911..04925096f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,14 +42,18 @@ if(NOT DEFINED CMAKE_MAXIMUM_RANK)
set(CMAKE_MAXIMUM_RANK 4 CACHE STRING "Maximum array rank for generated procedures")
endif()
+option(FIND_BLAS "Find external BLAS and LAPACK" ON)
+
# --- find BLAS and LAPACK
-find_package(BLAS)
-if(BLAS_FOUND)
- add_compile_definitions(STDLIB_EXTERNAL_BLAS)
-endif()
-find_package(LAPACK)
-if(LAPACK_FOUND)
- add_compile_definitions(STDLIB_EXTERNAL_LAPACK)
+if(FIND_BLAS)
+ find_package(BLAS)
+ if(BLAS_FOUND)
+ add_compile_definitions(STDLIB_EXTERNAL_BLAS)
+ endif()
+ find_package(LAPACK)
+ if(LAPACK_FOUND)
+ add_compile_definitions(STDLIB_EXTERNAL_LAPACK)
+ endif()
endif()
# --- find preprocessor
From 434b84902b24b1ce3a78f23ea83154c369e2f45c Mon Sep 17 00:00:00 2001
From: ZUO Zhihua <zuo.zhihua@qq.com>
Date: Sat, 13 Jul 2024 04:50:17 +0800
Subject: [PATCH 06/13] Tests with OpenBLAS on MINGW64 and MKL on Ubuntu
---
.github/workflows/CI.yml | 39 +++++++++++++++++++++++++++++++-
.github/workflows/ci_windows.yml | 13 +++++++----
README.md | 1 +
3 files changed, 48 insertions(+), 5 deletions(-)
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 6988259d3..0b0b209cf 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -33,6 +33,9 @@ jobs:
build: cmake-inline
toolchain:
- {compiler: gcc, version: 10}
+ APT_PACKAGES: >-
+ intel-oneapi-mkl-2024.1.0
+ intel-oneapi-mkl-devel-2024.1.0
exclude:
- os: macos-12
toolchain: {compiler: intel, version: '2024.1'}
@@ -67,6 +70,7 @@ jobs:
-DCMAKE_BUILD_TYPE=Release
-DCMAKE_MAXIMUM_RANK:String=4
-DCMAKE_INSTALL_PREFIX=$PWD/_dist
+ -DFIND_BLAS:STRING=FALSE
-S . -B ${{ env.BUILD_DIR }}
- name: Build and compile
@@ -74,8 +78,8 @@ jobs:
run: cmake --build ${{ env.BUILD_DIR }} --parallel
- name: catch build fail
- run: cmake --build ${{ env.BUILD_DIR }} --verbose --parallel 1
if: ${{ failure() && contains(matrix.build, 'cmake') }}
+ run: cmake --build ${{ env.BUILD_DIR }} --verbose --parallel 1
- name: test
if: ${{ contains(matrix.build, 'cmake') }}
@@ -89,3 +93,36 @@ jobs:
- name: Install project
if: ${{ contains(matrix.build, 'cmake') }}
run: cmake --install ${{ env.BUILD_DIR }}
+
+ # Build and test with external BLAS and LAPACK (MKL on Ubuntu with Intel compilers)
+ - name: Configure with CMake and MKL
+ if: ${{ contains(matrix.build, 'cmake') && matrix.os == 'ubuntu-latest' && matrix.toolchain.compiler == 'intel' }}
+ run: >-
+ cmake -Wdev -G Ninja
+ -DCMAKE_BUILD_TYPE=Release
+ -DCMAKE_MAXIMUM_RANK:String=4
+ -DCMAKE_INSTALL_PREFIX=$PWD/_dist
+ -DFIND_BLAS:STRING=TRUE
+ -DBLA_VENDOR=Intel10_64lp
+ -S . -B build_mkl
+
+ - name: Build and compile with MKL
+ if: ${{ contains(matrix.build, 'cmake') && matrix.os == 'ubuntu-latest' && matrix.toolchain.compiler == 'intel' }}
+ run: cmake --build build_mkl --parallel
+
+ - name: catch build fail with MKL
+ if: ${{ failure() && contains(matrix.build, 'cmake') && matrix.os == 'ubuntu-latest' && matrix.toolchain.compiler == 'intel' }}
+ run: cmake --build build_mkl --verbose --parallel 1
+
+ - name: test with MKL
+ if: ${{ contains(matrix.build, 'cmake') && matrix.os == 'ubuntu-latest' && matrix.toolchain.compiler == 'intel' }}
+ run: >-
+ ctest
+ --test-dir build_mkl
+ --parallel
+ --output-on-failure
+ --no-tests=error
+
+ - name: Install project with MKL
+ if: ${{ contains(matrix.build, 'cmake') && matrix.os == 'ubuntu-latest' && matrix.toolchain.compiler == 'intel' }}
+ run: cmake --install build_mkl
diff --git a/.github/workflows/ci_windows.yml b/.github/workflows/ci_windows.yml
index 4ba480f7b..d470c3ad4 100644
--- a/.github/workflows/ci_windows.yml
+++ b/.github/workflows/ci_windows.yml
@@ -92,8 +92,10 @@ jobs:
- name: Install project
run: PATH=$PATH:/mingw64/bin/ cmake --install build
- # Build and test with external BLAS and LAPACK (OpenBLAS)
- - run: >-
+ # Build and test with external BLAS and LAPACK (OpenBLAS on MINGW64)
+ - name: Configure with CMake and OpenBLAS
+ if: contains(matrix.msystem, 'MINGW64')
+ run: >-
PATH=$PATH:/mingw64/bin/ cmake
-Wdev
-B build_openblas
@@ -108,20 +110,23 @@ jobs:
CXX: g++
- name: CMake build with OpenBLAS
+ if: contains(matrix.msystem, 'MINGW64')
run: PATH=$PATH:/mingw64/bin/ cmake --build build_openblas --parallel
- name: catch build fail
+ if: contains(matrix.msystem, 'MINGW64') && failure()
run: PATH=$PATH:/mingw64/bin/ cmake --build build_openblas --verbose --parallel 1
- if: failure()
- name: CTest with OpenBLAS
+ if: contains(matrix.msystem, 'MINGW64')
run: PATH=$PATH:/mingw64/bin/ ctest --test-dir build_openblas --output-on-failure --parallel -V -LE quadruple_precision
- uses: actions/upload-artifact@v1
- if: failure()
+ if: contains(matrix.msystem, 'MINGW64') && failure()
with:
name: WindowsCMakeTestlog_openblas
path: build_openblas/Testing/Temporary/LastTest.log
- name: Install project with OpenBLAS
+ if: contains(matrix.msystem, 'MINGW64')
run: PATH=$PATH:/mingw64/bin/ cmake --install build_openblas
diff --git a/README.md b/README.md
index b329d2713..fdae7dfe8 100644
--- a/README.md
+++ b/README.md
@@ -135,6 +135,7 @@ Important options are
- `-DBUILD_TESTING` set to `off` in case you want to disable the stdlib tests (default: `on`).
- `-DCMAKE_VERBOSE_MAKEFILE` is by default set to `Off`, but if set to `On` will show commands used to compile the code.
- `-DCMAKE_BUILD_TYPE` is by default set to `RelWithDebInfo`, which uses compiler flags suitable for code development (but with only `-O2` optimization). Beware the compiler flags set this way will override any compiler flags specified via `FFLAGS`. To prevent this, use `-DCMAKE_BUILD_TYPE=NoConfig` in conjunction with `FFLAGS`.
+- `-DFIND_BLAS` set to `off` in case you want to disable finding the extlib BLAS/LAPACK dependency (default: `on`).
For example, to configure a build using the Ninja backend while specifying compiler optimization via `FFLAGS`, generating procedures up to rank 7, installing to your home directory, using the `NoConfig` compiler flags, and printing the compiler commands, use
From 0534325d683e5ef3cab4c62a1f58e57d21cb45c1 Mon Sep 17 00:00:00 2001
From: ZUO Zhihua <zuo.zhihua@qq.com>
Date: Sat, 13 Jul 2024 05:30:08 +0800
Subject: [PATCH 07/13] Parallel CI construction to reduce CI time
---
.github/workflows/CI.yml | 45 ++++++++++++++++++-----
.github/workflows/ci_windows.yml | 61 +++++++++++++++++++++++++++-----
2 files changed, 88 insertions(+), 18 deletions(-)
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 0b0b209cf..b2d9aeaca 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -33,9 +33,6 @@ jobs:
build: cmake-inline
toolchain:
- {compiler: gcc, version: 10}
- APT_PACKAGES: >-
- intel-oneapi-mkl-2024.1.0
- intel-oneapi-mkl-devel-2024.1.0
exclude:
- os: macos-12
toolchain: {compiler: intel, version: '2024.1'}
@@ -62,7 +59,8 @@ jobs:
with:
compiler: ${{ matrix.toolchain.compiler }}
version: ${{ matrix.toolchain.version }}
-
+
+ # Build and test with built-in BLAS and LAPACK
- name: Configure with CMake
if: ${{ contains(matrix.build, 'cmake') }}
run: >-
@@ -94,9 +92,41 @@ jobs:
if: ${{ contains(matrix.build, 'cmake') }}
run: cmake --install ${{ env.BUILD_DIR }}
+ Build-with-MKL:
+ runs-on: ubuntu-latest
+ strategy:
+ fail-fast: false
+ matrix:
+ toolchain:
+ - {compiler: intel, version: '2024.1'}
+ include:
+ - APT_PACKAGES: >-
+ intel-oneapi-mkl-2024.1.0
+ intel-oneapi-mkl-devel-2024.1.0
+ build: [cmake]
+ env:
+ BUILD_DIR: ${{ matrix.build == 'cmake' && 'build' || '.' }}
+ steps:
+ - name: Checkout code
+ uses: actions/checkout@v4
+
+ - name: Set up Python 3.x
+ uses: actions/setup-python@v5 # Use pip to install latest CMake, & FORD/Jin2For, etc.
+ with:
+ python-version: 3.x
+
+ - name: Install fypp
+ run: pip install --upgrade fypp ninja
+
+ - name: Setup Fortran compiler
+ uses: fortran-lang/setup-fortran@v1.6.1
+ id: setup-fortran
+ with:
+ compiler: ${{ matrix.toolchain.compiler }}
+ version: ${{ matrix.toolchain.version }}
+
# Build and test with external BLAS and LAPACK (MKL on Ubuntu with Intel compilers)
- name: Configure with CMake and MKL
- if: ${{ contains(matrix.build, 'cmake') && matrix.os == 'ubuntu-latest' && matrix.toolchain.compiler == 'intel' }}
run: >-
cmake -Wdev -G Ninja
-DCMAKE_BUILD_TYPE=Release
@@ -107,15 +137,13 @@ jobs:
-S . -B build_mkl
- name: Build and compile with MKL
- if: ${{ contains(matrix.build, 'cmake') && matrix.os == 'ubuntu-latest' && matrix.toolchain.compiler == 'intel' }}
run: cmake --build build_mkl --parallel
- name: catch build fail with MKL
- if: ${{ failure() && contains(matrix.build, 'cmake') && matrix.os == 'ubuntu-latest' && matrix.toolchain.compiler == 'intel' }}
+ if: failure()
run: cmake --build build_mkl --verbose --parallel 1
- name: test with MKL
- if: ${{ contains(matrix.build, 'cmake') && matrix.os == 'ubuntu-latest' && matrix.toolchain.compiler == 'intel' }}
run: >-
ctest
--test-dir build_mkl
@@ -124,5 +152,4 @@ jobs:
--no-tests=error
- name: Install project with MKL
- if: ${{ contains(matrix.build, 'cmake') && matrix.os == 'ubuntu-latest' && matrix.toolchain.compiler == 'intel' }}
run: cmake --install build_mkl
diff --git a/.github/workflows/ci_windows.yml b/.github/workflows/ci_windows.yml
index d470c3ad4..e216212fc 100644
--- a/.github/workflows/ci_windows.yml
+++ b/.github/workflows/ci_windows.yml
@@ -38,7 +38,6 @@ jobs:
mingw-w64-${{ matrix.arch }}-python-setuptools
mingw-w64-${{ matrix.arch }}-cmake
mingw-w64-${{ matrix.arch }}-ninja
- mingw-w64-${{ matrix.arch }}-openblas
- name: Setup msys POSIX environment
uses: msys2/setup-msys2@v2
@@ -57,8 +56,8 @@ jobs:
- name: Install fypp
run: pip install fypp
-
- # Build and test with build-in BLAS and LAPACK
+
+ # Build and test with built-in BLAS and LAPACK
- run: >-
PATH=$PATH:/mingw64/bin/ cmake
-Wdev
@@ -92,9 +91,56 @@ jobs:
- name: Install project
run: PATH=$PATH:/mingw64/bin/ cmake --install build
+ msys2-build-with-OpenBLAS:
+ runs-on: windows-latest
+ strategy:
+ fail-fast: false
+ matrix:
+ include: [
+ { msystem: MINGW64, arch: x86_64 }
+ ]
+ defaults:
+ run:
+ shell: msys2 {0}
+ steps:
+ - uses: actions/checkout@v2
+
+ - name: Setup MinGW native environment
+ uses: msys2/setup-msys2@v2
+ with:
+ msystem: ${{ matrix.msystem }}
+ update: false
+ install: >-
+ git
+ mingw-w64-${{ matrix.arch }}-gcc
+ mingw-w64-${{ matrix.arch }}-gcc-fortran
+ mingw-w64-${{ matrix.arch }}-python
+ mingw-w64-${{ matrix.arch }}-python-pip
+ mingw-w64-${{ matrix.arch }}-python-setuptools
+ mingw-w64-${{ matrix.arch }}-cmake
+ mingw-w64-${{ matrix.arch }}-ninja
+ mingw-w64-${{ matrix.arch }}-openblas
+
+ - name: Setup msys POSIX environment
+ uses: msys2/setup-msys2@v2
+ if: contains(matrix.msystem, 'MSYS')
+ with:
+ msystem: MSYS
+ update: false
+ install: >-
+ git
+ mingw-w64-x86_64-gcc
+ mingw-w64-x86_64-gcc-fortran
+ python
+ python-pip
+ cmake
+ ninja
+
+ - name: Install fypp
+ run: pip install fypp
+
# Build and test with external BLAS and LAPACK (OpenBLAS on MINGW64)
- name: Configure with CMake and OpenBLAS
- if: contains(matrix.msystem, 'MINGW64')
run: >-
PATH=$PATH:/mingw64/bin/ cmake
-Wdev
@@ -110,23 +156,20 @@ jobs:
CXX: g++
- name: CMake build with OpenBLAS
- if: contains(matrix.msystem, 'MINGW64')
run: PATH=$PATH:/mingw64/bin/ cmake --build build_openblas --parallel
- name: catch build fail
- if: contains(matrix.msystem, 'MINGW64') && failure()
+ if: failure()
run: PATH=$PATH:/mingw64/bin/ cmake --build build_openblas --verbose --parallel 1
- name: CTest with OpenBLAS
- if: contains(matrix.msystem, 'MINGW64')
run: PATH=$PATH:/mingw64/bin/ ctest --test-dir build_openblas --output-on-failure --parallel -V -LE quadruple_precision
- uses: actions/upload-artifact@v1
- if: contains(matrix.msystem, 'MINGW64') && failure()
+ if: failure()
with:
name: WindowsCMakeTestlog_openblas
path: build_openblas/Testing/Temporary/LastTest.log
- name: Install project with OpenBLAS
- if: contains(matrix.msystem, 'MINGW64')
run: PATH=$PATH:/mingw64/bin/ cmake --install build_openblas
From 3254fd04f1a40ef7e64287218204ea5ab2ba77da Mon Sep 17 00:00:00 2001
From: ZUO Zhihua <zuo.zhihua@qq.com>
Date: Sat, 13 Jul 2024 10:32:17 +0800
Subject: [PATCH 08/13] Source MKL PATH
---
.github/workflows/CI.yml | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index b2d9aeaca..b6bb075b0 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -99,13 +99,12 @@ jobs:
matrix:
toolchain:
- {compiler: intel, version: '2024.1'}
- include:
- - APT_PACKAGES: >-
- intel-oneapi-mkl-2024.1.0
- intel-oneapi-mkl-devel-2024.1.0
build: [cmake]
env:
BUILD_DIR: ${{ matrix.build == 'cmake' && 'build' || '.' }}
+ APT_PACKAGES: >-
+ intel-oneapi-mkl
+ intel-oneapi-mkl-devel
steps:
- name: Checkout code
uses: actions/checkout@v4
@@ -124,7 +123,13 @@ jobs:
with:
compiler: ${{ matrix.toolchain.compiler }}
version: ${{ matrix.toolchain.version }}
-
+
+ - name: Install Intel oneAPI MKL
+ run: |
+ sudo apt-get install ${APT_PACKAGES}
+ source /opt/intel/oneapi/mkl/latest/env/vars.sh
+ printenv >> $GITHUB_ENV
+
# Build and test with external BLAS and LAPACK (MKL on Ubuntu with Intel compilers)
- name: Configure with CMake and MKL
run: >-
@@ -133,7 +138,8 @@ jobs:
-DCMAKE_MAXIMUM_RANK:String=4
-DCMAKE_INSTALL_PREFIX=$PWD/_dist
-DFIND_BLAS:STRING=TRUE
- -DBLA_VENDOR=Intel10_64lp
+ -DBLAS_LIBRARIES="/opt/intel/oneapi/mkl/latest/lib/intel64/libmkl_rt.so"
+ -DLAPACK_LIBRARIES="/opt/intel/oneapi/mkl/latest/lib/intel64/libmkl_rt.so"
-S . -B build_mkl
- name: Build and compile with MKL
From 90fd5b90379c0b00e62c9ac3ed9972647532c0b0 Mon Sep 17 00:00:00 2001
From: Jeremie Vandenplas <jeremie.vandenplas@gmail.com>
Date: Sun, 14 Jul 2024 22:46:37 +0200
Subject: [PATCH 09/13] Add support mkl
---
CMakeLists.txt | 16 ++++++++++++++--
src/CMakeLists.txt | 4 ++--
2 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 04925096f..37ecae37e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,11 +46,23 @@ option(FIND_BLAS "Find external BLAS and LAPACK" ON)
# --- find BLAS and LAPACK
if(FIND_BLAS)
- find_package(BLAS)
+ if(NOT BLAS_FOUND)
+ #Required for MKL
+ if(DEFINED ENV{MKLROOT} OR "${BLA_VENDOR}" MATCHES "^Intel")
+ enable_language("C")
+ endif()
+ find_package("BLAS")
+ endif()
if(BLAS_FOUND)
add_compile_definitions(STDLIB_EXTERNAL_BLAS)
endif()
- find_package(LAPACK)
+ if(NOT LAPACK_FOUND)
+ #Required for MKL
+ if(DEFINED ENV{MKLROOT} OR "${BLA_VENDOR}" MATCHES "^Intel")
+ enable_language("C")
+ endif()
+ find_package("LAPACK")
+ endif()
if(LAPACK_FOUND)
add_compile_definitions(STDLIB_EXTERNAL_LAPACK)
endif()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c7c738bbe..398935080 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -122,10 +122,10 @@ add_library(${PROJECT_NAME} ${SRC})
# Link to BLAS and LAPACK
if(BLAS_FOUND)
- target_link_libraries(${PROJECT_NAME} BLAS::BLAS)
+ target_link_libraries(${PROJECT_NAME} "BLAS::BLAS")
endif()
if(LAPACK_FOUND)
- target_link_libraries(${PROJECT_NAME} LAPACK::LAPACK)
+ target_link_libraries(${PROJECT_NAME} "LAPACK::LAPACK")
endif()
set_target_properties(
From a6903905e7fa4fb3a16edcc35e706931d620eac3 Mon Sep 17 00:00:00 2001
From: Jeremie Vandenplas <jeremie.vandenplas@gmail.com>
Date: Sun, 14 Jul 2024 22:57:48 +0200
Subject: [PATCH 10/13] test
---
.github/workflows/CI.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index b6bb075b0..88c781fbf 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -138,9 +138,9 @@ jobs:
-DCMAKE_MAXIMUM_RANK:String=4
-DCMAKE_INSTALL_PREFIX=$PWD/_dist
-DFIND_BLAS:STRING=TRUE
- -DBLAS_LIBRARIES="/opt/intel/oneapi/mkl/latest/lib/intel64/libmkl_rt.so"
- -DLAPACK_LIBRARIES="/opt/intel/oneapi/mkl/latest/lib/intel64/libmkl_rt.so"
-S . -B build_mkl
+# -DBLAS_LIBRARIES="/opt/intel/oneapi/mkl/latest/lib/intel64/libmkl_rt.so"
+# -DLAPACK_LIBRARIES="/opt/intel/oneapi/mkl/latest/lib/intel64/libmkl_rt.so"
- name: Build and compile with MKL
run: cmake --build build_mkl --parallel
From 40765adbd8ec5783c2a311dbf3d104d4270cce09 Mon Sep 17 00:00:00 2001
From: Jeremie Vandenplas <jeremie.vandenplas@gmail.com>
Date: Mon, 15 Jul 2024 00:15:09 +0200
Subject: [PATCH 11/13] fix test svd (related to signs of singular values)
---
test/linalg/test_linalg_svd.fypp | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/test/linalg/test_linalg_svd.fypp b/test/linalg/test_linalg_svd.fypp
index d5a01d123..fdb5d5a0e 100644
--- a/test/linalg/test_linalg_svd.fypp
+++ b/test/linalg/test_linalg_svd.fypp
@@ -93,7 +93,7 @@ module test_linalg_svd
if (allocated(error)) return
call check(error, all(abs(s-s_sol)<=tol), test//': S')
if (allocated(error)) return
- call check(error, all(abs(u-u_sol)<=tol) .or. all(abs(u+u_sol)<=tol), test//': U')
+ call check(error, all(abs(abs(u)-abs(u_sol))<=tol), test//': U')
if (allocated(error)) return
!> [S, U]. Overwrite A matrix
@@ -104,7 +104,7 @@ module test_linalg_svd
if (allocated(error)) return
call check(error, all(abs(s-s_sol)<=tol), test//': S')
if (allocated(error)) return
- call check(error, all(abs(u-u_sol)<=tol) .or. all(abs(u+u_sol)<=tol), test//': U')
+ call check(error, all(abs(abs(u)-abs(u_sol))<=tol), test//': U')
if (allocated(error)) return
!> [S, U, V^T]
@@ -116,9 +116,9 @@ module test_linalg_svd
if (allocated(error)) return
call check(error, all(abs(s-s_sol)<=tol), test//': S')
if (allocated(error)) return
- call check(error, all(abs(u-u_sol)<=tol) .or. all(abs(u+u_sol)<=tol), test//': U')
+ call check(error, all(abs(abs(u)-abs(u_sol))<=tol), test//': U')
if (allocated(error)) return
- call check(error, all(abs(vt-vt_sol)<=tol) .or. all(abs(vt+vt_sol)<=tol), test//': V^T')
+ call check(error, all(abs(abs(vt)-abs(vt_sol))<=tol), test//': V^T')
if (allocated(error)) return
!> [S, V^T]. Do not overwrite A matrix
@@ -130,7 +130,7 @@ module test_linalg_svd
if (allocated(error)) return
call check(error, all(abs(s-s_sol)<=tol), test//': S')
if (allocated(error)) return
- call check(error, all(abs(vt-vt_sol)<=tol) .or. all(abs(vt+vt_sol)<=tol), test//': V^T')
+ call check(error, all(abs(abs(vt)-abs(vt_sol))<=tol), test//': V^T')
if (allocated(error)) return
!> [S, V^T]. Overwrite A matrix
@@ -141,7 +141,7 @@ module test_linalg_svd
if (allocated(error)) return
call check(error, all(abs(s-s_sol)<=tol), test//': S')
if (allocated(error)) return
- call check(error, all(abs(vt-vt_sol)<=tol) .or. all(abs(vt+vt_sol)<=tol), test//': V^T')
+ call check(error, all(abs(abs(vt)-abs(vt_sol))<=tol), test//': V^T')
if (allocated(error)) return
!> [U, S, V^T].
@@ -151,11 +151,11 @@ module test_linalg_svd
test = '[U, S, V^T]'
call check(error,state%ok(),test//': '//state%print())
if (allocated(error)) return
- call check(error, all(abs(u-u_sol)<=tol) .or. all(abs(u+u_sol)<=tol), test//': U')
+ call check(error, all(abs(abs(u)-abs(u_sol))<=tol), test//': U')
if (allocated(error)) return
call check(error, all(abs(s-s_sol)<=tol), test//': S')
if (allocated(error)) return
- call check(error, all(abs(vt-vt_sol)<=tol) .or. all(abs(vt+vt_sol)<=tol), test//': V^T')
+ call check(error, all(abs(abs(vt)-abs(vt_sol))<=tol), test//': V^T')
if (allocated(error)) return
!> [U, S, V^T]. Partial storage -> compare until k=2 columns of U rows of V^T
@@ -167,11 +167,11 @@ module test_linalg_svd
test = '[U, S, V^T], partial storage'
call check(error,state%ok(),test//': '//state%print())
if (allocated(error)) return
- call check(error, all(abs(u(:,:2)-u_sol(:,:2))<=tol) .or. all(abs(u(:,:2)+u_sol(:,:2))<=tol), test//': U(:,:2)')
+ call check(error, all(abs(abs(u(:,:2))-abs(u_sol(:,:2)))<=tol), test//': U(:,:2)')
if (allocated(error)) return
call check(error, all(abs(s-s_sol)<=tol), test//': S')
if (allocated(error)) return
- call check(error, all(abs(vt(:2,:)-vt_sol(:2,:))<=tol) .or. all(abs(vt(:2,:)+vt_sol(:2,:))<=tol), test//': V^T(:2,:)')
+ call check(error, all(abs(abs(vt(:2,:))-abs(vt_sol(:2,:)))<=tol), test//': V^T(:2,:)')
if (allocated(error)) return
end subroutine test_svd_${ri}$
From b867c2bc40e00becb949870163d6314653500a9c Mon Sep 17 00:00:00 2001
From: Jeremie Vandenplas <jeremie.vandenplas@gmail.com>
Date: Sun, 14 Jul 2024 18:17:37 -0400
Subject: [PATCH 12/13] Update .github/workflows/CI.yml
---
.github/workflows/CI.yml | 2 --
1 file changed, 2 deletions(-)
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 88c781fbf..97f2fc343 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -139,8 +139,6 @@ jobs:
-DCMAKE_INSTALL_PREFIX=$PWD/_dist
-DFIND_BLAS:STRING=TRUE
-S . -B build_mkl
-# -DBLAS_LIBRARIES="/opt/intel/oneapi/mkl/latest/lib/intel64/libmkl_rt.so"
-# -DLAPACK_LIBRARIES="/opt/intel/oneapi/mkl/latest/lib/intel64/libmkl_rt.so"
- name: Build and compile with MKL
run: cmake --build build_mkl --parallel
From 58074c794f68aa4edd18e84707a2e361bac04b3f Mon Sep 17 00:00:00 2001
From: ZUO Zhihua <zuo.zhihua@qq.com>
Date: Wed, 17 Jul 2024 13:40:57 +0800
Subject: [PATCH 13/13] Fix typos
---
.github/workflows/CI.yml | 12 ++++++------
.github/workflows/ci_windows.yml | 31 ++++++++-----------------------
README.md | 2 +-
3 files changed, 15 insertions(+), 30 deletions(-)
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 97f2fc343..ad21c3278 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -59,7 +59,7 @@ jobs:
with:
compiler: ${{ matrix.toolchain.compiler }}
version: ${{ matrix.toolchain.version }}
-
+
# Build and test with built-in BLAS and LAPACK
- name: Configure with CMake
if: ${{ contains(matrix.build, 'cmake') }}
@@ -138,22 +138,22 @@ jobs:
-DCMAKE_MAXIMUM_RANK:String=4
-DCMAKE_INSTALL_PREFIX=$PWD/_dist
-DFIND_BLAS:STRING=TRUE
- -S . -B build_mkl
+ -S . -B ${{ env.BUILD_DIR }}
- name: Build and compile with MKL
- run: cmake --build build_mkl --parallel
+ run: cmake --build ${{ env.BUILD_DIR }} --parallel
- name: catch build fail with MKL
if: failure()
- run: cmake --build build_mkl --verbose --parallel 1
+ run: cmake --build ${{ env.BUILD_DIR }} --verbose --parallel 1
- name: test with MKL
run: >-
ctest
- --test-dir build_mkl
+ --test-dir ${{ env.BUILD_DIR }}
--parallel
--output-on-failure
--no-tests=error
- name: Install project with MKL
- run: cmake --install build_mkl
+ run: cmake --install ${{ env.BUILD_DIR }}
diff --git a/.github/workflows/ci_windows.yml b/.github/workflows/ci_windows.yml
index e216212fc..fd1f9c8cb 100644
--- a/.github/workflows/ci_windows.yml
+++ b/.github/workflows/ci_windows.yml
@@ -121,21 +121,6 @@ jobs:
mingw-w64-${{ matrix.arch }}-ninja
mingw-w64-${{ matrix.arch }}-openblas
- - name: Setup msys POSIX environment
- uses: msys2/setup-msys2@v2
- if: contains(matrix.msystem, 'MSYS')
- with:
- msystem: MSYS
- update: false
- install: >-
- git
- mingw-w64-x86_64-gcc
- mingw-w64-x86_64-gcc-fortran
- python
- python-pip
- cmake
- ninja
-
- name: Install fypp
run: pip install fypp
@@ -144,7 +129,7 @@ jobs:
run: >-
PATH=$PATH:/mingw64/bin/ cmake
-Wdev
- -B build_openblas
+ -B build
-DCMAKE_BUILD_TYPE=Debug
-DCMAKE_Fortran_FLAGS_DEBUG="-Wall -Wextra -Wimplicit-interface -fPIC -g -fcheck=all -fbacktrace"
-DCMAKE_MAXIMUM_RANK:String=4
@@ -154,22 +139,22 @@ jobs:
FC: gfortran
CC: gcc
CXX: g++
-
+
- name: CMake build with OpenBLAS
- run: PATH=$PATH:/mingw64/bin/ cmake --build build_openblas --parallel
+ run: PATH=$PATH:/mingw64/bin/ cmake --build build --parallel
- name: catch build fail
if: failure()
- run: PATH=$PATH:/mingw64/bin/ cmake --build build_openblas --verbose --parallel 1
+ run: PATH=$PATH:/mingw64/bin/ cmake --build build --verbose --parallel 1
- name: CTest with OpenBLAS
- run: PATH=$PATH:/mingw64/bin/ ctest --test-dir build_openblas --output-on-failure --parallel -V -LE quadruple_precision
-
+ run: PATH=$PATH:/mingw64/bin/ ctest --test-dir build --output-on-failure --parallel -V -LE quadruple_precision
+
- uses: actions/upload-artifact@v1
if: failure()
with:
name: WindowsCMakeTestlog_openblas
- path: build_openblas/Testing/Temporary/LastTest.log
+ path: build/Testing/Temporary/LastTest.log
- name: Install project with OpenBLAS
- run: PATH=$PATH:/mingw64/bin/ cmake --install build_openblas
+ run: PATH=$PATH:/mingw64/bin/ cmake --install build
diff --git a/README.md b/README.md
index fdae7dfe8..e799eb7bd 100644
--- a/README.md
+++ b/README.md
@@ -135,7 +135,7 @@ Important options are
- `-DBUILD_TESTING` set to `off` in case you want to disable the stdlib tests (default: `on`).
- `-DCMAKE_VERBOSE_MAKEFILE` is by default set to `Off`, but if set to `On` will show commands used to compile the code.
- `-DCMAKE_BUILD_TYPE` is by default set to `RelWithDebInfo`, which uses compiler flags suitable for code development (but with only `-O2` optimization). Beware the compiler flags set this way will override any compiler flags specified via `FFLAGS`. To prevent this, use `-DCMAKE_BUILD_TYPE=NoConfig` in conjunction with `FFLAGS`.
-- `-DFIND_BLAS` set to `off` in case you want to disable finding the extlib BLAS/LAPACK dependency (default: `on`).
+- `-DFIND_BLAS` set to `off` in case you want to disable finding the external BLAS/LAPACK dependency (default: `on`).
For example, to configure a build using the Ninja backend while specifying compiler optimization via `FFLAGS`, generating procedures up to rank 7, installing to your home directory, using the `NoConfig` compiler flags, and printing the compiler commands, use