Skip to content

Commit

Permalink
get rid of extra set of types
Browse files Browse the repository at this point in the history
  • Loading branch information
@fritzgoebel
fritzgoebel committed Mar 17, 2021
1 parent 0d028a1 commit 46fa5d8
Show file tree
Hide file tree
Showing 3 changed files with 77 additions and 35 deletions.
49 changes: 34 additions & 15 deletions core/preconditioner/isai.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -310,21 +310,40 @@ Isai<IsaiType, ValueType, IndexType, StorageType>::conj_transpose() const
}


#define GKO_DECLARE_LOWER_ISAI(ValueType, IndexType, StorageType) \
class Isai<isai_type::lower, ValueType, IndexType, StorageType>
GKO_INSTANTIATE_FOR_EACH_VALUE_INDEX_AND_STORAGE_TYPE(GKO_DECLARE_LOWER_ISAI);

#define GKO_DECLARE_UPPER_ISAI(ValueType, IndexType, StorageType) \
class Isai<isai_type::upper, ValueType, IndexType, StorageType>
GKO_INSTANTIATE_FOR_EACH_VALUE_INDEX_AND_STORAGE_TYPE(GKO_DECLARE_UPPER_ISAI);

#define GKO_DECLARE_GENERAL_ISAI(ValueType, IndexType, StorageType) \
class Isai<isai_type::general, ValueType, IndexType, StorageType>
GKO_INSTANTIATE_FOR_EACH_VALUE_INDEX_AND_STORAGE_TYPE(GKO_DECLARE_GENERAL_ISAI);

#define GKO_DECLARE_SPD_ISAI(ValueType, IndexType, StorageType) \
class Isai<isai_type::spd, ValueType, IndexType, StorageType>
GKO_INSTANTIATE_FOR_EACH_VALUE_INDEX_AND_STORAGE_TYPE(GKO_DECLARE_SPD_ISAI);
#define GKO_DECLARE_LOWER_ISAI1(ValueType, IndexType) \
class Isai<isai_type::lower, ValueType, IndexType, ValueType>
GKO_INSTANTIATE_FOR_EACH_VALUE_AND_INDEX_TYPE(GKO_DECLARE_LOWER_ISAI1);

#define GKO_DECLARE_UPPER_ISAI1(ValueType, IndexType) \
class Isai<isai_type::upper, ValueType, IndexType, ValueType>
GKO_INSTANTIATE_FOR_EACH_VALUE_AND_INDEX_TYPE(GKO_DECLARE_UPPER_ISAI1);

#define GKO_DECLARE_GENERAL_ISAI1(ValueType, IndexType) \
class Isai<isai_type::general, ValueType, IndexType, ValueType>
GKO_INSTANTIATE_FOR_EACH_VALUE_AND_INDEX_TYPE(GKO_DECLARE_GENERAL_ISAI1);

#define GKO_DECLARE_SPD_ISAI1(ValueType, IndexType) \
class Isai<isai_type::spd, ValueType, IndexType, ValueType>
GKO_INSTANTIATE_FOR_EACH_VALUE_AND_INDEX_TYPE(GKO_DECLARE_SPD_ISAI1);

#define GKO_DECLARE_LOWER_ISAI2(ValueType, IndexType) \
class Isai<isai_type::lower, ValueType, IndexType, \
next_precision<ValueType>>
GKO_INSTANTIATE_FOR_EACH_VALUE_AND_INDEX_TYPE(GKO_DECLARE_LOWER_ISAI2);

#define GKO_DECLARE_UPPER_ISAI2(ValueType, IndexType) \
class Isai<isai_type::upper, ValueType, IndexType, \
next_precision<ValueType>>
GKO_INSTANTIATE_FOR_EACH_VALUE_AND_INDEX_TYPE(GKO_DECLARE_UPPER_ISAI2);

#define GKO_DECLARE_GENERAL_ISAI2(ValueType, IndexType) \
class Isai<isai_type::general, ValueType, IndexType, \
next_precision<ValueType>>
GKO_INSTANTIATE_FOR_EACH_VALUE_AND_INDEX_TYPE(GKO_DECLARE_GENERAL_ISAI2);

#define GKO_DECLARE_SPD_ISAI2(ValueType, IndexType) \
class Isai<isai_type::spd, ValueType, IndexType, next_precision<ValueType>>
GKO_INSTANTIATE_FOR_EACH_VALUE_AND_INDEX_TYPE(GKO_DECLARE_SPD_ISAI2);


} // namespace preconditioner
Expand Down
19 changes: 0 additions & 19 deletions include/ginkgo/core/base/types.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -539,25 +539,6 @@ GKO_ATTRIBUTES constexpr bool operator!=(precision_reduction x,
std::complex<double>, int64)


