Skip to content

Commit

Permalink
Revert to not compiling Conv2D model test when AVX enabled
Browse files Browse the repository at this point in the history
  • Loading branch information
davidtrevelyan committed Nov 27, 2023
1 parent 0334d72 commit 1fb6bf1
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions tests/functional/conv2d_model_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,6 @@ auto loadTemplatedModel()
return modelT;
}



template <typename ModelType>
void testModelOutputMatchesPythonImplementation(
ModelType& model,
Expand Down Expand Up @@ -153,22 +151,22 @@ TEST(TestConv2D, nonTemplatedModelOutputMatchesPythonImplementation)
{
#if RTNEURAL_AVX_ENABLED
GTEST_SKIP() << "SKIPPING CONV2D MODEL TEST w/ AVX ENABLED...";
#endif

#else
auto non_templated_model = loadNonTemplatedModel();
ASSERT_THAT(non_templated_model, testing::Ne(nullptr));
testModelOutputMatchesPythonImplementation(
*non_templated_model,
computeReceptiveField(*non_templated_model),
computeTotalPaddedLeftFramesTensorflow(*non_templated_model),
non_templated_model->getOutSize());
#endif
}

TEST(TestConv2D, templatedModelOutputMatchesPythonImplementation)
{
#if RTNEURAL_AVX_ENABLED
GTEST_SKIP() << "SKIPPING CONV2D MODEL TEST w/ AVX ENABLED...";
#endif
#else
auto non_templated_model = loadNonTemplatedModel();
ASSERT_THAT(non_templated_model, testing::Ne(nullptr));

Expand All @@ -178,4 +176,5 @@ TEST(TestConv2D, templatedModelOutputMatchesPythonImplementation)
computeReceptiveField(*non_templated_model),
computeTotalPaddedLeftFramesTensorflow(*non_templated_model),
non_templated_model->getOutSize());
#endif
}

0 comments on commit 1fb6bf1

Please sign in to comment.