Skip to content

Commit 79105f8

Browse files
nawalcoptynawalcopty
authored
OpenMP: Use new syntax for allocating USM memory in Fortran. See https://github.com/intel-sandbox/documentation.oneapi.gpu-opt-guide/pull/259 (#2023)
1 parent 64b0802 commit 79105f8

File tree

6 files changed

+34
-34
lines changed

6 files changed

+34
-34
lines changed

‎Publications/GPU-Opt-Guide/OpenMP/21_omp_target_alloc/test_omp_target_alloc_device_f.f90‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ program main
2222
!
2323
! Allocate arrays in device memory
2424

25-
!$omp allocate allocator(omp_target_device_mem_alloc)
25+
!$omp allocators allocate(allocator(omp_target_device_mem_alloc): A)
2626
allocate(A(length))
2727

28-
!$omp allocate allocator(omp_target_device_mem_alloc)
28+
!$omp allocators allocate(allocator(omp_target_device_mem_alloc): B)
2929
allocate(B(length))
3030

31-
!$omp allocate allocator(omp_target_device_mem_alloc)
31+
!$omp allocators allocate(allocator(omp_target_device_mem_alloc): C)
3232
allocate(C(length))
3333

3434
!

‎Publications/GPU-Opt-Guide/OpenMP/21_omp_target_alloc/test_omp_target_alloc_host_f.f90‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ program main
2222
!
2323
! Allocate arrays in host memory
2424

25-
!$omp allocate allocator(omp_target_host_mem_alloc)
25+
!$omp allocators allocate(allocator(omp_target_host_mem_alloc): A)
2626
allocate(A(length))
2727

28-
!$omp allocate allocator(omp_target_host_mem_alloc)
28+
!$omp allocators allocate(allocator(omp_target_host_mem_alloc): B)
2929
allocate(B(length))
3030

31-
!$omp allocate allocator(omp_target_host_mem_alloc)
31+
!$omp allocators allocate(allocator(omp_target_host_mem_alloc): C)
3232
allocate(C(length))
3333

3434
!

‎Publications/GPU-Opt-Guide/OpenMP/21_omp_target_alloc/test_omp_target_alloc_shared_f.f90‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ program main
2222
!
2323
! Allocate arrays in shared memory
2424

25-
!$omp allocate allocator(omp_target_shared_mem_alloc)
25+
!$omp allocators allocate(allocator(omp_target_shared_mem_alloc): A)
2626
allocate(A(length))
2727

28-
!$omp allocate allocator(omp_target_shared_mem_alloc)
28+
!$omp allocators allocate(allocator(omp_target_shared_mem_alloc): B)
2929
allocate(B(length))
3030

31-
!$omp allocate allocator(omp_target_shared_mem_alloc)
31+
!$omp allocators allocate(allocator(omp_target_shared_mem_alloc): C)
3232
allocate(C(length))
3333

3434
!

‎Publications/GPU-Opt-Guide/OpenMP/24_device_ptr_addr_clauses/f_has_device_addr_01.f90‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ program main
2222
!
2323
! Allocate arrays in device memory
2424

25-
!$omp allocate allocator(omp_target_device_mem_alloc)
25+
!$omp allocators allocate(allocator(omp_target_device_mem_alloc): A)
2626
allocate(A(length))
2727

28-
!$omp allocate allocator(omp_target_device_mem_alloc)
28+
!$omp allocators allocate(allocator(omp_target_device_mem_alloc): B)
2929
allocate(B(length))
3030

31-
!$omp allocate allocator(omp_target_device_mem_alloc)
31+
!$omp allocators allocate(allocator(omp_target_device_mem_alloc): C)
3232
allocate(C(length))
3333

3434
!

‎Publications/GPU-Opt-Guide/OpenMP/25_NWChem_based_example_1/test-SharedMem.f‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -170,37 +170,37 @@ end subroutine omp_fbody
170170
lnov = nocc * nvir
171171
kchunk = (nocc - 1)/nkpass + 1
172172

173-
!$omp allocate allocator(omp_target_shared_mem_alloc)
173+
!$omp allocators allocate(allocator(omp_target_shared_mem_alloc): f1n)
174174
allocate( f1n(1:nvir,1:nvir) )
175175

176-
!$omp allocate allocator(omp_target_shared_mem_alloc)
176+
!$omp allocators allocate(allocator(omp_target_shared_mem_alloc): f2n)
177177
allocate( f2n(1:nvir,1:nvir) )
178178

179-
!$omp allocate allocator(omp_target_shared_mem_alloc)
179+
!$omp allocators allocate(allocator(omp_target_shared_mem_alloc): eorb)
180180
allocate( eorb(1:nbf) )
181181

