Skip to content

Commit 9b94ca6

Browse files
bonacheabonachea
committed
Factor uses declarations for prif_deallocate_coarray
1 parent 7590ed4 commit 9b94ca6

9 files changed

Lines changed: 42 additions & 92 deletions

‎test/prif_allocate_test.F90‎

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,14 @@
11
#include "test-utils.F90"
2-
#include "language-support.F90"
32

43
module prif_allocate_test_m
4+
# include "test-uses-alloc.F90"
55
use prif, only : &
6-
prif_allocate_coarray, &
7-
prif_allocate, prif_deallocate, &
8-
prif_coarray_handle, prif_num_images, prif_size_bytes, &
6+
prif_num_images, prif_size_bytes, &
97
prif_set_context_data, prif_get_context_data, prif_local_data_pointer, &
108
prif_alias_create, prif_alias_destroy
11-
#if CAF_PRIF_VERSION <= 6
12-
use prif, only : prif_deallocate_coarray_ => prif_deallocate_coarray
13-
# define prif_deallocate_coarray(h) prif_deallocate_coarray_([h])
14-
# define prif_deallocate_coarrays(arr) prif_deallocate_coarray_(arr)
15-
#else
16-
use prif, only : prif_deallocate_coarray, prif_deallocate_coarrays
17-
#endif
9+
1810
use julienne_m, only: test_description_t, test_diagnosis_t, test_result_t, test_t, string_t, usher &
1911
,operator(.all.), operator(.also.), operator(.equalsExpected.), operator(//)
20-
use iso_c_binding, only: &
21-
c_ptr, c_int, c_int64_t, c_size_t, c_null_funptr, &
22-
c_f_pointer, c_null_ptr, c_loc, c_associated, c_intptr_t
2312

2413
implicit none
2514
private

‎test/prif_atomic_test.F90‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,11 @@
11
#include "julienne-assert-macros.h"
2-
#include "language-support.F90"
32
#include "test-utils.F90"
43

54
module prif_atomic_test_m
6-
use iso_c_binding, only: &
7-
c_ptr, c_int64_t, c_intptr_t, c_size_t, c_null_funptr, c_f_pointer, c_loc, c_sizeof
5+
# include "test-uses-alloc.F90"
86
use julienne_m, only: call_julienne_assert_, test_description_t, test_diagnosis_t, test_result_t, test_t, string_t, usher &
97
,operator(.also.), operator(.equalsExpected.), operator(.isAtLeast.), operator(.isAtMost.), operator(.lessThan.), operator(//)
108
use prif
11-
#if CAF_PRIF_VERSION <= 6
12-
use prif, only : prif_deallocate_coarray_ => prif_deallocate_coarray
13-
# define prif_deallocate_coarray(h) prif_deallocate_coarray_([h])
14-
# define prif_deallocate_coarrays(arr) prif_deallocate_coarray_(arr)
15-
#endif
169

1710
implicit none
1811
private

‎test/prif_coarray_inquiry_test.F90‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,14 @@
11
#include "test-utils.F90"
2-
#include "language-support.F90"
32

43
module prif_coarray_inquiry_test_m
4+
# include "test-uses-alloc.F90"
55
use prif, only : &
6-
prif_allocate_coarray, prif_deallocate_coarray, &
76
prif_coarray_handle, prif_num_images, &
87
prif_local_data_pointer, prif_size_bytes, &
98
prif_lcobound_no_dim, prif_lcobound_with_dim, &
109
prif_ucobound_no_dim, prif_ucobound_with_dim, &
1110
prif_coshape
12-
#if CAF_PRIF_VERSION <= 6
13-
use prif, only : prif_deallocate_coarray_ => prif_deallocate_coarray
14-
# define prif_deallocate_coarray(h) prif_deallocate_coarray_([h])
15-
# define prif_deallocate_coarrays(arr) prif_deallocate_coarray_(arr)
16-
#else
17-
use prif, only : prif_deallocate_coarray, prif_deallocate_coarrays
18-
#endif
11+
1912
use julienne_m, only: &
2013
operator(//) &
2114
,operator(.all.) &
@@ -27,8 +20,6 @@ module prif_coarray_inquiry_test_m
2720
,test_diagnosis_t &
2821
,test_result_t &
2922
,test_t
30-
use iso_c_binding, only: &
31-
c_ptr, c_null_ptr, c_int64_t, c_int, c_size_t, c_null_funptr, c_associated
3223

3324
implicit none
3425
private

‎test/prif_event_test.F90‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#include "test-utils.F90"
2-
#include "language-support.F90"
32
#include "assert_macros.h"
43

54
! TEST_ASSERT activates immediate assertions in test code
@@ -11,25 +10,15 @@
1110
#endif
1211

1312
module prif_event_test_m
13+
# include "test-uses-alloc.F90"
1414
use assert_m
15-
use iso_c_binding, only: &
16-
c_ptr, c_int64_t, c_intptr_t, c_size_t, c_null_funptr, c_f_pointer, c_loc, c_sizeof
1715
use prif, only: &
1816
prif_event_type, prif_event_post, prif_event_post_indirect, prif_event_wait, prif_event_query, &
1917
prif_notify_type, prif_notify_wait, prif_put_with_notify, prif_put_strided_with_notify, &
20-
prif_coarray_handle, &
21-
prif_allocate_coarray, &
2218
prif_num_images, &
2319
prif_put, &
2420
prif_sync_all, &
2521
prif_this_image_no_coarray
26-
#if CAF_PRIF_VERSION <= 6
27-
use prif, only : prif_deallocate_coarray_ => prif_deallocate_coarray
28-
# define prif_deallocate_coarray(h) prif_deallocate_coarray_([h])
29-
# define prif_deallocate_coarrays(arr) prif_deallocate_coarray_(arr)
30-
#else
31-
use prif, only : prif_deallocate_coarray, prif_deallocate_coarrays
32-
#endif
3322
use julienne_m, only: test_description_t, test_diagnosis_t, test_result_t, test_t, string_t, usher &
3423
,operator(.all.), operator(.also.), operator(.equalsExpected.), operator(//)
3524

‎test/prif_image_index_test.F90‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
#include "test-utils.F90"
2-
#include "language-support.F90"
32

43
module prif_image_index_test_m
5-
use iso_c_binding, only: c_int, c_ptr, c_size_t, c_null_funptr, c_int64_t
6-
use prif, only: prif_coarray_handle, prif_allocate_coarray, &
4+
# include "test-uses-alloc.F90"
5+
use prif, only: &
76
prif_image_index, prif_num_images, &
87
prif_team_type, prif_get_team, &
98
prif_this_image_no_coarray, &
@@ -13,13 +12,6 @@ module prif_image_index_test_m
1312
prif_this_image_with_coarray, prif_this_image_with_dim, &
1413
prif_lcobound_no_dim, prif_ucobound_no_dim, &
1514
prif_num_images_with_team, PRIF_INITIAL_TEAM
16-
#if CAF_PRIF_VERSION <= 6
17-
use prif, only : prif_deallocate_coarray_ => prif_deallocate_coarray
18-
# define prif_deallocate_coarray(h) prif_deallocate_coarray_([h])
19-
# define prif_deallocate_coarrays(arr) prif_deallocate_coarray_(arr)
20-
#else
21-
use prif, only : prif_deallocate_coarray, prif_deallocate_coarrays
22-
#endif
2315
use julienne_m, only: test_description_t, test_diagnosis_t, test_result_t, test_t, string_t, usher &
2416
,operator(.also.), operator(.equalsExpected.), operator(.isAtLeast.), operator(.isAtMost.), operator(//)
2517

‎test/prif_rma_test.F90‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
1-
#include "language-support.F90"
2-
31
module prif_rma_test_m
4-
use iso_c_binding, only: &
5-
c_ptr, c_int64_t, c_intptr_t, c_size_t, c_null_funptr, c_f_pointer, c_loc, c_sizeof
2+
# include "test-uses-alloc.F90"
63
use prif, only: &
7-
prif_coarray_handle, &
8-
prif_allocate_coarray, &
9-
prif_allocate, &
10-
prif_deallocate, &
114
prif_num_images, &
125
prif_put, &
136
prif_put_indirect, &
@@ -16,13 +9,6 @@ module prif_rma_test_m
169
prif_sync_all, &
1710
prif_sync_memory, &
1811
prif_this_image_no_coarray
19-
#if CAF_PRIF_VERSION <= 6
20-
use prif, only : prif_deallocate_coarray_ => prif_deallocate_coarray
21-
# define prif_deallocate_coarray(h) prif_deallocate_coarray_([h])
22-
# define prif_deallocate_coarrays(arr) prif_deallocate_coarray_(arr)
23-
#else
24-
use prif, only : prif_deallocate_coarray, prif_deallocate_coarrays
25-
#endif
2612
use julienne_m, only: test_description_t, test_diagnosis_t, test_result_t, test_t, usher, operator(.equalsExpected.)
2713

2814
implicit none

‎test/prif_strided_test.F90‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
1-
#include "language-support.F90"
2-
31
module prif_strided_test_m
4-
use iso_c_binding, only: &
5-
c_ptr, c_int64_t, c_intptr_t, c_size_t, c_null_funptr, c_f_pointer, c_loc, c_sizeof
2+
# include "test-uses-alloc.F90"
63
use prif, only: &
7-
prif_coarray_handle, &
8-
prif_allocate_coarray, &
9-
prif_allocate, &
10-
prif_deallocate, &
114
prif_num_images, &
125
prif_get, &
136
prif_put_strided, &
@@ -16,13 +9,6 @@ module prif_strided_test_m
169
prif_get_strided_indirect, &
1710
prif_sync_all, &
1811
prif_this_image_no_coarray
19-
#if CAF_PRIF_VERSION <= 6
20-
use prif, only : prif_deallocate_coarray_ => prif_deallocate_coarray
21-
# define prif_deallocate_coarray(h) prif_deallocate_coarray_([h])
22-
# define prif_deallocate_coarrays(arr) prif_deallocate_coarray_(arr)
23-
#else
24-
use prif, only : prif_deallocate_coarray, prif_deallocate_coarrays
25-
#endif
2612
use julienne_m, only: test_description_t, test_diagnosis_t, test_result_t, test_t, usher &
2713
,operator(.all.), operator(.equalsExpected.)
2814

‎test/prif_teams_test.F90‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
11
#include "test-utils.F90"
2-
#include "language-support.F90"
32

43
module prif_teams_test_m
5-
use iso_c_binding, only: c_size_t, c_ptr, c_null_funptr, c_int64_t, c_int
4+
# include "test-uses-alloc.F90"
65
use prif
7-
#if CAF_PRIF_VERSION <= 6
8-
use prif, only : prif_deallocate_coarray_ => prif_deallocate_coarray
9-
# define prif_deallocate_coarray(h) prif_deallocate_coarray_([h])
10-
# define prif_deallocate_coarrays(arr) prif_deallocate_coarray_(arr)
11-
#endif
126
use julienne_m, only: test_description_t, test_diagnosis_t, test_result_t, test_t, string_t, usher &
137
,operator(.also.), operator(.isAtLeast.), operator(.isAtMost.), operator(.equalsExpected.), operator(//)
148

‎test/test-uses-alloc.F90‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
! This header provides use declarations needed for tests using prif_(de)allocate(_coarray),
2+
! and hides the interface differences between PRIF spec revisions.
3+
! It must be #included within a use block.
4+
5+
#ifndef CAF_INCLUDED_TEST_USES_ALLOC
6+
#define CAF_INCLUDED_TEST_USES_ALLOC
7+
8+
#include "language-support.F90"
9+
10+
use prif, only : &
11+
prif_allocate_coarray, &
12+
prif_allocate, prif_deallocate, &
13+
prif_coarray_handle
14+
15+
#if !defined(CAF_PRIF_VERSION) || CAF_PRIF_VERSION >= 7
16+
! PRIF 0.7+ deallocate
17+
use prif, only : prif_deallocate_coarray, prif_deallocate_coarrays
18+
#else
19+
! emulate PRIF 0.7 deallocate with older interfaces
20+
use prif, only : prif_deallocate_coarray_ => prif_deallocate_coarray
21+
# define prif_deallocate_coarray(h) prif_deallocate_coarray_([h])
22+
# define prif_deallocate_coarrays(arr) prif_deallocate_coarray_(arr)
23+
#endif
24+
25+
use iso_c_binding, only: &
26+
c_ptr, c_int, c_int64_t, c_size_t, c_intptr_t, &
27+
c_null_funptr, c_null_ptr, &
28+
c_associated, c_f_pointer, c_loc, c_sizeof
29+
30+
#endif

0 commit comments

Comments
 (0)