Skip to content

Commit 8c939f7

Browse files
committed
more doxygen fixes (Vedran Miletić)
svn-origin-rev: 14230
1 parent 02f6415 commit 8c939f7

29 files changed

+211
-107
lines changed

src/acc/acc_device.F

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ END FUNCTION acc_set_active_device_cu
4040
CONTAINS
4141

4242
! *****************************************************************************
43-
!> \brief ...
44-
!> \retval n ...
43+
!> \brief Get number of accelerator devices
44+
!> \retval n number of accelerator devices
4545
! *****************************************************************************
4646
FUNCTION acc_get_ndevices() RESULT(n)
4747
INTEGER :: n
@@ -59,8 +59,8 @@ END FUNCTION acc_get_ndevices
5959

6060

6161
! *****************************************************************************
62-
!> \brief ...
63-
!> \param dev_id ...
62+
!> \brief Set active accelerator device
63+
!> \param dev_id device ID
6464
! *****************************************************************************
6565
SUBROUTINE acc_set_active_device(dev_id)
6666
INTEGER :: dev_id

src/acc/acc_devmem.F

Lines changed: 33 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -164,11 +164,11 @@ END FUNCTION dc_memcpy_d2d_cu
164164

165165
! *****************************************************************************
166166
!> \brief Ensures that given devmem has at least the requested size.
167-
!> \param this ...
168-
!> \param stream on which zeroing and memcopying is performed
169-
!> \param requested_size_in_bytes ...
170-
!> \param nocopy if after growin old content should NOT be copied over. default:false.
171-
!> \param zero_pad if after growing the new memory should be zeroed. default: false.
167+
!> \param[in,out] this device memory
168+
!> \param[in] stream on which zeroing and memcopying is performed
169+
!> \param[in] requested_size_in_bytes requested size in bytes
170+
!> \param[in] (optional) nocopy if after growin old content should NOT be copied over. Default: false.
171+
!> \param[in] (optional) zero_pad if after growing the new memory should be zeroed. Default: false.
172172
!> \author Ole Schuett
173173
! *****************************************************************************
174174
SUBROUTINE acc_devmem_ensure_size_bytes(this, stream, requested_size_in_bytes, nocopy, zero_pad)
@@ -227,8 +227,8 @@ END SUBROUTINE acc_devmem_ensure_size_bytes
227227

228228
! *****************************************************************************
229229
!> \brief Returns a logical, which indicates if the given devmem is allocated.
230-
!> \param this ...
231-
!> \retval res ...
230+
!> \param[in] this device memory
231+
!> \retval res true if device memory is allocated, false otherwise
232232
!> \author Ole Schuett
233233
! *****************************************************************************
234234
FUNCTION acc_devmem_allocated(this) RESULT(res)
@@ -241,8 +241,8 @@ END FUNCTION acc_devmem_allocated
241241

242242
! *****************************************************************************
243243
!> \brief Returns size of given devmem in terms of item count (not bytes!)
244-
!> \param this ...
245-
!> \retval res ...
244+
!> \param[in] this device memory
245+
!> \retval res size of device memory (item count)
246246
!> \author Ole Schuett
247247
! *****************************************************************************
248248
FUNCTION acc_devmem_size_in_bytes(this) RESULT(res)
@@ -256,9 +256,9 @@ END FUNCTION acc_devmem_size_in_bytes
256256

257257

258258
! *****************************************************************************
259-
!> \brief Returns C-pointer to data of give devmem.
260-
!> \param this ...
261-
!> \retval res ...
259+
!> \brief Returns C-pointer to data of given devmem.
260+
!> \param[in] this device memory
261+
!> \retval res false (accelerator support is not enabled)
262262
!> \author Ole Schuett
263263
! *****************************************************************************
264264
#if ! defined (__ACC)
@@ -270,9 +270,10 @@ FUNCTION acc_devmem_cptr(this) RESULT(res)
270270
END FUNCTION acc_devmem_cptr
271271
#else
272272
! *****************************************************************************
273-
!> \brief ...
274-
!> \param this ...
275-
!> \retval res ...
273+
!> \brief Returns C-pointer to data of given devmem.
274+
!> \param[in] this device memory
275+
!> \retval res C-pointer to data of given devmem
276+
!> \author Ole Schuett
276277
! *****************************************************************************
277278
FUNCTION acc_devmem_cptr(this) RESULT(res)
278279
TYPE(acc_devmem_type), INTENT(IN) :: this
@@ -286,8 +287,8 @@ END FUNCTION acc_devmem_cptr
286287

