From cd8fd76846753513bf2df381c47734cb3d9c05d7 Mon Sep 17 00:00:00 2001 From: kradchen Date: Thu, 19 Dec 2024 10:32:06 +0800 Subject: [PATCH] feat: remove redudent eikonal lib from UR --- CMakeLists.txt | 4 ++-- src/main.cxx | 2 +- .../reconstruction/buildMatrix/FMM.cpp | 7 +++++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 428c499..7688154 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,7 +34,7 @@ target_link_libraries(UR PUBLIC matio) target_link_libraries(UR PUBLIC Parser) target_link_libraries(UR PUBLIC URDepends::TransDetection) -target_link_libraries(UR PUBLIC URDepends::eikonal) +# target_link_libraries(UR PUBLIC URDepends::eikonal) target_link_libraries(UR PUBLIC URDepends::TVALGPU) target_link_libraries(UR PUBLIC URDepends::SaftTofi) target_link_libraries(UR PUBLIC dcmdata) @@ -76,7 +76,7 @@ target_link_libraries(UR_Test PUBLIC matio) # target_link_libraries(UR_Test PUBLIC ${Parser_Libraries}) target_link_libraries(UR_Test PUBLIC Parser) target_link_libraries(UR_Test PUBLIC URDepends::TransDetection) -target_link_libraries(UR_Test PUBLIC URDepends::eikonal) +# target_link_libraries(UR_Test PUBLIC URDepends::eikonal) target_link_libraries(UR_Test PUBLIC URDepends::TVALGPU) target_link_libraries(UR_Test PUBLIC URDepends::SaftTofi) # target_link_libraries(UR_Test PUBLIC URDepends::SaftATT) diff --git a/src/main.cxx b/src/main.cxx index 1971e62..b51631c 100644 --- a/src/main.cxx +++ b/src/main.cxx @@ -20,7 +20,7 @@ int main(int argc, char *argv[]) std::vector args(argNum); args[0] = "/home/sun/20230418T145123/"; args[1] = "/home/sun/20230418T141000/"; - args[2] = "/home/sun/AscanData/"; + args[2] = "/home/krad/output/"; args[3] = Recon::DEFAULT_CONFIG_PATH; argc = argc <= argNum? argc-1 : argNum; for (int i = 0; i < argc; i++) diff --git a/src/transmissionReconstruction/reconstruction/buildMatrix/FMM.cpp b/src/transmissionReconstruction/reconstruction/buildMatrix/FMM.cpp index 26fc53a..e1e74c7 100644 --- a/src/transmissionReconstruction/reconstruction/buildMatrix/FMM.cpp +++ b/src/transmissionReconstruction/reconstruction/buildMatrix/FMM.cpp @@ -13,7 +13,10 @@ #include "Matrix.h" #include "Bresenham.h" #include "DGradient.h" -#include "eikonal.h" + +//当前版本暂时不适用该函数，所以不需要引用该头文件 +//暂留备忘 +// #include "eikonal.h" using namespace Aurora; @@ -79,7 +82,7 @@ namespace Recon return result; } - + //本函数暂不使用，已注释其中核心函数eikonal，该函数源于动态库和eikonal.h Aurora::Matrix eikonalMex(const Aurora::Matrix& volume, const Aurora::Matrix& point, int gpuSelection){ int dims[3]{volume.getDimSize(0), volume.getDimSize(1), volume.getDimSize(2)}; // float * result = eikonal(volume.getData(),dims,point.getData(),gpuSelection);