sunwen/UR
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: remove redudent eikonal lib from UR

Browse Source
This commit is contained in:
kradchen
2024-12-19 10:32:06 +08:00
parent 69d95e8de9
commit cd8fd76846
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@@ -34,7 +34,7 @@ target_link_libraries(UR PUBLIC matio)
target_link_libraries(UR PUBLIC Parser) target_link_libraries(UR PUBLIC Parser)
target_link_libraries(UR PUBLIC URDepends::TransDetection) 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::TVALGPU)
target_link_libraries(UR PUBLIC URDepends::SaftTofi) target_link_libraries(UR PUBLIC URDepends::SaftTofi)
target_link_libraries(UR PUBLIC dcmdata) 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_Libraries})
target_link_libraries(UR_Test PUBLIC Parser) target_link_libraries(UR_Test PUBLIC Parser)
target_link_libraries(UR_Test PUBLIC URDepends::TransDetection) 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::TVALGPU)
target_link_libraries(UR_Test PUBLIC URDepends::SaftTofi) target_link_libraries(UR_Test PUBLIC URDepends::SaftTofi)
# target_link_libraries(UR_Test PUBLIC URDepends::SaftATT) # target_link_libraries(UR_Test PUBLIC URDepends::SaftATT)

2
src/main.cxx
View File

@@ -20,7 +20,7 @@ int main(int argc, char *argv[])
std::vector<std::string> args(argNum); std::vector<std::string> args(argNum);
args[0] = "/home/sun/20230418T145123/"; args[0] = "/home/sun/20230418T145123/";
args[1] = "/home/sun/20230418T141000/"; args[1] = "/home/sun/20230418T141000/";
args[2] = "/home/sun/AscanData/"; args[2] = "/home/krad/output/";
args[3] = Recon::DEFAULT_CONFIG_PATH; args[3] = Recon::DEFAULT_CONFIG_PATH;
argc = argc <= argNum? argc-1 : argNum; argc = argc <= argNum? argc-1 : argNum;
for (int i = 0; i < argc; i++) for (int i = 0; i < argc; i++)

7
src/transmissionReconstruction/reconstruction/buildMatrix/FMM.cpp
View File

@@ -13,7 +13,10 @@
#include "Matrix.h" #include "Matrix.h"
#include "Bresenham.h" #include "Bresenham.h"
#include "DGradient.h" #include "DGradient.h"
#include "eikonal.h"
//当前版本暂时不适用该函数，所以不需要引用该头文件
//暂留备忘
// #include "eikonal.h"
using namespace Aurora; using namespace Aurora;
@@ -79,7 +82,7 @@ namespace Recon
return result; return result;
} }
//本函数暂不使用，已注释其中核心函数eikonal，该函数源于动态库和eikonal.h
Aurora::Matrix eikonalMex(const Aurora::Matrix& volume, const Aurora::Matrix& point, int gpuSelection){ 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)}; int dims[3]{volume.getDimSize(0), volume.getDimSize(1), volume.getDimSize(2)};
// float * result = eikonal(volume.getData(),dims,point.getData(),gpuSelection); // float * result = eikonal(volume.getData(),dims,point.getData(),gpuSelection);