#define GKO_INSTANTIATE_FOR_EACH_VALUE_INDEX_AND_STORAGE_TYPE(_macro) \
template _macro(float, int32, float); \
template _macro(float, int32, double); \
template _macro(double, int32, double); \
template _macro(double, int32, float); \
template _macro(std::complex<float>, int32, std::complex<float>); \
template _macro(std::complex<float>, int32, std::complex<double>); \
template _macro(std::complex<double>, int32, std::complex<double>); \
template _macro(std::complex<double>, int32, std::complex<float>); \
template _macro(float, int64, float); \
template _macro(float, int64, double); \
template _macro(double, int64, double); \
template _macro(double, int64, float); \
template _macro(std::complex<float>, int64, std::complex<float>); \
template _macro(std::complex<float>, int64, std::complex<double>); \
template _macro(std::complex<double>, int64, std::complex<double>); \
template _macro(std::complex<double>, int64, std::complex<float>)


/**
* Instantiates a template for each value type conversion pair compiled by
* Ginkgo.
Expand Down
44 changes: 43 additions & 1 deletion reference/test/preconditioner/isai_kernels.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,12 @@ class Isai : public ::testing::Test {
using GeneralIsai =
gko::preconditioner::GeneralIsai<value_type, index_type>;
using SpdIsai = gko::preconditioner::SpdIsai<value_type, index_type>;
using GeneralIsai2 =
gko::preconditioner::GeneralIsai<value_type, index_type,
gko::next_precision<value_type>>;
using SpdIsai2 =
gko::preconditioner::SpdIsai<value_type, index_type,
gko::next_precision<value_type>>;
using Mtx = gko::matrix::Csr<value_type, index_type>;
using Dense = gko::matrix::Dense<value_type>;
using Csr = gko::matrix::Csr<value_type, index_type>;
Expand Down Expand Up @@ -201,6 +207,8 @@ class Isai : public ::testing::Test {
upper_isai_factory = UpperIsai::build().on(exec);
general_isai_factory = GeneralIsai::build().on(exec);
spd_isai_factory = SpdIsai::build().on(exec);
general_isai_factory2 = GeneralIsai2::build().on(exec);
spd_isai_factory2 = SpdIsai2::build().on(exec);
a_dense->convert_to(lend(a_csr));
a_dense_inv->convert_to(lend(a_csr_inv));
l_dense->convert_to(lend(l_csr));
Expand Down Expand Up @@ -268,6 +276,8 @@ class Isai : public ::testing::Test {
std::unique_ptr<typename UpperIsai::Factory> upper_isai_factory;
std::unique_ptr<typename GeneralIsai::Factory> general_isai_factory;
std::unique_ptr<typename SpdIsai::Factory> spd_isai_factory;
std::unique_ptr<typename GeneralIsai2::Factory> general_isai_factory2;
std::unique_ptr<typename SpdIsai2::Factory> spd_isai_factory2;
std::shared_ptr<Dense> a_dense;
std::shared_ptr<Dense> a_dense_inv;
std::shared_ptr<Dense> l_dense;
Expand Down Expand Up @@ -323,7 +333,7 @@ class Isai : public ::testing::Test {
std::shared_ptr<Csr> spd_sparse_inv;
};

TYPED_TEST_SUITE(Isai, gko::test::RealValueIndexTypes);
TYPED_TEST_SUITE(Isai, gko::test::ValueIndexTypes);


TYPED_TEST(Isai, KernelGenerateA)
Expand Down Expand Up @@ -1009,6 +1019,18 @@ TYPED_TEST(Isai, ReturnsCorrectInverseA)
}


TYPED_TEST(Isai, ReturnsCorrectInverseAMixed)
{
using value_type = typename TestFixture::value_type;
const auto isai = this->general_isai_factory2->generate(this->a_sparse);

auto l_inv = isai->get_approximate_inverse();

GKO_ASSERT_MTX_EQ_SPARSITY(l_inv, this->a_sparse_inv);
GKO_ASSERT_MTX_NEAR(l_inv, this->a_sparse_inv, r<value_type>::value);
}


TYPED_TEST(Isai, ReturnsCorrectInverseALongrow)
{
using value_type = typename TestFixture::value_type;
Expand Down Expand Up @@ -1226,6 +1248,26 @@ TYPED_TEST(Isai, ReturnsCorrectInverseSpd)
}


TYPED_TEST(Isai, ReturnsCorrectInverseSpdMixed)
{
using Csr = typename TestFixture::Csr;
using value_type = typename TestFixture::value_type;
const auto isai = this->spd_isai_factory2->generate(this->spd_sparse);
const auto expected_transpose =
gko::as<Csr>(this->spd_sparse_inv->transpose());

// In the spd case, the approximate inverse is a composition of L^T and L.
const auto composition = isai->get_approximate_inverse()->get_operators();
const auto lower_t = gko::as<Csr>(composition[0]);
const auto lower = gko::as<Csr>(composition[1]);

GKO_ASSERT_MTX_EQ_SPARSITY(lower, this->spd_sparse_inv);
GKO_ASSERT_MTX_EQ_SPARSITY(lower_t, expected_transpose);
GKO_ASSERT_MTX_NEAR(lower, this->spd_sparse_inv, r<value_type>::value);
GKO_ASSERT_MTX_NEAR(lower_t, expected_transpose, r<value_type>::value);
}


TYPED_TEST(Isai, ReturnsCorrectInverseSpdLongrow)
{
using Csr = typename TestFixture::Csr;
Expand Down

0 comments on commit 46fa5d8

Please sign in to comment.