287288
! *****************************************************************************
288289
!> \brief Fortran-wrapper for cudaMemGetInfo.
289-
!> \param free ...
290-
!> \param avail ...
290+
!> \param[out] free free device memory
291+
!> \param[out] avail available device memory
291292
!> \author Ole Schuett
292293
! *****************************************************************************
293294
SUBROUTINE acc_devmem_info(free, avail)
@@ -305,8 +306,8 @@ END SUBROUTINE acc_devmem_info
305306

306307
! *****************************************************************************
307308
!> \brief Allocates a given devmem.
308-
!> \param this ...
309-
!> \param size_in_bytes ...
309+
!> \param[in,out] this device memory
310+
!> \param[in] size_in_bytes size in bytes
310311
!> \author Ole Schuett
311312
! *****************************************************************************
312313
SUBROUTINE acc_devmem_allocate_bytes(this, size_in_bytes)
@@ -333,7 +334,7 @@ END SUBROUTINE acc_devmem_allocate_bytes
333334

334335
! *****************************************************************************
335336
!> \brief Deallocates a given devmem.
336-
!> \param this ...
337+
!> \param[in,out] this device memory
337338
!> \author Ole Schuett
338339
! *****************************************************************************
339340
SUBROUTINE acc_devmem_deallocate(this)
@@ -361,10 +362,10 @@ END SUBROUTINE acc_devmem_deallocate
361362

362363
! *****************************************************************************
363364
!> \brief Sets entries in given devmem to zero, asynchronously.
364-
!> \param this ...
365-
!> \param first_byte begin of region to zero, defaults to 1 if not given.
366-
!> \param last_byte end of region to zero, defaults to size if not given.
367-
!> \param stream on which zeroing is performed.
365+
!> \param[in,out] this device memory
366+
!> \param[in] (optional) first_byte begin of region to zero, defaults to 1 if not given.
367+
!> \param[in] (optional) last_byte end of region to zero, defaults to size if not given.
368+
!> \param[in] stream stream on which zeroing is performed.
368369
!> \author Ole Schuett
369370
! *****************************************************************************
370371
SUBROUTINE acc_devmem_setzero_bytes(this, first_byte, last_byte, stream)
@@ -400,10 +401,10 @@ END SUBROUTINE acc_devmem_setzero_bytes
400401

401402
! *****************************************************************************
402403
!> \brief Helper-routine performing actuall host2dev transfers.
403-
!> \param this ...
404-
!> \param hostmem_cptr ...
405-
!> \param n_bytes ...
406-
!> \param stream ...
404+
!> \param[in] this device memory
405+
!> \param hostmem_cptr host memory
406+
!> \param[in] n_bytes number of bytes
407+
!> \param[in] stream stream used for memory transfer
407408
!> \author Ole Schuett
408409
! *****************************************************************************
409410
#if defined (__ACC)
@@ -433,10 +434,10 @@ END SUBROUTINE host2dev_raw
433434

434435
! *****************************************************************************
435436
!> \brief Helper-routine performing actual dev2host transfers.
436-
!> \param this ...
437-
!> \param hostmem_cptr ...
438-
!> \param n_bytes ...
439-
!> \param stream ...
437+
!> \param[in] this device memory
438+
!> \param hostmem_cptr host memory
439+
!> \param[in] n_bytes number of bytes
440+
!> \param[in] stream stream used for memory transfer
440441
!> \author Ole Schuett
441442
! *****************************************************************************
442443
#if defined (__ACC)

src/acc/acc_devmem__nametype_.template

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
! *****************************************************************************
22
!> \brief Transfers 1D fortran-array from host to cuda devmem.
3-
!> \param this ...
4-
!> \param hostmem ...
5-
!> \param stream ...
3+
!> \param[in] this device memory
4+
!> \param hostmem host memory
5+
!> \param[in] stream stream
66
!> \author Ole Schuett
77
! *****************************************************************************
88
SUBROUTINE host2dev_[nametype]_1D(this, hostmem, stream)
@@ -20,9 +20,9 @@
2020

2121
! *****************************************************************************
2222
!> \brief Transfers 2D fortran-array from host to cuda devmem.
23-
!> \param this ...
24-
!> \param hostmem ...
25-
!> \param stream ...
23+
!> \param[in] this device memory
24+
!> \param hostmem host memory
25+
!> \param[in] stream stream
2626
!> \author Ole Schuett
2727
! *****************************************************************************
2828
SUBROUTINE host2dev_[nametype]_2D(this, hostmem, stream)
@@ -40,9 +40,9 @@
4040

