Skip to content

Commit 99a63e0

Browse files
authored
Move models out of data and install them with onnxrt (#369)
1 parent e384883 commit 99a63e0

File tree

6 files changed

+7
-3
lines changed

6 files changed

+7
-3
lines changed

cmake_files/dependencies.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ find_package(yaml-cpp REQUIRED)
2828

2929
if (onnxrt)
3030
find_package(onnxruntime REQUIRED)
31+
install(DIRECTORY ${CMAKE_SOURCE_DIR}/models DESTINATION .)
3132
endif()
3233

3334
find_package(sopt REQUIRED)

cpp/tests/algo_factory.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ TEST_CASE("tf_fb_factory") {
228228
t_real const gamma = 0.0001;
229229

230230
std::string tf_model_path =
231-
purify::notinstalled::data_directory() + "/models/snr_15_model_dynamic.onnx";
231+
purify::notinstalled::models_directory() + "/snr_15_model_dynamic.onnx";
232232

233233
auto const fb = factory::fb_factory<sopt::algorithm::ImagingForwardBackward<t_complex>>(
234234
factory::algo_distribution::serial, measurements_transform, wavelets, uv_data, sigma, beta,
@@ -287,9 +287,9 @@ TEST_CASE("onnx_fb_factory") {
287287
t_real const gamma = 0.0001;
288288

289289
std::string const prior_path =
290-
purify::notinstalled::data_directory() + "/models/example_cost_dynamic_CRR_sigma_5_t_5.onnx";
290+
purify::notinstalled::models_directory() + "/example_cost_dynamic_CRR_sigma_5_t_5.onnx";
291291
std::string const prior_gradient_path =
292-
purify::notinstalled::data_directory() + "/models/example_grad_dynamic_CRR_sigma_5_t_5.onnx";
292+
purify::notinstalled::models_directory() + "/example_grad_dynamic_CRR_sigma_5_t_5.onnx";
293293
std::shared_ptr<sopt::ONNXDifferentiableFunc<t_complex>> diff_function =
294294
std::make_shared<sopt::ONNXDifferentiableFunc<t_complex>>(
295295
prior_path, prior_gradient_path, sigma, 20, 5e4, *measurements_transform);

cpp/tests/directories.in.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ namespace notinstalled {
88

99
//! Holds data and such
1010
inline std::string data_directory() { return "@CMAKE_INSTALL_PREFIX@/data"; }
11+
//! Holds TF models
12+
inline std::string models_directory() { return "@CMAKE_INSTALL_PREFIX@/models"; }
13+
1114
//! Holds data and such
1215
inline std::string data_filename(std::string const &filename) {
1316
return data_directory() + "/" + filename;

0 commit comments

Comments
 (0)