From 685ece517b480d0346432d342e45287a8b41eb12 Mon Sep 17 00:00:00 2001 From: mattip Date: Thu, 2 Nov 2023 13:32:05 +0200 Subject: [PATCH] restore 'scipy_' prefix, edit fortran test files --- test.f90 | 10 +++++----- test64_.f90 | 10 +++++----- tools/build_openblas.sh | 3 +-- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/test.f90 b/test.f90 index c1554f6..c025eca 100644 --- a/test.f90 +++ b/test.f90 @@ -1,4 +1,4 @@ -!testdpotr_test_gh_2691.f90 +!testdpotr_test_gh_2691.f90 with scipy_ prefix subroutine garbage(okflag) implicit none integer, intent(out) :: okflag @@ -23,7 +23,7 @@ subroutine garbage(okflag) a2 = a - call dpotrf('L', 3, a, 3, info) + call scipy_dpotrf('L', 3, a, 3, info) if (info.ne.0) then okflag = 0 write(*,*) 'DPOTRF failed' @@ -39,20 +39,20 @@ subroutine garbage(okflag) a(i,j) = 0 end do end do - call dpotri('L', 3, a, 3, info) + call scipy_dpotri('L', 3, a, 3, info) if (info.ne.0) then okflag = 0 write(*,*) 'DPOTRI failed' return end if - call dgetrf(3, 3, a2, 3, ipiv, info) + call scipy_dgetrf(3, 3, a2, 3, ipiv, info) if (info.ne.0) then okflag = 0 write(*,*) 'DGETRF failed' return end if - call dgetri(3, a2, 3, ipiv, work, lwork, info) + call scipy_dgetri(3, a2, 3, ipiv, work, lwork, info) if (info.ne.0) then okflag = 0 write(*,*) 'DGETRI failed' diff --git a/test64_.f90 b/test64_.f90 index 3d1c9b0..cb7b31d 100644 --- a/test64_.f90 +++ b/test64_.f90 @@ -1,4 +1,4 @@ -!testdpotr_test_gh_2691.f90 with _64 suffix +!testdpotr_test_gh_2691.f90 with _64 suffix and scipy_ prefix subroutine garbage(okflag) implicit none integer, intent(out) :: okflag @@ -23,7 +23,7 @@ subroutine garbage(okflag) a2 = a - call dpotrf_64('L', 3, a, 3, info) + call scipy_dpotrf_64('L', 3, a, 3, info) if (info.ne.0) then okflag = 0 write(*,*) 'DPOTRF failed' @@ -39,20 +39,20 @@ subroutine garbage(okflag) a(i,j) = 0 end do end do - call dpotri_64('L', 3, a, 3, info) + call scipy_dpotri_64('L', 3, a, 3, info) if (info.ne.0) then okflag = 0 write(*,*) 'DPOTRI failed' return end if - call dgetrf_64(3, 3, a2, 3, ipiv, info) + call scipy_dgetrf_64(3, 3, a2, 3, ipiv, info) if (info.ne.0) then okflag = 0 write(*,*) 'DGETRF failed' return end if - call dgetri_64(3, a2, 3, ipiv, work, lwork, info) + call scipy_dgetri_64(3, a2, 3, ipiv, work, lwork, info) if (info.ne.0) then okflag = 0 write(*,*) 'DGETRI failed' diff --git a/tools/build_openblas.sh b/tools/build_openblas.sh index 74c5a02..2b89a06 100644 --- a/tools/build_openblas.sh +++ b/tools/build_openblas.sh @@ -81,8 +81,7 @@ if [ "$if_bits" == "64" ]; then else interface_flags="" fi -# XXX uncomment this -# interface_flags="$interface_flags SYMBOLPREFIX=scipy_" +interface_flags="$interface_flags SYMBOLPREFIX=scipy_" # Build name for output library from gcc version and OpenBLAS commit. GCC_TAG="gcc_$(gcc -dumpversion | tr .- _)"