Fix some ref/map/block non-trivial interactions.
This commit is contained in:
parent
f285251a52
commit
399f17af57
7 changed files with 127 additions and 22 deletions
83
test/integration/outer_stride.cpp
Normal file
83
test/integration/outer_stride.cpp
Normal file
|
|
@ -0,0 +1,83 @@
|
|||
//==================================================================================================
|
||||
/*
|
||||
ROTGEN - Runtime Overlay for Eigen
|
||||
Copyright : CODE RECKONS
|
||||
SPDX-License-Identifier: BSL-1.0
|
||||
*/
|
||||
//==================================================================================================
|
||||
#include "unit/tests.hpp"
|
||||
#include <rotgen/rotgen.hpp>
|
||||
#include <iostream>
|
||||
|
||||
TTS_CASE_TPL("outer_stride<0> interactions", rotgen::tests::types)
|
||||
<typename T, typename O>( tts::type< tts::types<T,O>> )
|
||||
{
|
||||
using mat_t = rotgen::matrix<T, rotgen::Dynamic, rotgen::Dynamic, O::value>;
|
||||
|
||||
T contiguous[] = {1,2,3, 4,5,6, 7,8,9, 10,11,12};
|
||||
rotgen::map<mat_t, 0, rotgen::outer_stride<0>> m(&contiguous[0], 4, 3);
|
||||
|
||||
TTS_EQUAL(m.innerStride(), 1);
|
||||
TTS_EQUAL(m.outerStride(), O::value == rotgen::ColMajor ? 4 : 3);
|
||||
|
||||
if constexpr(O::value == rotgen::ColMajor)
|
||||
{
|
||||
T padded[] = {1,2,3,4, 99, 5,6,7,8, 99,9,10,11,12};
|
||||
rotgen::map<mat_t, 0, rotgen::outer_stride<5>> sp(&padded[0], 4, 3);
|
||||
TTS_EQUAL(sp.innerStride(), 1);
|
||||
TTS_EQUAL(sp.outerStride(), 5);
|
||||
|
||||
rotgen::map<mat_t, 0, rotgen::outer_stride<>> dp(&padded[0], 4, 3,rotgen::outer_stride(5));
|
||||
TTS_EQUAL(dp.innerStride(), 1);
|
||||
TTS_EQUAL(dp.outerStride(), 5);
|
||||
|
||||
TTS_EQUAL(m , sp);
|
||||
TTS_EQUAL(m , dp);
|
||||
TTS_EQUAL(dp, sp);
|
||||
}
|
||||
else
|
||||
{
|
||||
T padded[] = {1,2,3, 99, 4,5,6, 99, 7,8,9, 99, 10,11,12};
|
||||
rotgen::map<mat_t, 0, rotgen::outer_stride<4>> sp(&padded[0], 4, 3);
|
||||
TTS_EQUAL(sp.innerStride(), 1);
|
||||
TTS_EQUAL(sp.outerStride(), 4);
|
||||
|
||||
rotgen::map<mat_t, 0, rotgen::outer_stride<>> dp(&padded[0], 4, 3,rotgen::outer_stride(4));
|
||||
TTS_EQUAL(dp.innerStride(), 1);
|
||||
TTS_EQUAL(dp.outerStride(), 4);
|
||||
|
||||
TTS_EQUAL(m , sp);
|
||||
TTS_EQUAL(m , dp);
|
||||
TTS_EQUAL(dp, sp);
|
||||
}
|
||||
};
|
||||
|
||||
void process_ref(rotgen::ref<const rotgen::matrix<float>> ) {}
|
||||
void process_ref(rotgen::ref<const rotgen::matrix<double>>) {}
|
||||
void process_ref(rotgen::ref<const rotgen::matrix<float , rotgen::Dynamic, rotgen::Dynamic, rotgen::RowMajor>>) {}
|
||||
void process_ref(rotgen::ref<const rotgen::matrix<double, rotgen::Dynamic, rotgen::Dynamic, rotgen::RowMajor>>) {}
|
||||
|
||||
TTS_CASE_TPL("Extraction of outer_stride<?> blocks", rotgen::tests::types)
|
||||
<typename T, typename O>( tts::type< tts::types<T,O>> )
|
||||
{
|
||||
using mat_t = rotgen::matrix<T, rotgen::Dynamic, rotgen::Dynamic, O::value>;
|
||||
|
||||
if constexpr(O::value == rotgen::ColMajor)
|
||||
{
|
||||
T padded[] = {1,2,3,4, 99, 5,6,7,8, 99,9,10,11,12};
|
||||
rotgen::map<mat_t, 0, rotgen::outer_stride<5>> sp(&padded[0], 4, 3);
|
||||
rotgen::map<mat_t, 0, rotgen::outer_stride<>> dp(&padded[0], 4, 3,rotgen::outer_stride(5));
|
||||
|
||||
TTS_EXPECT_COMPILES(sp, { process_ref(extract(sp,0, 0, 3, 2)); } );
|
||||
TTS_EXPECT_COMPILES(dp, { process_ref(extract(dp,0, 0, 3, 2)); } );
|
||||
}
|
||||
else
|
||||
{
|
||||
T padded[] = {1,2,3, 99, 4,5,6, 99, 7,8,9, 99, 10,11,12};
|
||||
rotgen::map<mat_t, 0, rotgen::outer_stride<4>> sp(&padded[0], 4, 3);
|
||||
rotgen::map<mat_t, 0, rotgen::outer_stride<>> dp(&padded[0], 4, 3,rotgen::outer_stride(4));
|
||||
|
||||
TTS_EXPECT_COMPILES(sp, { process_ref(extract(sp,0, 0, 3, 2)); } );
|
||||
TTS_EXPECT_COMPILES(dp, { process_ref(extract(dp,0, 0, 3, 2)); } );
|
||||
}
|
||||
};
|
||||
Loading…
Add table
Add a link
Reference in a new issue