182-
!$omp allocate allocator(omp_target_shared_mem_alloc)
182+
!$omp allocators allocate(allocator(omp_target_shared_mem_alloc): Jia)
183183
allocate( Jia(1:lnvv) )
184184

185-
!$omp allocate allocator(omp_target_shared_mem_alloc)
185+
!$omp allocators allocate(allocator(omp_target_shared_mem_alloc): Kia)
186186
allocate( Kia(1:lnvv) )
187187

188-
!$omp allocate allocator(omp_target_shared_mem_alloc)
188+
!$omp allocators allocate(allocator(omp_target_shared_mem_alloc): Tia)
189189
allocate( Tia(1:lnov*nocc) )
190190

191-
!$omp allocate allocator(omp_target_shared_mem_alloc)
191+
!$omp allocators allocate(allocator(omp_target_shared_mem_alloc): Xia)
192192
allocate( Xia(1:lnov*nocc))
193193

194-
!$omp allocate allocator(omp_target_shared_mem_alloc)
194+
!$omp allocators allocate(allocator(omp_target_shared_mem_alloc): Tkj)
195195
allocate( Tkj(1:kchunk*lnvv) )
196196

197-
!$omp allocate allocator(omp_target_shared_mem_alloc)
197+
!$omp allocators allocate(allocator(omp_target_shared_mem_alloc): Kkj)
198198
allocate( Kkj(1:kchunk*lnvv) )
199199

200-
!$omp allocate allocator(omp_target_shared_mem_alloc)
200+
!$omp allocators allocate(allocator(omp_target_shared_mem_alloc): t1v1)
201201
allocate( t1v1(1:lnvv) )
202202

203-
!$omp allocate allocator(omp_target_shared_mem_alloc)
203+
!$omp allocators allocate(allocator(omp_target_shared_mem_alloc): t1v2)
204204
allocate( t1v2(1:lnvv) )
205205
!
206206
call init_array_1(eorb, nbf)

‎Publications/GPU-Opt-Guide/OpenMP/25_NWChem_based_example_3/test-HostMem-DeviceMem-Map-UpdateTo.f‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -171,37 +171,37 @@ end subroutine omp_fbody
171171
lnov = nocc * nvir
172172
kchunk = (nocc - 1)/nkpass + 1
173173

174-
!$omp allocate allocator(omp_target_device_mem_alloc)
174+
!$omp allocators allocate(allocator(omp_target_device_mem_alloc): f1n)
175175
allocate( f1n(1:nvir,1:nvir) )
176176

177-
!$omp allocate allocator(omp_target_device_mem_alloc)
177+
!$omp allocators allocate(allocator(omp_target_device_mem_alloc): f2n)
178178
allocate( f2n(1:nvir,1:nvir) )
179179

180-
!$omp allocate allocator(omp_target_host_mem_alloc)
180+
!$omp allocators allocate(allocator(omp_target_host_mem_alloc): eorb)
181181
allocate( eorb(1:nbf) )
182182

183-
!$omp allocate allocator(omp_target_host_mem_alloc)
183+
!$omp allocators allocate(allocator(omp_target_host_mem_alloc): Jia)
184184
allocate( Jia(1:lnvv) )
185185

186-
!$omp allocate allocator(omp_target_host_mem_alloc)
186+
!$omp allocators allocate(allocator(omp_target_host_mem_alloc): Kia)
187187
allocate( Kia(1:lnvv) )
188188

189-
!$omp allocate allocator(omp_target_host_mem_alloc)
189+
!$omp allocators allocate(allocator(omp_target_host_mem_alloc): Tia)
190190
allocate( Tia(1:lnov*nocc) )
191191

192-
!$omp allocate allocator(omp_target_host_mem_alloc)
192+
!$omp allocators allocate(allocator(omp_target_host_mem_alloc): Xia)
193193
allocate( Xia(1:lnov*nocc))
194194

195-
!$omp allocate allocator(omp_target_host_mem_alloc)
195+
!$omp allocators allocate(allocator(omp_target_host_mem_alloc): Tkj)
196196
allocate( Tkj(1:kchunk*lnvv) )
197197

198-
!$omp allocate allocator(omp_target_host_mem_alloc)
198+
!$omp allocators allocate(allocator(omp_target_host_mem_alloc): Kkj)
199199
allocate( Kkj(1:kchunk*lnvv) )
200200

201-
!$omp allocate allocator(omp_target_host_mem_alloc)
201+
!$omp allocators allocate(allocator(omp_target_host_mem_alloc): t1v1)
202202
allocate( t1v1(1:lnvv) )
203203

204-
!$omp allocate allocator(omp_target_host_mem_alloc)
204+
!$omp allocators allocate(allocator(omp_target_host_mem_alloc): t1v2)
205205
allocate( t1v2(1:lnvv) )
206206
!
207207
call init_array_1(eorb, nbf)

0 commit comments

Comments
 (0)