Merge pull request #346 from astro-informatics/update-lexci-models

Move test model into repo instead of submodule

Author: tkoskela

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "lexci_models"]
-	path = lexci_models
-	url = git@github.com:astro-informatics/lexci_models.git

cpp/tests/cppflow_model.cc

@@ -32,7 +32,7 @@ TEST_CASE("Cppflow Model"){
   cppflow::tensor input_tensor = sopt::cppflowutils::convert_image_to_tensor(image, image_rows, image_cols);
 
   // Read in model
-  cppflow::model model(std::string(sopt::notinstalled::models_directory() + "/DnCNN/snr_15_model.pb/"));
+  cppflow::model model(std::string(sopt::notinstalled::models_directory() + "/snr_15_model.pb/"));
 
   // Run model on image
   // TODO: Automatically detect the string parameters, see issue #320

images/M31T.tiff renamed to cpp/tests/test_data/M31T.tiff

@@ -31,7 +31,8 @@ using Image = sopt::Image<Scalar>;
 TEST_CASE("Inpainting"){
   extern std::unique_ptr<std::mt19937_64> mersenne;
   std::string const input = "cameraman256";
-  std::string const model_path = static_cast<std::string>(sopt::notinstalled::models_directory() + "/DnCNN/snr_15_model.pb/");
+
+  std::string const model_path = std::string(sopt::notinstalled::models_directory() + "/snr_15_model.pb/");
 
   Image const image = sopt::notinstalled::read_standard_tiff(input);
 

images/cameraFS_Dirty.tiff renamed to cpp/tests/test_data/cameraFS_Dirty.tiff

@@ -6,10 +6,10 @@
 
 namespace sopt::notinstalled {
 //! Holds images and such
-inline std::string data_directory() { return "@PROJECT_SOURCE_DIR@/images"; }
+inline std::string data_directory() { return "@PROJECT_SOURCE_DIR@/cpp/tests/test_data"; }
 //! Output artefacts from tests
 inline std::string output_directory() { return "@PROJECT_BINARY_DIR@/outputs"; }
 //! Tensorflow models
-inline std::string models_directory() { return "@PROJECT_SOURCE_DIR@/lexci_models"; }
+inline std::string models_directory() { return "@PROJECT_SOURCE_DIR@/cpp/tests/test_data"; }
 } // namespace sopt::notinstalled
 #endif