astro-informatics · tkoskela · Jun 29, 2023 · Mar 29, 2023 · Jun 21, 2023 · Jun 23, 2023
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "lexci_models"]
-	path = lexci_models
-	url = git@github.com:astro-informatics/lexci_models.git

diff --git a/cpp/tests/cppflow_model.cc b/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

diff --git a/images/M31T.tiff → cpp/tests/test_data/M31T.tiff b/images/M31T.tiff → cpp/tests/test_data/M31T.tiff
diff --git a/images/cameraFS_Dirty.tiff → cpp/tests/test_data/cameraFS_Dirty.tiff b/images/cameraFS_Dirty.tiff → cpp/tests/test_data/cameraFS_Dirty.tiff
diff --git a/images/cameraFS_L1.tiff → cpp/tests/test_data/cameraFS_L1.tiff b/images/cameraFS_L1.tiff → cpp/tests/test_data/cameraFS_L1.tiff
diff --git a/images/cameraFS_SARA.tiff → cpp/tests/test_data/cameraFS_SARA.tiff b/images/cameraFS_SARA.tiff → cpp/tests/test_data/cameraFS_SARA.tiff
diff --git a/images/cameraFS_TV.tiff → cpp/tests/test_data/cameraFS_TV.tiff b/images/cameraFS_TV.tiff → cpp/tests/test_data/cameraFS_TV.tiff
diff --git a/images/cameraIP_Db8.tiff → cpp/tests/test_data/cameraIP_Db8.tiff b/images/cameraIP_Db8.tiff → cpp/tests/test_data/cameraIP_Db8.tiff
diff --git a/images/cameraIP_Dirty.tiff → cpp/tests/test_data/cameraIP_Dirty.tiff b/images/cameraIP_Dirty.tiff → cpp/tests/test_data/cameraIP_Dirty.tiff
diff --git a/images/cameraIP_SA.tiff → cpp/tests/test_data/cameraIP_SA.tiff b/images/cameraIP_SA.tiff → cpp/tests/test_data/cameraIP_SA.tiff
diff --git a/images/cameraIP_SARA.tiff → cpp/tests/test_data/cameraIP_SARA.tiff b/images/cameraIP_SARA.tiff → cpp/tests/test_data/cameraIP_SARA.tiff
diff --git a/images/cameraIP_TV.tiff → cpp/tests/test_data/cameraIP_TV.tiff b/images/cameraIP_TV.tiff → cpp/tests/test_data/cameraIP_TV.tiff
diff --git a/images/cameraman256.tiff → cpp/tests/test_data/cameraman256.tiff b/images/cameraman256.tiff → cpp/tests/test_data/cameraman256.tiff
diff --git a/images/logo.png → cpp/tests/test_data/logo.png b/images/logo.png → cpp/tests/test_data/logo.png
diff --git a/cpp/tests/test_data/snr_15_model.pb/saved_model.pb b/cpp/tests/test_data/snr_15_model.pb/saved_model.pb
diff --git a/cpp/tests/test_data/snr_15_model.pb/variables/variables.data-00000-of-00001 b/cpp/tests/test_data/snr_15_model.pb/variables/variables.data-00000-of-00001
diff --git a/cpp/tests/test_data/snr_15_model.pb/variables/variables.index b/cpp/tests/test_data/snr_15_model.pb/variables/variables.index
diff --git a/cpp/tests/tf_inpainting.cc b/cpp/tests/tf_inpainting.cc
@@ -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);
 

diff --git a/cpp/tools_for_tests/directories.in.h b/cpp/tools_for_tests/directories.in.h
@@ -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
diff --git a/lexci_models b/lexci_models