Skip to content

Refactor Ger and Gemv #735

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

Merged
mahmoodw merged 15 commits into from
Oct 7, 2019
Merged

Refactor Ger and Gemv #735

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
3200b87
unified gemv template
mahmoodw Oct 2, 2019
a272106
format and fix scal batched bandwidth
mahmoodw Oct 3, 2019
8a361a2
Updating stride types in Doc
mahmoodw Oct 3, 2019
8014f6e
unify gemv yaml files
mahmoodw Oct 3, 2019
11e61ae
zero strides for ger
mahmoodw Oct 3, 2019
602633d
ger - using helper to get alpha
mahmoodw Oct 3, 2019
8949fa6
rename kernel, doc update, reduce duplication
mahmoodw Oct 4, 2019
6ad2b70
Merge branch 'develop' of https://github.com/ROCmSoftwarePlatform/roc…
mahmoodw Oct 4, 2019
b3f654b
add missing file, clean up
mahmoodw Oct 4, 2019
8613a22
fix
mahmoodw Oct 4, 2019
caaf634
update gemv calls in trsv
mahmoodw Oct 4, 2019
5797bda
template fix
mahmoodw Oct 4, 2019
2fcdb0c
Merge branch 'develop' of https://github.com/ROCmSoftwarePlatform/roc…
mahmoodw Oct 4, 2019
102e9d9
another fix
mahmoodw Oct 4, 2019
e595eee
naming
mahmoodw Oct 7, 2019
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
22 changes: 15 additions & 7 deletions clients/common/rocblas_gentest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,13 +207,21 @@ def setdefaults(test):
test.setdefault('stride_y', int(test['N'] * abs(test['incy']) *
test['stride_scale']))

if test['function'] in ('ger_strided_batched'):
if all([x in test for x in ('M', 'incx', 'stride_scale')]):
test.setdefault('stride_x', int(test['M'] * abs(test['incx']) *
test['stride_scale']))
if all([x in test for x in ('N', 'incy', 'stride_scale')]):
test.setdefault('stride_y', int(test['N'] * abs(test['incy']) *
test['stride_scale']))
if test['function'] in ('gemv_strided_batched', 'ger_strided_batched'):
if test['function'] in ('ger_strided_batched') or test['transA'] in ('T', 'C'):
if all([x in test for x in ('M', 'incx', 'stride_scale')]):
test.setdefault('stride_x', int(test['M'] * abs(test['incx']) *
test['stride_scale']))
if all([x in test for x in ('N', 'incy', 'stride_scale')]):
test.setdefault('stride_y', int(test['N'] * abs(test['incy']) *
test['stride_scale']))
else:
if all([x in test for x in ('N', 'incx', 'stride_scale')]):
test.setdefault('stride_x', int(test['N'] * abs(test['incx']) *
test['stride_scale']))
if all([x in test for x in ('M', 'incy', 'stride_scale')]):
test.setdefault('stride_y', int(test['M'] * abs(test['incy']) *
test['stride_scale']))

