tests: create typed tests for vision models concurrent generates

Author: NorbertKlockiewicz

packages/react-native-executorch/common/rnexecutorch/tests/integration/ClassificationTest.cpp

@@ -1,4 +1,5 @@
 #include "BaseModelTests.h"
+#include "VisionModelTests.h"
 #include <executorch/runtime/core/exec_aten/exec_aten.h>
 #include <gtest/gtest.h>
 #include <rnexecutorch/Error.h>
@@ -38,6 +39,8 @@ template <> struct ModelTraits<Classification> {
 using ClassificationTypes = ::testing::Types<Classification>;
 INSTANTIATE_TYPED_TEST_SUITE_P(Classification, CommonModelTest,
                                ClassificationTypes);
+INSTANTIATE_TYPED_TEST_SUITE_P(Classification, VisionModelTest,
+                               ClassificationTypes);
 
 // ============================================================================
 // Model-specific tests

packages/react-native-executorch/common/rnexecutorch/tests/integration/ImageEmbeddingsTest.cpp

@@ -1,4 +1,5 @@
 #include "BaseModelTests.h"
+#include "VisionModelTests.h"
 #include <cmath>
 #include <executorch/runtime/core/exec_aten/exec_aten.h>
 #include <gtest/gtest.h>
@@ -39,6 +40,8 @@ template <> struct ModelTraits<ImageEmbeddings> {
 using ImageEmbeddingsTypes = ::testing::Types<ImageEmbeddings>;
 INSTANTIATE_TYPED_TEST_SUITE_P(ImageEmbeddings, CommonModelTest,
                                ImageEmbeddingsTypes);
+INSTANTIATE_TYPED_TEST_SUITE_P(ImageEmbeddings, VisionModelTest,
+                               ImageEmbeddingsTypes);
 
 // ============================================================================
 // Model-specific tests

packages/react-native-executorch/common/rnexecutorch/tests/integration/ObjectDetectionTest.cpp

@@ -1,4 +1,5 @@
 #include "BaseModelTests.h"
+#include "VisionModelTests.h"
 #include <executorch/extension/tensor/tensor.h>
 #include <gtest/gtest.h>
 #include <rnexecutorch/Error.h>
@@ -57,6 +58,8 @@ template <> struct ModelTraits<ObjectDetection> {
 using ObjectDetectionTypes = ::testing::Types<ObjectDetection>;
 INSTANTIATE_TYPED_TEST_SUITE_P(ObjectDetection, CommonModelTest,
                                ObjectDetectionTypes);
+INSTANTIATE_TYPED_TEST_SUITE_P(ObjectDetection, VisionModelTest,
+                               ObjectDetectionTypes);
 
 // ============================================================================
 // Model-specific tests

packages/react-native-executorch/common/rnexecutorch/tests/integration/StyleTransferTest.cpp

@@ -1,11 +1,10 @@
 #include "BaseModelTests.h"
-#include <atomic>
+#include "VisionModelTests.h"
 #include <executorch/runtime/core/exec_aten/exec_aten.h>
 #include <gtest/gtest.h>
 #include <rnexecutorch/Error.h>
 #include <rnexecutorch/host_objects/JSTensorViewIn.h>
 #include <rnexecutorch/models/style_transfer/StyleTransfer.h>
-#include <thread>
 #include <variant>
 
 using namespace rnexecutorch;
@@ -48,6 +47,8 @@ template <> struct ModelTraits<StyleTransfer> {
 using StyleTransferTypes = ::testing::Types<StyleTransfer>;
 INSTANTIATE_TYPED_TEST_SUITE_P(StyleTransfer, CommonModelTest,
                                StyleTransferTypes);
+INSTANTIATE_TYPED_TEST_SUITE_P(StyleTransfer, VisionModelTest,
+                               StyleTransferTypes);
 
 // ============================================================================
 // generateFromString tests
@@ -79,17 +80,6 @@ TEST(StyleTransferGenerateTests, ValidImageReturnsFilePath) {
   EXPECT_GT(pr.height, 0);
 }
 
-TEST(StyleTransferGenerateTests, MultipleGeneratesWork) {
-  StyleTransfer model(kValidStyleTransferModelPath, nullptr);
-  EXPECT_NO_THROW((void)model.generateFromString(kValidTestImagePath, false));
-  auto result1 = model.generateFromString(kValidTestImagePath, false);
-  auto result2 = model.generateFromString(kValidTestImagePath, false);
-  ASSERT_TRUE(std::holds_alternative<PixelDataResult>(result1));
-  ASSERT_TRUE(std::holds_alternative<PixelDataResult>(result2));
-  EXPECT_NE(std::get<PixelDataResult>(result1).dataPtr, nullptr);
-  EXPECT_NE(std::get<PixelDataResult>(result2).dataPtr, nullptr);
-}
-
 // ============================================================================
 // generateFromString saveToFile tests
 // ============================================================================
@@ -173,48 +163,6 @@ TEST(StyleTransferPixelTests, OutputDimensionsMatchInputSize) {
   EXPECT_EQ(pr.height, 64);
 }
 
-// ============================================================================
-// Thread safety tests
-// ============================================================================
-TEST(StyleTransferThreadSafetyTests, TwoConcurrentGeneratesDoNotCrash) {
-  StyleTransfer model(kValidStyleTransferModelPath, nullptr);
-  std::atomic<int32_t> successCount{0};
-  std::atomic<int32_t> exceptionCount{0};
-
-  auto task = [&]() {
-    try {
-      (void)model.generateFromString(kValidTestImagePath, false);
-      successCount++;
-    } catch (const RnExecutorchError &) {
-      exceptionCount++;
-    }
-  };
-
-  std::thread a(task);
-  std::thread b(task);
-  a.join();
-  b.join();
-
-  EXPECT_EQ(successCount + exceptionCount, 2);
-}
-
-TEST(StyleTransferThreadSafetyTests,
-     GenerateAndUnloadConcurrentlyDoesNotCrash) {
-  StyleTransfer model(kValidStyleTransferModelPath, nullptr);
-
-  std::thread a([&]() {
-    try {
-      (void)model.generateFromString(kValidTestImagePath, false);
-    } catch (const RnExecutorchError &) {
-    }
-  });
-  std::thread b([&]() { model.unload(); });
-
-  a.join();
-  b.join();
-  // If we reach here without crashing, the mutex serialized correctly.
-}
-
 // ============================================================================
 // Inherited BaseModel tests
 // ============================================================================

packages/react-native-executorch/common/rnexecutorch/tests/integration/VisionModelTests.h

@@ -0,0 +1,61 @@
+#pragma once
+
+#include "BaseModelTests.h"
+#include <atomic>
+#include <gtest/gtest.h>
+#include <rnexecutorch/Error.h>
+#include <thread>
+
+namespace model_tests {
+
+template <typename T> class VisionModelTest : public ::testing::Test {
+protected:
+  using Traits = ModelTraits<T>;
+  using ModelType = typename Traits::ModelType;
+};
+
+TYPED_TEST_SUITE_P(VisionModelTest);
+
+TYPED_TEST_P(VisionModelTest, TwoConcurrentGeneratesDoNotCrash) {
+  SETUP_TRAITS();
+  auto model = Traits::createValid();
+  std::atomic<int32_t> successCount{0};
+  std::atomic<int32_t> exceptionCount{0};
+
+  auto task = [&]() {
+    try {
+      Traits::callGenerate(model);
+      successCount++;
+    } catch (const rnexecutorch::RnExecutorchError &) {
+      exceptionCount++;
+    }
+  };
+
+  std::thread a(task);
+  std::thread b(task);
+  a.join();
+  b.join();
+
+  EXPECT_EQ(successCount + exceptionCount, 2);
+}
+
+TYPED_TEST_P(VisionModelTest, GenerateAndUnloadConcurrentlyDoesNotCrash) {
+  SETUP_TRAITS();
+  auto model = Traits::createValid();
+
+  std::thread a([&]() {
+    try {
+      Traits::callGenerate(model);
+    } catch (const rnexecutorch::RnExecutorchError &) {
+    }
+  });
+  std::thread b([&]() { model.unload(); });
+
+  a.join();
+  b.join();
+}
+
+REGISTER_TYPED_TEST_SUITE_P(VisionModelTest, TwoConcurrentGeneratesDoNotCrash,
+                            GenerateAndUnloadConcurrentlyDoesNotCrash);
+
+} // namespace model_tests