Skip to content

Commit

Permalink
Adapt tests for the hypothetical case when eckit::linalg::Index would…
Browse files Browse the repository at this point in the history 
… become an unsigned integer
  • Loading branch information
@wdeconinck
wdeconinck committed Dec 9, 2024
1 parent 392c074 commit bd9ab9a
Show file tree
Hide file tree
Showing 4 changed files with 70 additions and 34 deletions.
2 changes: 1 addition & 1 deletion src/tests/interpolation/test_interpolation_finite_element_cached.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ CASE("extract cache, copy it, and pass non-owning pointer") {

const auto& matrix_storage = get_or_create_cache(grid_source, grid_target).matrix();
atlas::linalg::SparseMatrixStorage matrix_storage_copy(matrix_storage);
auto matrix = atlas::linalg::make_host_view<double,int>(matrix_storage_copy);
auto matrix = atlas::linalg::make_host_view<eckit::linalg::Scalar,eckit::linalg::Index>(matrix_storage_copy);

EXPECT(not matrix.empty());

Expand Down
2 changes: 1 addition & 1 deletion src/tests/interpolation/test_interpolation_k_nearest_neighbours.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class Access {

std::string hash() {
eckit::MD5 hash;
const auto m = atlas::linalg::make_host_view<double,int>(matrix());
const auto m = atlas::linalg::make_host_view<eckit::linalg::Scalar,eckit::linalg::Index>(matrix());
const auto outer = m.outer();
const auto index = m.inner();
const auto weight = m.value();
Expand Down
44 changes: 31 additions & 13 deletions src/tests/linalg/test_linalg_sparse_matrix.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ void do_matrix_multiply(const atlas::linalg::SparseMatrixView<MatrixValue,IndexT
}

#if ATLAS_HAVE_EIGEN
template <typename Value, typename Index = eckit::linalg::Index>
template <typename Value, typename Index = std::make_signed_t<eckit::linalg::Index>>
Eigen::SparseMatrix<Value, Eigen::RowMajor, Index> create_eigen_sparsematrix() {
Eigen::SparseMatrix<Value, Eigen::RowMajor, Index> matrix(3,3);
std::vector<Eigen::Triplet<Value>> triplets;
Expand Down Expand Up @@ -71,11 +71,11 @@ void check_array(const array::Array& array, const std::vector<Value>& expected)
}


template<typename Value>
template<typename Value, typename Index>
void check_matrix(const SparseMatrixStorage& m) {
std::vector<Value> expected_value{2., -3., 2., 2.};
std::vector<eckit::linalg::Index> expected_outer{0, 2, 3, 4};
std::vector<eckit::linalg::Index> expected_inner{0, 2, 1, 2};
std::vector<Value> expected_value{2., -3., 2., 2.};
std::vector<Index> expected_outer{0, 2, 3, 4};
std::vector<Index> expected_inner{0, 2, 1, 2};

EXPECT_EQ(m.rows(), 3);
EXPECT_EQ(m.cols(), 3);
Expand All @@ -85,11 +85,11 @@ void check_matrix(const SparseMatrixStorage& m) {
check_array(m.outer(),expected_outer);
check_array(m.inner(),expected_inner);

auto host_matrix_view = linalg::make_host_view<Value>(m);
auto host_matrix_view = linalg::make_host_view<Value,Index>(m);

std::vector<eckit::linalg::Index> host_outer(host_matrix_view.outer_size());
std::vector<eckit::linalg::Index> host_inner(host_matrix_view.inner_size());
std::vector<Value> host_value(host_matrix_view.value_size());
std::vector<Index> host_outer(host_matrix_view.outer_size());
std::vector<Index> host_inner(host_matrix_view.inner_size());
std::vector<Value> host_value(host_matrix_view.value_size());

array::ArrayT<Value> x(m.cols());
array::ArrayT<Value> y(m.rows());
Expand All @@ -103,11 +103,29 @@ void check_matrix(const SparseMatrixStorage& m) {
}

void check_matrix(const SparseMatrixStorage& m) {
if (m.value().datatype() == atlas::make_datatype<double>()) {
check_matrix<double>(m);
if (m.value().datatype() == atlas::make_datatype<double>() && m.outer().datatype() == atlas::make_datatype<int>()) {
check_matrix<double, int>(m);
}
else if (m.value().datatype() == atlas::make_datatype<double>() && m.outer().datatype() == atlas::make_datatype<unsigned int>()) {
check_matrix<double, unsigned int>(m);
}
else if (m.value().datatype() == atlas::make_datatype<double>() && m.outer().datatype() == atlas::make_datatype<long>()) {
check_matrix<double, long>(m);
}
else if (m.value().datatype() == atlas::make_datatype<double>() && m.outer().datatype() == atlas::make_datatype<unsigned long>()) {
check_matrix<double, unsigned long>(m);
}
else if (m.value().datatype() == atlas::make_datatype<float>() && m.outer().datatype() == atlas::make_datatype<int>()) {
check_matrix<float, int>(m);
}
else if (m.value().datatype() == atlas::make_datatype<float>() && m.outer().datatype() == atlas::make_datatype<unsigned int>()) {
check_matrix<float, unsigned int>(m);
}
else if (m.value().datatype() == atlas::make_datatype<float>() && m.outer().datatype() == atlas::make_datatype<long>()) {
check_matrix<float, long>(m);
}
else if (m.value().datatype() == atlas::make_datatype<float>()) {
check_matrix<float>(m);
else if (m.value().datatype() == atlas::make_datatype<float>() && m.outer().datatype() == atlas::make_datatype<unsigned long>()) {
check_matrix<float, unsigned long>(m);
}
else {
ATLAS_NOTIMPLEMENTED;
Expand Down
56 changes: 37 additions & 19 deletions src/tests/linalg/test_linalg_sparse_matrix_gpu.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@ void do_hicsparse_matrix_multiply(const atlas::linalg::SparseMatrixView<MatrixVa
ATLAS_NOTIMPLEMENTED;
};
auto get_hic_index_type = [](const auto& dummy) -> hicsparseIndexType_t {
if (std::is_same_v<std::decay_t<decltype(dummy)>,int> ) {
if (std::is_same_v<std::make_signed_t<std::decay_t<decltype(dummy)>>,int> ) {
return HICSPARSE_INDEX_32I;
}
else if (std::is_same_v<std::decay_t<decltype(dummy)>,long> ) {
else if (std::is_same_v<std::make_signed_t<std::decay_t<decltype(dummy)>>,long> ) {
return HICSPARSE_INDEX_64I;
}
ATLAS_NOTIMPLEMENTED;
Expand Down Expand Up @@ -129,7 +129,7 @@ void do_hicsparse_matrix_multiply(const atlas::linalg::SparseMatrixView<MatrixVa
}

#if ATLAS_HAVE_EIGEN
template <typename Value, typename Index = eckit::linalg::Index>
template <typename Value, typename Index = std::make_signed_t<eckit::linalg::Index>>
Eigen::SparseMatrix<Value, Eigen::RowMajor, Index> create_eigen_sparsematrix() {
Eigen::SparseMatrix<Value, Eigen::RowMajor, Index> matrix(3,3);
std::vector<Eigen::Triplet<Value>> triplets;
Expand Down Expand Up @@ -162,11 +162,11 @@ void check_array(const array::Array& array, const std::vector<Value>& expected)
}


template<typename Value>
template<typename Value, typename Index>
void check_matrix(const SparseMatrixStorage& m) {
std::vector<Value> expected_value{2., -3., 2., 2.};
std::vector<eckit::linalg::Index> expected_outer{0, 2, 3, 4};
std::vector<eckit::linalg::Index> expected_inner{0, 2, 1, 2};
std::vector<Value> expected_value{2., -3., 2., 2.};
std::vector<Index> expected_outer{0, 2, 3, 4};
std::vector<Index> expected_inner{0, 2, 1, 2};

EXPECT_EQ(m.rows(), 3);
EXPECT_EQ(m.cols(), 3);
Expand All @@ -177,16 +177,16 @@ void check_matrix(const SparseMatrixStorage& m) {
check_array(m.inner(),expected_inner);

m.updateDevice();
auto host_matrix_view = make_host_view<Value>(m);
auto device_matrix_view = make_device_view<Value>(m);
auto host_matrix_view = make_host_view<Value,Index>(m);
auto device_matrix_view = make_device_view<Value,Index>(m);

std::vector<eckit::linalg::Index> host_outer(host_matrix_view.outer_size());
std::vector<eckit::linalg::Index> host_inner(host_matrix_view.inner_size());
std::vector<Value> host_value(host_matrix_view.value_size());
std::vector<Index> host_outer(host_matrix_view.outer_size());
std::vector<Index> host_inner(host_matrix_view.inner_size());
std::vector<Value> host_value(host_matrix_view.value_size());

hicMemcpy(host_outer.data(), device_matrix_view.outer(), device_matrix_view.outer_size() * sizeof(eckit::linalg::Index), hicMemcpyDeviceToHost);
hicMemcpy(host_inner.data(), device_matrix_view.inner(), device_matrix_view.inner_size() * sizeof(eckit::linalg::Index), hicMemcpyDeviceToHost);
hicMemcpy(host_value.data(), device_matrix_view.value(), device_matrix_view.value_size() * sizeof(Value), hicMemcpyDeviceToHost);
hicMemcpy(host_outer.data(), device_matrix_view.outer(), device_matrix_view.outer_size() * sizeof(Index), hicMemcpyDeviceToHost);
hicMemcpy(host_inner.data(), device_matrix_view.inner(), device_matrix_view.inner_size() * sizeof(Index), hicMemcpyDeviceToHost);
hicMemcpy(host_value.data(), device_matrix_view.value(), device_matrix_view.value_size() * sizeof(Value), hicMemcpyDeviceToHost);

EXPECT(host_outer == expected_outer);
EXPECT(host_inner == expected_inner);
Expand All @@ -209,11 +209,29 @@ void check_matrix(const SparseMatrixStorage& m) {
}

void check_matrix(const SparseMatrixStorage& m) {
if (m.value().datatype() == atlas::make_datatype<double>()) {
check_matrix<double>(m);
if (m.value().datatype() == atlas::make_datatype<double>() && m.outer().datatype() == atlas::make_datatype<int>()) {
check_matrix<double, int>(m);
}
else if (m.value().datatype() == atlas::make_datatype<double>() && m.outer().datatype() == atlas::make_datatype<unsigned int>()) {
check_matrix<double, unsigned int>(m);
}
else if (m.value().datatype() == atlas::make_datatype<double>() && m.outer().datatype() == atlas::make_datatype<long>()) {
check_matrix<double, long>(m);
}
else if (m.value().datatype() == atlas::make_datatype<double>() && m.outer().datatype() == atlas::make_datatype<unsigned long>()) {
check_matrix<double, unsigned long>(m);
}
else if (m.value().datatype() == atlas::make_datatype<float>() && m.outer().datatype() == atlas::make_datatype<int>()) {
check_matrix<float, int>(m);
}
else if (m.value().datatype() == atlas::make_datatype<float>() && m.outer().datatype() == atlas::make_datatype<unsigned int>()) {
check_matrix<float, unsigned int>(m);
}
else if (m.value().datatype() == atlas::make_datatype<float>() && m.outer().datatype() == atlas::make_datatype<long>()) {
check_matrix<float, long>(m);
}
else if (m.value().datatype() == atlas::make_datatype<float>()) {
check_matrix<float>(m);
else if (m.value().datatype() == atlas::make_datatype<float>() && m.outer().datatype() == atlas::make_datatype<unsigned long>()) {
check_matrix<float, unsigned long>(m);
}
else {
ATLAS_NOTIMPLEMENTED;
Expand Down

0 comments on commit bd9ab9a

Please sign in to comment.