fix ox2.0 missing files and paths

MRSRL · May 21, 2021 · f14eb6f · f14eb6f
1 parent 3d84589
commit f14eb6f
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 2 deletions.
diff --git a/ox2.0/docker_build_helper.sh b/ox2.0/docker_build_helper.sh
@@ -7,7 +7,7 @@ export OPENBLAS_PATH=/opt/OpenBLAS
 export LD_LIBRARY_PATH=${OPENBLAS_PATH}/lib:${LD_LIBRARY_PATH}
 
 # update repo index
-cat yum.conf > /etc/yum.conf
+cat ox2.0/yum.conf > /etc/yum.conf
 
 # build OpenBLAS
 pushd /usr/local/openblas
@@ -19,8 +19,13 @@ popd
 yum install -y libpng-devel fftw3-devel lapack-devel
 
 # build BART
+echo cp ox2.0/bart/src/num/fft.c ${TOOLBOX_PATH}/src/num/fft.c
+echo cp ox2.0/bart/Makefile.local ${TOOLBOX_PATH}/
+echo cp ox2.0/bart/Makefile ${TOOLBOX_PATH}/
+cp ox2.0/bart/src/num/fft.c ${TOOLBOX_PATH}/src/num/fft.c
+cp ox2.0/bart/Makefile ${TOOLBOX_PATH}/
+cp ox2.0/bart/Makefile.local ${TOOLBOX_PATH}/
 pushd ${TOOLBOX_PATH}
-rsync -av --progress ox2.0/bart/* .
 make allclean
 make
 popd

diff --git a/src/BartToDicom/CMakeLists.txt b/src/BartToDicom/CMakeLists.txt
@@ -4,6 +4,7 @@ include_directories(${TOOLBOX_PATH}/src)
 include_directories(../BartIO)
 
 link_directories(${TOOLBOX_PATH}/lib)
+link_directories(${OPENBLAS_PATH}/lib)
 link_directories(../../build/BuildOutputs/lib)
 
 set(SOURCE_FILES

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -19,6 +19,14 @@ else()
 	message(FATAL_ERROR "BART TOOLBOX_PATH environment variable undefined!")
 endif()
 
+message("OpenBLAS Path:" $ENV{OPENBLAS_PATH})
+if(DEFINED ENV{OPENBLAS_PATH})
+	message(STATUS "OPENBLAS_PATH defined")
+	set(OPENBLAS_PATH "$ENV{OPENBLAS_PATH}")
+else()
+	message(FATAL_ERROR "OPENBLAS_PATH environment variable undefined!")
+endif()
+
 # TOPDIR is the root of the source tree
 set(OX_INSTALL_DIRECTORY "" CACHE PATH "Install directory of the GE Orchestra SDK")
 set(TOPDIR "${OX_INSTALL_DIRECTORY}/include")

diff --git a/src/CalibrationData/CMakeLists.txt b/src/CalibrationData/CMakeLists.txt
@@ -4,6 +4,7 @@ include_directories(${TOOLBOX_PATH}/src)
 include_directories(../BartIO)
 
 link_directories(${TOOLBOX_PATH}/lib)
+link_directories(${OPENBLAS_PATH}/lib)
 link_directories(../../build/BuildOutputs/lib)
 
 set(SOURCE_FILES

diff --git a/src/NoiseCov/CMakeLists.txt b/src/NoiseCov/CMakeLists.txt
@@ -4,6 +4,7 @@ include_directories(${TOOLBOX_PATH}/src)
 include_directories(../BartIO)
 
 link_directories(${TOOLBOX_PATH}/lib)
+link_directories(${OPENBLAS_PATH}/lib)
 link_directories(../../build/BuildOutputs/lib)
 
 set(SOURCE_FILES

diff --git a/src/PfileToBart/CMakeLists.txt b/src/PfileToBart/CMakeLists.txt
@@ -4,6 +4,7 @@ include_directories(${TOOLBOX_PATH}/src)
 include_directories(../BartIO)
 
 link_directories(${TOOLBOX_PATH}/lib)
+link_directories(${OPENBLAS_PATH}/lib)
 link_directories(../../build/BuildOutputs/lib)
 
 set(SOURCE_FILES

diff --git a/src/ScanArchiveToBart/CMakeLists.txt b/src/ScanArchiveToBart/CMakeLists.txt
@@ -4,6 +4,7 @@ include_directories(${TOOLBOX_PATH}/src)
 include_directories(../BartIO)
 
 link_directories(${TOOLBOX_PATH}/lib)
+link_directories(${OPENBLAS_PATH}/lib)
 link_directories(../../build/BuildOutputs/lib)
 
 set(SOURCE_FILES