Skip to content

Commit

Permalink
restore 'scipy_' prefix, edit fortran test files
Browse files Browse the repository at this point in the history
  • Loading branch information
mattip committed Nov 2, 2023
1 parent c62aaba commit 685ece5
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 12 deletions.
10 changes: 5 additions & 5 deletions test.f90
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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'
Expand All @@ -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'
Expand Down
10 changes: 5 additions & 5 deletions test64_.f90
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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'
Expand All @@ -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'
Expand Down
3 changes: 1 addition & 2 deletions tools/build_openblas.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 .- _)"
Expand Down

0 comments on commit 685ece5

Please sign in to comment.