Skip to content

issue #326: Promote char_{min,max}_wrapper helpers to module scope #327

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bonachea wants to merge 1 commit into
base: main
Choose a base branch
from
+60 −40
Open

issue #326: Promote char_{min,max}_wrapper helpers to module scope #327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 30 additions & 20 deletions src/caffeine/co_max_s.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,35 @@

#include "assert_macros.h"

module prif_co_max_helper
!! F23 C1807: bind(c) callbacks written in Fortran must appear in a top-level module
use iso_c_binding, only: c_ptr, c_size_t, c_char, c_f_pointer
implicit none

contains

subroutine char_max_wrapper(arg1, arg2_and_out, count, cdata) bind(C)
type(c_ptr), intent(in), value :: arg1, arg2_and_out
integer(c_size_t), intent(in), value :: count
type(c_ptr), intent(in), value :: cdata

integer(c_size_t), pointer :: char_len
integer(c_size_t) :: i

if (count == 0) return
call c_f_pointer(cdata, char_len)
block
character(len=char_len,kind=c_char), pointer :: lhs(:), rhs_and_result(:)
call c_f_pointer(arg1, lhs, [count])
call c_f_pointer(arg2_and_out, rhs_and_result, [count])
do i = 1, count
if (lhs(i) >= rhs_and_result(i)) rhs_and_result(i) = lhs(i)
end do
end block
end subroutine

end module

submodule(prif:prif_private_s) co_max_s
! DO NOT ADD USE STATEMENTS HERE
! All use statements belong in prif_private_s.F90
Expand Down Expand Up @@ -34,27 +63,8 @@ subroutine contiguous_co_max(a, result_image, stat, errmsg, errmsg_alloc)
current_team%info%gex_team)
end subroutine

subroutine char_max_wrapper(arg1, arg2_and_out, count, cdata) bind(C)
type(c_ptr), intent(in), value :: arg1, arg2_and_out
integer(c_size_t), intent(in), value :: count
type(c_ptr), intent(in), value :: cdata

integer(c_size_t), pointer :: char_len
integer(c_size_t) :: i

if (count == 0) return
call c_f_pointer(cdata, char_len)
block
character(len=char_len,kind=c_char), pointer :: lhs(:), rhs_and_result(:)
call c_f_pointer(arg1, lhs, [count])
call c_f_pointer(arg2_and_out, rhs_and_result, [count])
do i = 1, count
if (lhs(i) >= rhs_and_result(i)) rhs_and_result(i) = lhs(i)
end do
end block
end subroutine

module procedure prif_co_max_character
use prif_co_max_helper
integer(c_size_t), target :: char_len
procedure(prif_operation_wrapper_interface), pointer :: op

Expand Down
50 changes: 30 additions & 20 deletions src/caffeine/co_min_s.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,35 @@

#include "assert_macros.h"

module prif_co_min_helper
!! F23 C1807: bind(c) callbacks written in Fortran must appear in a top-level module
use iso_c_binding, only: c_ptr, c_size_t, c_char, c_f_pointer
implicit none

contains

subroutine char_min_wrapper(arg1, arg2_and_out, count, cdata) bind(C)
type(c_ptr), intent(in), value :: arg1, arg2_and_out
integer(c_size_t), intent(in), value :: count
type(c_ptr), intent(in), value :: cdata

integer(c_size_t), pointer :: char_len
integer(c_size_t) :: i

if (count == 0) return
call c_f_pointer(cdata, char_len)
block
character(len=char_len,kind=c_char), pointer :: lhs(:), rhs_and_result(:)
call c_f_pointer(arg1, lhs, [count])
call c_f_pointer(arg2_and_out, rhs_and_result, [count])
do i = 1, count
if (lhs(i) <= rhs_and_result(i)) rhs_and_result(i) = lhs(i)
end do
end block
end subroutine

end module

submodule(prif:prif_private_s) co_min_s
! DO NOT ADD USE STATEMENTS HERE
! All use statements belong in prif_private_s.F90
Expand Down Expand Up @@ -34,27 +63,8 @@ subroutine contiguous_co_min(a, result_image, stat, errmsg, errmsg_alloc)
current_team%info%gex_team)
end subroutine

subroutine char_min_wrapper(arg1, arg2_and_out, count, cdata) bind(C)
type(c_ptr), intent(in), value :: arg1, arg2_and_out
integer(c_size_t), intent(in), value :: count
type(c_ptr), intent(in), value :: cdata

integer(c_size_t), pointer :: char_len
integer(c_size_t) :: i

if (count == 0) return
call c_f_pointer(cdata, char_len)
block
character(len=char_len,kind=c_char), pointer :: lhs(:), rhs_and_result(:)
call c_f_pointer(arg1, lhs, [count])
call c_f_pointer(arg2_and_out, rhs_and_result, [count])
do i = 1, count
if (lhs(i) <= rhs_and_result(i)) rhs_and_result(i) = lhs(i)
end do
end block
end subroutine

module procedure prif_co_min_character
use prif_co_min_helper
integer(c_size_t), target :: char_len
procedure(prif_operation_wrapper_interface), pointer :: op

Expand Down