4141
! *****************************************************************************
4242
!> \brief Transfers cuda devmem to 1D fortran-array.
43-
!> \param this ...
44-
!> \param hostmem ...
45-
!> \param stream ...
43+
!> \param[in] this device memory
44+
!> \param hostmem host memory
45+
!> \param[in] stream stream
4646
!> \author Ole Schuett
4747
! *****************************************************************************
4848
SUBROUTINE dev2host_[nametype]_1D(this, hostmem, stream)

src/acc/acc_devmem_c4.f90

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
! *****************************************************************************
22
!> \brief Transfers 1D fortran-array from host to cuda devmem.
3+
!> \param[in] this device memory
4+
!> \param hostmem host memory
5+
!> \param[in] stream stream
36
!> \author Ole Schuett
47
! *****************************************************************************
58
SUBROUTINE host2dev_c4_1D(this, hostmem, stream)
@@ -17,6 +20,9 @@ END SUBROUTINE host2dev_c4_1D
1720

1821
! *****************************************************************************
1922
!> \brief Transfers 2D fortran-array from host to cuda devmem.
23+
!> \param[in] this device memory
24+
!> \param hostmem host memory
25+
!> \param[in] stream stream
2026
!> \author Ole Schuett
2127
! *****************************************************************************
2228
SUBROUTINE host2dev_c4_2D(this, hostmem, stream)
@@ -34,6 +40,9 @@ END SUBROUTINE host2dev_c4_2D
3440

3541
! *****************************************************************************
3642
!> \brief Transfers cuda devmem to 1D fortran-array.
43+
!> \param[in] this device memory
44+
!> \param hostmem host memory
45+
!> \param[in] stream stream
3746
!> \author Ole Schuett
3847
! *****************************************************************************
3948
SUBROUTINE dev2host_c4_1D(this, hostmem, stream)

src/acc/acc_devmem_c8.f90

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
! *****************************************************************************
22
!> \brief Transfers 1D fortran-array from host to cuda devmem.
3+
!> \param[in] this device memory
4+
!> \param hostmem host memory
5+
!> \param[in] stream stream
36
!> \author Ole Schuett
47
! *****************************************************************************
58
SUBROUTINE host2dev_c8_1D(this, hostmem, stream)
@@ -17,6 +20,9 @@ END SUBROUTINE host2dev_c8_1D
1720

1821
! *****************************************************************************
1922
!> \brief Transfers 2D fortran-array from host to cuda devmem.
23+
!> \param[in] this device memory
24+
!> \param hostmem host memory
25+
!> \param[in] stream stream
2026
!> \author Ole Schuett
2127
! *****************************************************************************
2228
SUBROUTINE host2dev_c8_2D(this, hostmem, stream)
@@ -34,6 +40,9 @@ END SUBROUTINE host2dev_c8_2D
3440

3541
! *****************************************************************************
3642
!> \brief Transfers cuda devmem to 1D fortran-array.
43+
!> \param[in] this device memory
44+
!> \param hostmem host memory
45+
!> \param[in] stream stream
3746
!> \author Ole Schuett
3847
! *****************************************************************************
3948
SUBROUTINE dev2host_c8_1D(this, hostmem, stream)

src/acc/acc_devmem_i4.f90

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
! *****************************************************************************
22
!> \brief Transfers 1D fortran-array from host to cuda devmem.
3+
!> \param[in] this device memory
4+
!> \param hostmem host memory
5+
!> \param[in] stream stream
36
!> \author Ole Schuett
47
! *****************************************************************************
58
SUBROUTINE host2dev_i4_1D(this, hostmem, stream)
@@ -17,6 +20,9 @@ END SUBROUTINE host2dev_i4_1D
1720

1821
! *****************************************************************************
1922
!> \brief Transfers 2D fortran-array from host to cuda devmem.
23+
!> \param[in] this device memory
24+
!> \param hostmem host memory
25+
!> \param[in] stream stream
2026
!> \author Ole Schuett
2127
! *****************************************************************************
2228
SUBROUTINE host2dev_i4_2D(this, hostmem, stream)
@@ -34,6 +40,9 @@ END SUBROUTINE host2dev_i4_2D
3440