Comment thread
mahmoodw marked this conversation as resolved.
test.setdefault('stride_x', 0)
test.setdefault('stride_y', 0)
Expand Down
2 changes: 1 addition & 1 deletion clients/gtest/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ endif( )
set( ROCBLAS_TEST_DATA "${PROJECT_BINARY_DIR}/staging/rocblas_gtest.data")
add_custom_command( OUTPUT "${ROCBLAS_TEST_DATA}"
COMMAND ../common/rocblas_gentest.py -I ../include rocblas_gtest.yaml -o "${ROCBLAS_TEST_DATA}"
DEPENDS ../common/rocblas_gentest.py rocblas_gtest.yaml ../include/rocblas_common.yaml known_bugs.yaml blas1_gtest.yaml gemm_gtest.yaml gemm_batched_gtest.yaml gemm_strided_batched_gtest.yaml gemv_gtest.yaml gemv_batched_gtest.yaml gemv_strided_batched_gtest.yaml symv_gtest.yaml syr_gtest.yaml ger_gtest.yaml trsm_gtest.yaml trtri_gtest.yaml geam_gtest.yaml set_get_vector_gtest.yaml set_get_matrix_gtest.yaml trsv_gtest.yaml logging_mode_gtest.yaml set_get_pointer_mode_gtest.yaml
DEPENDS ../common/rocblas_gentest.py rocblas_gtest.yaml ../include/rocblas_common.yaml known_bugs.yaml blas1_gtest.yaml gemm_gtest.yaml gemm_batched_gtest.yaml gemm_strided_batched_gtest.yaml gemv_gtest.yaml symv_gtest.yaml syr_gtest.yaml ger_gtest.yaml trsm_gtest.yaml trtri_gtest.yaml geam_gtest.yaml set_get_vector_gtest.yaml set_get_matrix_gtest.yaml trsv_gtest.yaml logging_mode_gtest.yaml set_get_pointer_mode_gtest.yaml
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" )
add_custom_target( rocblas-test-data
DEPENDS "${ROCBLAS_TEST_DATA}" )
Expand Down
91 changes: 0 additions & 91 deletions clients/gtest/gemv_batched_gtest.yaml
View file
Open in desktop

This file was deleted.

142 changes: 118 additions & 24 deletions clients/gtest/gemv_gtest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,36 +4,36 @@ include: known_bugs.yaml

Definitions:
- &small_matrix_size_range
- { M: -1, N: 1, lda: 1 }
- { M: 1, N: -1, lda: 1 }
- { M: 1, N: 1, lda: 0 }
- { M: 10, N: 10, lda: 9 }
- { M: 0, N: 1, lda: 1 }
- { M: 1, N: 0, lda: 1 }
- { M: -1, N: -1, lda: -1 }
- { M: 10, N: 10, lda: 2 }
- { M: 100, N: 200, lda: 200 }
- { M: -1, N: 1, lda: 1, stride_a: 1 }
- { M: 1, N: -1, lda: 1, stride_a: 1 }
- { M: 1, N: 1, lda: 0, stride_a: 1 }
- { M: 10, N: 10, lda: 9, stride_a: 1 }
- { M: 0, N: 1, lda: 1, stride_a: 1 }
- { M: 1, N: 0, lda: 1, stride_a: 1 }
- { M: -1, N: -1, lda: -1, stride_a: 1 }
- { M: 10, N: 10, lda: 2, stride_a: 1 }
- { M: 100, N: 200, lda: 200, stride_a: 40000 }

- &medium_matrix_size_range
- { M: 300, N: 400, lda: 400 }
- { M: 600, N: 500, lda: 601 }
- { M: 300, N: 400, lda: 400, stride_a: 160000 }
- { M: 600, N: 500, lda: 601, stride_a: 301000 }

- &large_matrix_size_range
- { M: 1000, N: 1000, lda: 1000 }
- { M: 2000, N: 2000, lda: 2000 }
- { M: 4011, N: 4011, lda: 4011 }
- { M: 8000, N: 8000, lda: 8000 }
- { M: 1000, N: 1000, lda: 1000, stride_a: 1000000 }
- { M: 2000, N: 2000, lda: 2000, stride_a: 4000000 }
- { M: 4011, N: 4011, lda: 4011, stride_a: 16088200 }
- { M: 8000, N: 8000, lda: 8000, stride_a: 64000000 }

- &incx_incy_range
- { incx: 2, incy: 1 }
- { incx: -1, incy: 2 }
- { incx: 1, incy: 1 }
- { incx: -1, incy: 3 }
- { incx: 3, incy: -1 }
- { incx: 0, incy: 1 }
- { incx: 1, incy: 0 }
- { incx: 0, incy: -1 }
- { incx: 10, incy: 100 }
- { incx: 2, incy: 1, stride_scale: 1 }
- { incx: -1, incy: 2, stride_scale: 1 }
- { incx: 1, incy: 1, stride_scale: 1 }
- { incx: -1, incy: 3, stride_scale: 1.5 }
- { incx: 3, incy: -1, stride_scale: 1 }
- { incx: 0, incy: 1, stride_scale: 1 }
- { incx: 1, incy: 0, stride_scale: 1 }
- { incx: 0, incy: -1, stride_scale: 2 }
- { incx: 10, incy: 100, stride_scale: 1 }

- &alpha_beta_range
- { alpha: 2.0, beta: 0.0, alphai: 1.5, betai: 0.5 }
Expand Down Expand Up @@ -84,4 +84,98 @@ Tests:
matrix_size: *large_matrix_size_range
incx_incy: *incx_incy_range
alpha_beta: *alpha_beta_range

- name: gemv_batched_bad_arg
category: pre_checkin
function: gemv_batched_bad_arg
precision: *single_double_precisions
transA: N

- name: gemv_batched_NaN
category: pre_checkin
function: gemv_batched
precision: *single_double_precisions
transA: [ N, T, C ]
matrix_size: *medium_matrix_size_range
incx_incy: *incx_incy_range
alpha: [ -1.0, 0, 1.0, 2.0 ]
beta: .NaN # converted to 0.0 in test code
batch_count: [ -1, 0, 1, 3 ]

- name: gemv_batched_small
category: quick
function: gemv_batched
precision: *single_double_precisions
transA: [ N, T, C ]
matrix_size: *small_matrix_size_range
incx_incy: *incx_incy_range
alpha_beta: *alpha_beta_range
batch_count: [ -1, 0, 1, 3 ]

- name: gemv_batched_medium
category: pre_checkin
function: gemv_batched
precision: *single_double_precisions_complex_real
transA: [ N, T, C ]
matrix_size: *medium_matrix_size_range
incx_incy: *incx_incy_range
alpha_beta: *alpha_beta_range
batch_count: [ 3 ]

- name: gemv_batched_large
category: nightly
function: gemv_batched
precision: *single_double_precisions
transA: [ N, T, C ]
matrix_size: *large_matrix_size_range
incx_incy: *incx_incy_range
alpha_beta: *alpha_beta_range
batch_count: [ 3 ]

- name: gemv_strided_batched_bad_arg
category: pre_checkin
function: gemv_strided_batched_bad_arg
precision: *single_double_precisions
transA: N

- name: gemv_strided_batched_NaN
category: pre_checkin
function: gemv_strided_batched
precision: *single_double_precisions
transA: [ N, T, C ]
matrix_size: *medium_matrix_size_range
incx_incy: *incx_incy_range
alpha: [ -1.0, 0, 1.0, 2.0 ]
beta: .NaN # converted to 0.0 in test code
batch_count: [ -1, 0, 1, 3 ]

- name: gemv_strided_batched_small
category: quick
function: gemv_strided_batched
precision: *single_double_precisions
transA: [ N, T, C ]
matrix_size: *small_matrix_size_range
incx_incy: *incx_incy_range
alpha_beta: *alpha_beta_range
batch_count: [ -1, 0, 1, 3 ]

- name: gemv_strided_batched_medium
category: pre_checkin
function: gemv_strided_batched
precision: *single_double_precisions_complex_real
transA: [ N, T, C ]
matrix_size: *medium_matrix_size_range
incx_incy: *incx_incy_range
alpha_beta: *alpha_beta_range
batch_count: [ 3 ]

- name: gemv_strided_batched_large
category: nightly
function: gemv_strided_batched
precision: *single_double_precisions
transA: [ N, T, C ]
matrix_size: *large_matrix_size_range
incx_incy: *incx_incy_range
alpha_beta: *alpha_beta_range
batch_count: [ 3 ]
...
91 changes: 0 additions & 91 deletions clients/gtest/gemv_strided_batched_gtest.yaml
View file
Open in desktop

This file was deleted.

Loading