Skip to content

Commit

Permalink
Test updates following 23291 and 23283 (chapel-lang#23348)
Browse files Browse the repository at this point in the history
Follow-up to PRs chapel-lang#23291 and chapel-lang#23283. This PR just updates some testing
files that don't run in all configurations to remove warnings introduced
in those PRs.

Test change only - not reviewed.
  • Loading branch information
mppf authored Sep 13, 2023
2 parents 3c1cbb5 + bb124f2 commit c248d4c
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion test/gpu/interop/cuBLAS/cuBLAS.chpl
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ module cuBLAS {
return gpu_ptr;
}

proc gpu_to_cpu(dst_ptr: c_ptr(void), src_ptr: DevicePtr, size: c_size_t){
proc gpu_to_cpu(dst_ptr: c_ptr(void), src_ptr: DevicePtr(?), size: c_size_t){
require "c_cublas.h", "c_cublas.o";
to_cpu(dst_ptr, src_ptr.val, size);
}
Expand Down
14 changes: 7 additions & 7 deletions test/library/packages/LAPACK/TestHelpers.chpl
Original file line number Diff line number Diff line change
Expand Up @@ -75,20 +75,20 @@ module TestHelpers {
this.matrix_domain = {1..#rows,1..#columns};
this.epsilon = error;

this.complete();
init this;
this.populateFromArray( input_array, input_row_order );

}

proc init( matrix: borrowed LAPACK_Matrix, type data_type = matrix.data_type ){
proc init( matrix: borrowed LAPACK_Matrix(?), type data_type = matrix.data_type ){
this.data_type = data_type;
this.row_major = matrix.row_major;
this.rows = matrix.rows;
this.columns = matrix.columns;
this.data_domain = matrix.data_domain;
this.matrix_domain = matrix.matrix_domain;

this.complete();
init this;

for idx in data_domain do this.data[idx] = matrix.data[idx];
this.epsilon = matrix.epsilon;
Expand Down Expand Up @@ -190,8 +190,8 @@ module TestHelpers {
}

// Not using type queries to work around issue #13721
operator LAPACK_Matrix.*(A: borrowed LAPACK_Matrix,
B: borrowed LAPACK_Matrix): owned LAPACK_Matrix(A.data_type) {
operator LAPACK_Matrix.*(A: borrowed LAPACK_Matrix(?),
B: borrowed LAPACK_Matrix(?)): owned LAPACK_Matrix(A.data_type) {
if A.data_type != B.data_type then
compilerError("data_type mismatch in *");

Expand All @@ -212,8 +212,8 @@ module TestHelpers {
return retmatrix;
}

operator LAPACK_Matrix.==(A: borrowed LAPACK_Matrix,
B: borrowed LAPACK_Matrix ): bool {
operator LAPACK_Matrix.==(A: borrowed LAPACK_Matrix(?),
B: borrowed LAPACK_Matrix(?) ): bool {
if A.data_type != B.data_type then
compilerError("data_type mismatch in ==");

Expand Down

0 comments on commit c248d4c

Please sign in to comment.