3541
! *****************************************************************************
3642
!> \brief Transfers cuda devmem to 1D fortran-array.
43+
!> \param[in] this device memory
44+
!> \param hostmem host memory
45+
!> \param[in] stream stream
3746
!> \author Ole Schuett
3847
! *****************************************************************************
3948
SUBROUTINE dev2host_i4_1D(this, hostmem, stream)

src/acc/acc_devmem_i8.f90

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
! *****************************************************************************
22
!> \brief Transfers 1D fortran-array from host to cuda devmem.
3+
!> \param[in] this device memory
4+
!> \param hostmem host memory
5+
!> \param[in] stream stream
36
!> \author Ole Schuett
47
! *****************************************************************************
58
SUBROUTINE host2dev_i8_1D(this, hostmem, stream)
@@ -17,6 +20,9 @@ END SUBROUTINE host2dev_i8_1D
1720

1821
! *****************************************************************************
1922
!> \brief Transfers 2D fortran-array from host to cuda devmem.
23+
!> \param[in] this device memory
24+
!> \param hostmem host memory
25+
!> \param[in] stream stream
2026
!> \author Ole Schuett
2127
! *****************************************************************************
2228
SUBROUTINE host2dev_i8_2D(this, hostmem, stream)
@@ -34,6 +40,9 @@ END SUBROUTINE host2dev_i8_2D
3440

3541
! *****************************************************************************
3642
!> \brief Transfers cuda devmem to 1D fortran-array.
43+
!> \param[in] this device memory
44+
!> \param hostmem host memory
45+
!> \param[in] stream stream
3746
!> \author Ole Schuett
3847
! *****************************************************************************
3948
SUBROUTINE dev2host_i8_1D(this, hostmem, stream)

src/acc/acc_devmem_r4.f90

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
! *****************************************************************************
22
!> \brief Transfers 1D fortran-array from host to cuda devmem.
3+
!> \param[in] this device memory
4+
!> \param hostmem host memory
5+
!> \param[in] stream stream
36
!> \author Ole Schuett
47
! *****************************************************************************
58
SUBROUTINE host2dev_r4_1D(this, hostmem, stream)
@@ -17,6 +20,9 @@ END SUBROUTINE host2dev_r4_1D
1720

1821
! *****************************************************************************
1922
!> \brief Transfers 2D fortran-array from host to cuda devmem.
23+
!> \param[in] this device memory
24+
!> \param hostmem host memory
25+
!> \param[in] stream stream
2026
!> \author Ole Schuett
2127
! *****************************************************************************
2228
SUBROUTINE host2dev_r4_2D(this, hostmem, stream)
@@ -34,6 +40,9 @@ END SUBROUTINE host2dev_r4_2D
3440

3541
! *****************************************************************************
3642
!> \brief Transfers cuda devmem to 1D fortran-array.
43+
!> \param[in] this device memory
44+
!> \param hostmem host memory
45+
!> \param[in] stream stream
3746
!> \author Ole Schuett
3847
! *****************************************************************************
3948
SUBROUTINE dev2host_r4_1D(this, hostmem, stream)

src/acc/acc_devmem_r8.f90

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
! *****************************************************************************
22
!> \brief Transfers 1D fortran-array from host to cuda devmem.
3+
!> \param[in] this device memory
4+
!> \param hostmem host memory
5+
!> \param[in] stream stream
36
!> \author Ole Schuett
47
! *****************************************************************************
58
SUBROUTINE host2dev_r8_1D(this, hostmem, stream)
@@ -17,6 +20,9 @@ END SUBROUTINE host2dev_r8_1D
1720

1821
! *****************************************************************************
1922
!> \brief Transfers 2D fortran-array from host to cuda devmem.
23+
!> \param[in] this device memory
24+
!> \param hostmem host memory
25+
!> \param[in] stream stream
2026
!> \author Ole Schuett
2127
! *****************************************************************************
2228
SUBROUTINE host2dev_r8_2D(this, hostmem, stream)
@@ -34,6 +40,9 @@ END SUBROUTINE host2dev_r8_2D
3440

3541
! *****************************************************************************
3642
!> \brief Transfers cuda devmem to 1D fortran-array.
43+
!> \param[in] this device memory
44+
!> \param hostmem host memory
45+
!> \param[in] stream stream
3746
!> \author Ole Schuett
3847
! *****************************************************************************
3948
SUBROUTINE dev2host_r8_1D(this, hostmem, stream)

0 commit comments

Comments
 (0)