[med-svn] [Git][med-team/fast][master] 2 commits: Fix changelog upstream version
Shayan Doust
gitlab at salsa.debian.org
Sun Aug 11 23:56:54 BST 2019
Shayan Doust pushed to branch master at Debian Med / fast
Commits:
643658a0 by Shayan Doust at 2019-08-11T11:37:15Z
Fix changelog upstream version
- - - - -
49dd3f60 by Shayan Doust at 2019-08-11T12:16:56Z
Fix patches for this upstream release
- - - - -
8 changed files:
- debian/changelog
- debian/patches/fix_source_openigtlink.patch
- debian/patches/fix_test.patch
- debian/patches/prevent_cmake_downloading.patch
- debian/patches/remove_unneeded_installs.patch
- debian/patches/series
- debian/patches/set_cmake_options.patch
- debian/patches/use_system_libs.patch
Changes:
=====================================
debian/changelog
=====================================
@@ -1,4 +1,4 @@
-fast (3.0.0-rc1-1) UNRELEASED; urgency=medium
+fast (3.0.0-rc3-1) UNRELEASED; urgency=medium
* Initial release (Closes: #<bug>)
=====================================
debian/patches/fix_source_openigtlink.patch
=====================================
@@ -6,8 +6,8 @@ Last-Update: 2019-08-08
Index: fast/source/FAST/Streamers/OpenIGTLinkStreamer.cpp
===================================================================
---- fast.orig/source/FAST/Streamers/OpenIGTLinkStreamer.cpp 2019-08-08 20:20:52.599054344 +0100
-+++ fast/source/FAST/Streamers/OpenIGTLinkStreamer.cpp 2019-08-08 20:20:52.591054278 +0100
+--- fast.orig/source/FAST/Streamers/OpenIGTLinkStreamer.cpp 2019-08-11 12:39:37.573218562 +0100
++++ fast/source/FAST/Streamers/OpenIGTLinkStreamer.cpp 2019-08-11 12:39:37.565218493 +0100
@@ -1,14 +1,14 @@
#include "OpenIGTLinkStreamer.hpp"
#include "FAST/Data/Image.hpp"
@@ -33,8 +33,8 @@ Index: fast/source/FAST/Streamers/OpenIGTLinkStreamer.cpp
namespace fast {
Index: fast/source/FAST/Streamers/Tests/DummyIGTLServer.cpp
===================================================================
---- fast.orig/source/FAST/Streamers/Tests/DummyIGTLServer.cpp 2019-08-08 20:20:52.599054344 +0100
-+++ fast/source/FAST/Streamers/Tests/DummyIGTLServer.cpp 2019-08-08 20:20:52.595054312 +0100
+--- fast.orig/source/FAST/Streamers/Tests/DummyIGTLServer.cpp 2019-08-11 12:39:37.573218562 +0100
++++ fast/source/FAST/Streamers/Tests/DummyIGTLServer.cpp 2019-08-11 12:39:37.565218493 +0100
@@ -1,9 +1,9 @@
#include "DummyIGTLServer.hpp"
@@ -51,8 +51,8 @@ Index: fast/source/FAST/Streamers/Tests/DummyIGTLServer.cpp
Index: fast/source/FAST/Tools/OpenIGTLinkServer/GUI.cpp
===================================================================
---- fast.orig/source/FAST/Tools/OpenIGTLinkServer/GUI.cpp 2019-08-08 20:20:52.599054344 +0100
-+++ fast/source/FAST/Tools/OpenIGTLinkServer/GUI.cpp 2019-08-08 20:20:52.595054312 +0100
+--- fast.orig/source/FAST/Tools/OpenIGTLinkServer/GUI.cpp 2019-08-11 12:39:37.573218562 +0100
++++ fast/source/FAST/Tools/OpenIGTLinkServer/GUI.cpp 2019-08-11 12:39:37.565218493 +0100
@@ -7,9 +7,9 @@
#include <QMessageBox>
#include <QListWidget>
@@ -75,8 +75,8 @@ Index: fast/source/FAST/Tools/OpenIGTLinkServer/GUI.cpp
+}
Index: fast/source/FAST/Tools/OpenIGTLinkServer/GUI.hpp
===================================================================
---- fast.orig/source/FAST/Tools/OpenIGTLinkServer/GUI.hpp 2019-08-08 20:20:52.599054344 +0100
-+++ fast/source/FAST/Tools/OpenIGTLinkServer/GUI.hpp 2019-08-08 20:20:52.595054312 +0100
+--- fast.orig/source/FAST/Tools/OpenIGTLinkServer/GUI.hpp 2019-08-11 12:39:37.573218562 +0100
++++ fast/source/FAST/Tools/OpenIGTLinkServer/GUI.hpp 2019-08-11 12:39:37.569218527 +0100
@@ -2,7 +2,7 @@
#define FAST_OPENIGTLINKSERVER_GUI_HPP_
@@ -88,8 +88,8 @@ Index: fast/source/FAST/Tools/OpenIGTLinkServer/GUI.hpp
Index: fast/source/FAST/Tools/OpenIGTLinkServer/main.cpp
===================================================================
---- fast.orig/source/FAST/Tools/OpenIGTLinkServer/main.cpp 2019-08-08 20:20:52.599054344 +0100
-+++ fast/source/FAST/Tools/OpenIGTLinkServer/main.cpp 2019-08-08 20:20:52.595054312 +0100
+--- fast.orig/source/FAST/Tools/OpenIGTLinkServer/main.cpp 2019-08-11 12:39:37.573218562 +0100
++++ fast/source/FAST/Tools/OpenIGTLinkServer/main.cpp 2019-08-11 12:39:37.569218527 +0100
@@ -23,4 +23,4 @@
Reporter::setGlobalReportMethod(Reporter::COUT);
window->getReporter().setReportMethod(Reporter::COUT);
=====================================
debian/patches/fix_test.patch
=====================================
@@ -6,8 +6,8 @@ Last-Update: 2019-08-11
Index: fast/source/FAST/Algorithms/NeuralNetwork/CMakeLists.txt
===================================================================
---- fast.orig/source/FAST/Algorithms/NeuralNetwork/CMakeLists.txt 2019-08-11 08:27:52.570019237 +0100
-+++ fast/source/FAST/Algorithms/NeuralNetwork/CMakeLists.txt 2019-08-11 08:27:52.562019167 +0100
+--- fast.orig/source/FAST/Algorithms/NeuralNetwork/CMakeLists.txt 2019-08-11 12:39:37.245215709 +0100
++++ fast/source/FAST/Algorithms/NeuralNetwork/CMakeLists.txt 2019-08-11 12:39:37.241215674 +0100
@@ -16,17 +16,17 @@
fast_add_process_object(ClassificationToText ImageClassificationNetwork.hpp)
fast_add_process_object(SegmentationNetwork SegmentationNetwork.hpp)
=====================================
debian/patches/prevent_cmake_downloading.patch
=====================================
@@ -4,54 +4,10 @@ Author: Shayan Doust <hello at shayandoust.me>
Last-Update: 2019-08-08
---
-Index: fast/cmake/ExternalEigen.cmake
-===================================================================
---- fast.orig/cmake/ExternalEigen.cmake 2019-08-09 02:46:34.137292526 +0100
-+++ fast/cmake/ExternalEigen.cmake 2019-08-09 02:46:34.129292460 +0100
-@@ -1,21 +1,21 @@
- # Download and set up Eigen
-
--include(cmake/Externals.cmake)
-+#include(cmake/Externals.cmake)
-
--ExternalProject_Add(eigen
-- PREFIX ${FAST_EXTERNAL_BUILD_DIR}/eigen
-- BINARY_DIR ${FAST_EXTERNAL_BUILD_DIR}/eigen
-- #GIT_REPOSITORY "https://github.com/RLovelett/eigen.git"
-- #GIT_TAG "a46d2e7337c4656f00abe54a8115f6d76153a048"
-- URL "https://bitbucket.org/eigen/eigen/get/f3a22f35b044.tar.gz"
-- INSTALL_DIR ${FAST_EXTERNAL_INSTALL_DIR}
-- CMAKE_CACHE_ARGS
-- -DCMAKE_BUILD_TYPE:STRING=Release
-- -DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF
-- -DCMAKE_INSTALL_MESSAGE:BOOL=LAZY
-- -DCMAKE_INSTALL_PREFIX:STRING=${FAST_EXTERNAL_INSTALL_DIR}
-- -DBUILD_TESTING:BOOL=OFF
--)
-+#ExternalProject_Add(eigen
-+# PREFIX ${FAST_EXTERNAL_BUILD_DIR}/eigen
-+# BINARY_DIR ${FAST_EXTERNAL_BUILD_DIR}/eigen
-+# #GIT_REPOSITORY "https://github.com/RLovelett/eigen.git"
-+# #GIT_TAG "a46d2e7337c4656f00abe54a8115f6d76153a048"
-+# URL "https://bitbucket.org/eigen/eigen/get/f3a22f35b044.tar.gz"
-+# INSTALL_DIR ${FAST_EXTERNAL_INSTALL_DIR}
-+# CMAKE_CACHE_ARGS
-+# -DCMAKE_BUILD_TYPE:STRING=Release
-+# -DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF
-+# -DCMAKE_INSTALL_MESSAGE:BOOL=LAZY
-+# -DCMAKE_INSTALL_PREFIX:STRING=${FAST_EXTERNAL_INSTALL_DIR}
-+# -DBUILD_TESTING:BOOL=OFF
-+#)
-
--list(APPEND FAST_INCLUDE_DIRS ${FAST_EXTERNAL_INSTALL_DIR}/include/eigen3/)
--list(APPEND FAST_EXTERNAL_DEPENDENCIES eigen)
-\ No newline at end of file
-+#list(APPEND FAST_INCLUDE_DIRS ${FAST_EXTERNAL_INSTALL_DIR}/include/eigen3/)
-+#list(APPEND FAST_EXTERNAL_DEPENDENCIES eigen)
Index: fast/cmake/ExternalOpenSlide.cmake
===================================================================
---- fast.orig/cmake/ExternalOpenSlide.cmake 2019-08-09 02:46:34.137292526 +0100
-+++ fast/cmake/ExternalOpenSlide.cmake 2019-08-09 02:46:34.129292460 +0100
+--- fast.orig/cmake/ExternalOpenSlide.cmake 2019-08-11 12:39:37.925221619 +0100
++++ fast/cmake/ExternalOpenSlide.cmake 2019-08-11 12:39:37.921221585 +0100
@@ -1,17 +1,17 @@
# Download and set up OpenSlide
@@ -85,8 +41,8 @@ Index: fast/cmake/ExternalOpenSlide.cmake
+#endif()
Index: fast/cmake/ExternalZlib.cmake
===================================================================
---- fast.orig/cmake/ExternalZlib.cmake 2019-08-09 02:46:34.137292526 +0100
-+++ fast/cmake/ExternalZlib.cmake 2019-08-09 02:46:34.129292460 +0100
+--- fast.orig/cmake/ExternalZlib.cmake 2019-08-11 12:39:37.925221619 +0100
++++ fast/cmake/ExternalZlib.cmake 2019-08-11 12:39:37.921221585 +0100
@@ -1,24 +1,24 @@
# Download and set up zlib
@@ -136,8 +92,8 @@ Index: fast/cmake/ExternalZlib.cmake
+#list(APPEND FAST_EXTERNAL_DEPENDENCIES zlib)
Index: fast/cmake/ExternalOpenIGTLink.cmake
===================================================================
---- fast.orig/cmake/ExternalOpenIGTLink.cmake 2019-08-09 02:46:34.137292526 +0100
-+++ fast/cmake/ExternalOpenIGTLink.cmake 2019-08-09 02:46:34.129292460 +0100
+--- fast.orig/cmake/ExternalOpenIGTLink.cmake 2019-08-11 12:39:37.925221619 +0100
++++ fast/cmake/ExternalOpenIGTLink.cmake 2019-08-11 12:39:37.921221585 +0100
@@ -1,30 +1,30 @@
# Download and set up zlib
@@ -198,8 +154,8 @@ Index: fast/cmake/ExternalOpenIGTLink.cmake
+#list(APPEND FAST_EXTERNAL_DEPENDENCIES OpenIGTLink)
Index: fast/cmake/ExternalFreenect2.cmake
===================================================================
---- fast.orig/cmake/ExternalFreenect2.cmake 2019-08-09 02:46:34.137292526 +0100
-+++ fast/cmake/ExternalFreenect2.cmake 2019-08-09 02:46:34.129292460 +0100
+--- fast.orig/cmake/ExternalFreenect2.cmake 2019-08-11 12:39:37.925221619 +0100
++++ fast/cmake/ExternalFreenect2.cmake 2019-08-11 12:39:37.921221585 +0100
@@ -1,20 +1,20 @@
# Download and set up libfreenect2
@@ -239,9 +195,9 @@ Index: fast/cmake/ExternalFreenect2.cmake
+#list(APPEND FAST_EXTERNAL_DEPENDENCIES freenect2)
Index: fast/cmake/ExternalTensorflow.cmake
===================================================================
---- fast.orig/cmake/ExternalTensorflow.cmake 2019-08-09 02:46:34.137292526 +0100
-+++ fast/cmake/ExternalTensorflow.cmake 2019-08-09 02:46:34.133292493 +0100
-@@ -1,177 +1,177 @@
+--- fast.orig/cmake/ExternalTensorflow.cmake 2019-08-11 12:39:37.925221619 +0100
++++ fast/cmake/ExternalTensorflow.cmake 2019-08-11 12:39:37.921221585 +0100
+@@ -1,196 +1,196 @@
# Download and set up Tensorflow
-include(${PROJECT_SOURCE_DIR}/cmake/Externals.cmake)
@@ -249,68 +205,57 @@ Index: fast/cmake/ExternalTensorflow.cmake
-if(WIN32)
- set(GIT_EXECUTABLE "git.exe")
-+#if(WIN32)
-+# set(GIT_EXECUTABLE "git.exe")
- # Use CMake to build tensorflow on windows
-- ExternalProject_Add(tensorflow
+- # Use CMake to build tensorflow on windows
+- if(FAST_BUILD_TensorFlow_CPU OR FAST_BUILD_TensorFlow_CUDA)
+- ExternalProject_Add(tensorflow_download
- PREFIX ${FAST_EXTERNAL_BUILD_DIR}/tensorflow
- BINARY_DIR ${FAST_EXTERNAL_BUILD_DIR}/tensorflow
- GIT_REPOSITORY "https://github.com/smistad/tensorflow.git"
-- GIT_TAG "fast"
-- # Need to override this because tensorflow creates a file in the source dir
-- # and cmake files to stash these files
-- UPDATE_COMMAND
-- ${GIT_EXECUTABLE} pull origin fast
-- # Must use CONFIGURE_COMMAND because CMakeLists.txt is not in the src root of tensorflow
-- CONFIGURE_COMMAND
-- ${CMAKE_COMMAND}
-- ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/tensorflow/contrib/cmake/
-- -G${CMAKE_GENERATOR}
-- -Thost=x64
-- -DCMAKE_BUILD_TYPE:STRING=Release
-- -Dtensorflow_BUILD_PYTHON_BINDINGS=OFF
-- -Dtensorflow_ENABLE_SNAPPY_SUPPORT=ON
-- -Dtensorflow_BUILD_CC_EXAMPLE=OFF
-- -Dtensorflow_BUILD_SHARED_LIB=ON
-- -Dtensorflow_BUILD_CONTRIB_KERNELS=OFF
-- -Dtensorflow_ENABLE_GRPC_SUPPORT=OFF
-- -Dtensorflow_WIN_CPU_SIMD_OPTIONS=/arch:AVX
-- #-Dtensorflow_ENABLE_GPU=ON
-- -DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF
-- -DCMAKE_INSTALL_MESSAGE:BOOL=LAZY
-- -DCMAKE_INSTALL_PREFIX:STRING=${FAST_EXTERNAL_INSTALL_DIR}
+- GIT_TAG "fast-updated"
+- UPDATE_COMMAND ""
+- CONFIGURE_COMMAND ""
+- BUILD_COMMAND ""
+- INSTALL_COMMAND ""
- )
+- endif()
+- if(FAST_BUILD_TensorFlow_CPU)
+-
+- ExternalProject_Add(tensorflow_CPU
+- DEPENDS tensorflow_download
+- PREFIX ${FAST_EXTERNAL_BUILD_DIR}/tensorflow
+- BINARY_DIR ${FAST_EXTERNAL_BUILD_DIR}/tensorflow
+- DOWNLOAD_COMMAND ""
+- UPDATE_COMMAND ""
+- CONFIGURE_COMMAND
+- echo "Configuring TensorFlow..." COMMAND
+- cd ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/ COMMAND
+- ${PROJECT_SOURCE_DIR}/cmake/TensorflowConfigureCPU.bat COMMAND
+- echo "Done TF configure"
+- BUILD_COMMAND
+- echo "Building tensorflow with bazel for CPU.." COMMAND
+- cd ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/ COMMAND
+- bazel build --config=opt //tensorflow:tensorflow.dll
+- INSTALL_COMMAND
+- echo "Installing tensorflow binary" COMMAND
+- ${CMAKE_COMMAND} -E copy ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/bazel-bin/tensorflow/tensorflow.dll.if.lib ${FAST_EXTERNAL_INSTALL_DIR}/lib/tensorflow_CPU.lib COMMAND
+- ${CMAKE_COMMAND} -E copy ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/bazel-bin/external/protobuf_archive/protobuf.lib ${FAST_EXTERNAL_INSTALL_DIR}/lib/protobuf.lib COMMAND
+- ${CMAKE_COMMAND} -E copy ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/bazel-bin/tensorflow/tensorflow.dll ${FAST_EXTERNAL_INSTALL_DIR}/bin/tensorflow_CPU.dll COMMAND
+- echo "Installing tensorflow headers" COMMAND
+- ${CMAKE_COMMAND} -E copy_directory ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/tensorflow ${FAST_EXTERNAL_INSTALL_DIR}/include/tensorflow/ COMMAND
+- echo "Installing tensorflow generated headers" COMMAND
+- ${CMAKE_COMMAND} -E copy_directory ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/bazel-genfiles/tensorflow ${FAST_EXTERNAL_INSTALL_DIR}/include/tensorflow/ COMMAND
+- echo "Installing tensorflow third party headers" COMMAND
+- ${CMAKE_COMMAND} -E copy_directory ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/third_party/ ${FAST_EXTERNAL_INSTALL_DIR}/include/third_party/ COMMAND
+- #echo "Installing protobuf headers" COMMAND
+- #${CMAKE_COMMAND} -E copy_directory ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/bazel-tensorflow_download/external/protobuf_archive/src/google/ ${FAST_EXTERNAL_INSTALL_DIR}/include/google/ COMMAND
+- #echo "Installing nsync headers" COMMAND
+- #xcopy ${src} ${dest} /y COMMAND
+- echo "Installing absl headers" COMMAND
+- ${CMAKE_COMMAND} -E copy_directory ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/bazel-tensorflow_download/external/com_google_absl/absl/ ${FAST_EXTERNAL_INSTALL_DIR}/include/absl/
+- )
+- endif()
-else(WIN32)
-+ # ExternalProject_Add(tensorflow
-+ # PREFIX ${FAST_EXTERNAL_BUILD_DIR}/tensorflow
-+ # BINARY_DIR ${FAST_EXTERNAL_BUILD_DIR}/tensorflow
-+ # GIT_REPOSITORY "https://github.com/smistad/tensorflow.git"
-+ # GIT_TAG "fast"
-+ # # Need to override this because tensorflow creates a file in the source dir
-+ # # and cmake files to stash these files
-+ # UPDATE_COMMAND
-+ # ${GIT_EXECUTABLE} pull origin fast
-+ # # Must use CONFIGURE_COMMAND because CMakeLists.txt is not in the src root of tensorflow
-+ # CONFIGURE_COMMAND
-+ # ${CMAKE_COMMAND}
-+ # ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/tensorflow/contrib/cmake/
-+ # -G${CMAKE_GENERATOR}
-+ # -Thost=x64
-+ # -DCMAKE_BUILD_TYPE:STRING=Release
-+ # -Dtensorflow_BUILD_PYTHON_BINDINGS=OFF
-+ # -Dtensorflow_ENABLE_SNAPPY_SUPPORT=ON
-+ # -Dtensorflow_BUILD_CC_EXAMPLE=OFF
-+ # -Dtensorflow_BUILD_SHARED_LIB=ON
-+ # -Dtensorflow_BUILD_CONTRIB_KERNELS=OFF
-+ # -Dtensorflow_ENABLE_GRPC_SUPPORT=OFF
-+ # -Dtensorflow_WIN_CPU_SIMD_OPTIONS=/arch:AVX
-+ # #-Dtensorflow_ENABLE_GPU=ON
-+ # -DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF
-+ # -DCMAKE_INSTALL_MESSAGE:BOOL=LAZY
-+ # -DCMAKE_INSTALL_PREFIX:STRING=${FAST_EXTERNAL_INSTALL_DIR}
-+ # )
-+ #else(WIN32)
- # Use bazel to build tensorflow on linux
+- # Use bazel to build tensorflow on linux
- set(GIT_EXECUTABLE "git")
- if(FAST_BUILD_TensorFlow_CPU OR FAST_BUILD_TensorFlow_CUDA)
- ExternalProject_Add(tensorflow_download
@@ -366,8 +311,8 @@ Index: fast/cmake/ExternalTensorflow.cmake
- cp -rf ${FAST_EXTERNAL_BUILD_DIR}/tensorflow_rocm/src/tensorflow_download_rocm/third_party/ ${FAST_EXTERNAL_INSTALL_DIR}/include/ &&
- echo "Installing protobuf headers" &&
- bash -c "cp $(readlink -f ${FAST_EXTERNAL_BUILD_DIR}/tensorflow_rocm/src/tensorflow_download_rocm/bazel-out/)/../../../external/protobuf_archive/src/google/ ${FAST_EXTERNAL_INSTALL_DIR}/include/ -Rf" &&
-- echo "Installing nsync headers" &&
-- bash -c "cp $(readlink -f ${FAST_EXTERNAL_BUILD_DIR}/tensorflow_rocm/src/tensorflow_download_rocm/bazel-out/)/../../../external/nsync/public/*.h ${FAST_EXTERNAL_INSTALL_DIR}/include/ -Rf" &&
+- #echo "Installing nsync headers" &&
+- #bash -c "cp $(readlink -f ${FAST_EXTERNAL_BUILD_DIR}/tensorflow_rocm/src/tensorflow_download_rocm/bazel-out/)/../../../external/nsync/public/*.h ${FAST_EXTERNAL_INSTALL_DIR}/include/ -Rf" &&
- echo "Installing absl headers" &&
- bash -c "cp $(readlink -f ${FAST_EXTERNAL_BUILD_DIR}/tensorflow_rocm/src/tensorflow_download_rocm/bazel-out/)/../../../external/com_google_absl/absl/ ${FAST_EXTERNAL_INSTALL_DIR}/include/ -Rf"
- )
@@ -388,13 +333,13 @@ Index: fast/cmake/ExternalTensorflow.cmake
- cd ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/ && bazel build -c opt --config=cuda --copt=-mfpmath=both --copt=-march=core-avx2 //tensorflow:libtensorflow_cc.so
- INSTALL_COMMAND
- echo "Installing tensorflow binary" &&
-- cp -f ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/bazel-bin/tensorflow/libtensorflow_cc.so ${FAST_EXTERNAL_INSTALL_DIR}/lib/libtensorflow_cc_CUDA.so &&
-- cp -f ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/bazel-bin/tensorflow/libtensorflow_framework.so ${FAST_EXTERNAL_INSTALL_DIR}/lib/libtensorflow_framework_CUDA.so &&
+- cp -f ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/bazel-bin/tensorflow/libtensorflow_cc.so.1.14.0 ${FAST_EXTERNAL_INSTALL_DIR}/lib/libtensorflow_cc_CUDA.so &&
+- cp -f ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/bazel-bin/tensorflow/libtensorflow_framework.so.1.14.0 ${FAST_EXTERNAL_INSTALL_DIR}/lib/libtensorflow_framework_CUDA.so &&
- chmod a+w ${FAST_EXTERNAL_INSTALL_DIR}/lib/libtensorflow_cc_CUDA.so &&
- chmod a+w ${FAST_EXTERNAL_INSTALL_DIR}/lib/libtensorflow_framework_CUDA.so &&
- patchelf --set-soname libtensorflow_cc_CUDA.so ${FAST_EXTERNAL_INSTALL_DIR}/lib/libtensorflow_cc_CUDA.so &&
- patchelf --set-soname libtensorflow_framework_CUDA.so ${FAST_EXTERNAL_INSTALL_DIR}/lib/libtensorflow_framework_CUDA.so &&
-- patchelf --replace-needed libtensorflow_framework.so libtensorflow_framework_CUDA.so ${FAST_EXTERNAL_INSTALL_DIR}/lib/libtensorflow_cc_CUDA.so &&
+- patchelf --replace-needed libtensorflow_framework.so.1 libtensorflow_framework_CUDA.so ${FAST_EXTERNAL_INSTALL_DIR}/lib/libtensorflow_cc_CUDA.so &&
- #echo "Installing mkl binaries" &&
- #bash -c "cp $(readlink -f ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/bazel-out/)/../../../external/mkl/lib/libmklml_intel.so ${FAST_EXTERNAL_INSTALL_DIR}/lib/ -Rf" &&
- #bash -c "cp $(readlink -f ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/bazel-out/)/../../../external/mkl/lib/libiomp5.so ${FAST_EXTERNAL_INSTALL_DIR}/lib/ -Rf" &&
@@ -406,8 +351,8 @@ Index: fast/cmake/ExternalTensorflow.cmake
- cp -rf ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/third_party/ ${FAST_EXTERNAL_INSTALL_DIR}/include/ &&
- echo "Installing protobuf headers" &&
- bash -c "cp $(readlink -f ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/bazel-out/)/../../../external/protobuf_archive/src/google/ ${FAST_EXTERNAL_INSTALL_DIR}/include/ -Rf" &&
-- echo "Installing nsync headers" &&
-- bash -c "cp $(readlink -f ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/bazel-out/)/../../../external/nsync/public/*.h ${FAST_EXTERNAL_INSTALL_DIR}/include/ -Rf" &&
+- #echo "Installing nsync headers" &&
+- #bash -c "cp $(readlink -f ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/bazel-out/)/../../../external/nsync/public/*.h ${FAST_EXTERNAL_INSTALL_DIR}/include/ -Rf" &&
- echo "Installing absl headers" &&
- bash -c "cp $(readlink -f ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/bazel-out/)/../../../external/com_google_absl/absl/ ${FAST_EXTERNAL_INSTALL_DIR}/include/ -Rf"
- )
@@ -419,7 +364,7 @@ Index: fast/cmake/ExternalTensorflow.cmake
- BINARY_DIR ${FAST_EXTERNAL_BUILD_DIR}/tensorflow
- DOWNLOAD_COMMAND ""
- UPDATE_COMMAND ""
-- # Run TF configure in the form of a shell script.
+- # Run TF configure in the form of a shell script.
- CONFIGURE_COMMAND
- cd ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/ && sh ${PROJECT_SOURCE_DIR}/cmake/TensorflowConfigureCPU.sh
- # Build using bazel
@@ -428,13 +373,13 @@ Index: fast/cmake/ExternalTensorflow.cmake
- cd ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/ && bazel build --config=opt --copt=-mfpmath=both --copt=-march=core-avx2 //tensorflow:libtensorflow_cc.so
- INSTALL_COMMAND
- echo "Installing tensorflow binary" &&
-- cp -f ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/bazel-bin/tensorflow/libtensorflow_cc.so ${FAST_EXTERNAL_INSTALL_DIR}/lib/libtensorflow_cc_CPU.so &&
-- cp -f ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/bazel-bin/tensorflow/libtensorflow_framework.so ${FAST_EXTERNAL_INSTALL_DIR}/lib/libtensorflow_framework_CPU.so &&
+- cp -f ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/bazel-bin/tensorflow/libtensorflow_cc.so.1.14.0 ${FAST_EXTERNAL_INSTALL_DIR}/lib/libtensorflow_cc_CPU.so &&
+- cp -f ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/bazel-bin/tensorflow/libtensorflow_framework.so.1.14.0 ${FAST_EXTERNAL_INSTALL_DIR}/lib/libtensorflow_framework_CPU.so &&
- chmod a+w ${FAST_EXTERNAL_INSTALL_DIR}/lib/libtensorflow_cc_CPU.so &&
- chmod a+w ${FAST_EXTERNAL_INSTALL_DIR}/lib/libtensorflow_framework_CPU.so &&
- patchelf --set-soname libtensorflow_cc_CPU.so ${FAST_EXTERNAL_INSTALL_DIR}/lib/libtensorflow_cc_CPU.so &&
- patchelf --set-soname libtensorflow_framework_CPU.so ${FAST_EXTERNAL_INSTALL_DIR}/lib/libtensorflow_framework_CPU.so &&
-- patchelf --replace-needed libtensorflow_framework.so libtensorflow_framework_CPU.so ${FAST_EXTERNAL_INSTALL_DIR}/lib/libtensorflow_cc_CPU.so &&
+- patchelf --replace-needed libtensorflow_framework.so.1 libtensorflow_framework_CPU.so ${FAST_EXTERNAL_INSTALL_DIR}/lib/libtensorflow_cc_CPU.so &&
- echo "Installing tensorflow headers" &&
- cp -rf ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/tensorflow/ ${FAST_EXTERNAL_INSTALL_DIR}/include/ &&
- echo "Installing tensorflow generated headers" &&
@@ -443,157 +388,209 @@ Index: fast/cmake/ExternalTensorflow.cmake
- cp -rf ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/third_party/ ${FAST_EXTERNAL_INSTALL_DIR}/include/ &&
- echo "Installing protobuf headers" &&
- bash -c "cp $(readlink -f ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/bazel-out/)/../../../external/protobuf_archive/src/google/ ${FAST_EXTERNAL_INSTALL_DIR}/include/ -Rf" &&
-- echo "Installing nsync headers" &&
-- bash -c "cp $(readlink -f ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/bazel-out/)/../../../external/nsync/public/*.h ${FAST_EXTERNAL_INSTALL_DIR}/include/ -Rf" &&
+- #echo "Installing nsync headers" &&
+- #bash -c "cp $(readlink -f ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/bazel-out/)/../../../external/nsync/public/*.h ${FAST_EXTERNAL_INSTALL_DIR}/include/ -Rf" &&
- echo "Installing absl headers" &&
- bash -c "cp $(readlink -f ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/bazel-out/)/../../../external/com_google_absl/absl/ ${FAST_EXTERNAL_INSTALL_DIR}/include/ -Rf"
- )
- endif()
-endif(WIN32)
-+ #set(GIT_EXECUTABLE "git")
-+ #if(FAST_BUILD_TensorFlow_CPU OR FAST_BUILD_TensorFlow_CUDA)
-+ # ExternalProject_Add(tensorflow_download
-+ # PREFIX ${FAST_EXTERNAL_BUILD_DIR}/tensorflow
-+ # BINARY_DIR ${FAST_EXTERNAL_BUILD_DIR}/tensorflow
-+ # GIT_REPOSITORY "https://github.com/smistad/tensorflow.git"
-+ # GIT_TAG "fast-updated"
-+ # UPDATE_COMMAND ""
-+ # CONFIGURE_COMMAND ""
-+ # BUILD_COMMAND ""
-+ # INSTALL_COMMAND ""
-+ # )
-+ #endif()
-+ #if(FAST_BUILD_TensorFlow_ROCm)
-+ # # Need a seperate repo for rocm atm
-+ # ExternalProject_Add(tensorflow_download_rocm
-+ # PREFIX ${FAST_EXTERNAL_BUILD_DIR}/tensorflow_rocm
-+ # BINARY_DIR ${FAST_EXTERNAL_BUILD_DIR}/tensorflow_rocm
-+ # GIT_REPOSITORY "https://github.com/ROCmSoftwarePlatform/tensorflow-upstream"
-+ # GIT_TAG "r1.14-rocm"
-+ # UPDATE_COMMAND ""
-+ # CONFIGURE_COMMAND ""
-+ # BUILD_COMMAND ""
-+ # INSTALL_COMMAND ""
-+ # )
-+ # ExternalProject_Add(tensorflow_ROCm
-+ # DEPENDS tensorflow_download_rocm
-+ # PREFIX ${FAST_EXTERNAL_BUILD_DIR}/tensorflow_rocm
-+ # BINARY_DIR ${FAST_EXTERNAL_BUILD_DIR}/tensorflow_rocm
-+ # DOWNLOAD_COMMAND ""
-+ # UPDATE_COMMAND ""
-+ # # Run TF configure in the form of a shell script.
-+ # CONFIGURE_COMMAND
-+ # cd ${FAST_EXTERNAL_BUILD_DIR}/tensorflow_rocm/src/tensorflow_download_rocm/ && sh ${PROJECT_SOURCE_DIR}/cmake/TensorflowConfigureROCm.sh
-+ # # Build using bazel
-+ # BUILD_COMMAND
-+ # echo "Building tensorflow with bazel and ROCm (AMD) GPU support" &&
-+ # cd ${FAST_EXTERNAL_BUILD_DIR}/tensorflow_rocm/src/tensorflow_download_rocm/ && bazel build -c opt --config=rocm //tensorflow:libtensorflow_cc.so
-+ # INSTALL_COMMAND
-+ # echo "Installing tensorflow binary" &&
-+ # cp -f ${FAST_EXTERNAL_BUILD_DIR}/tensorflow_rocm/src/tensorflow_download_rocm/bazel-bin/tensorflow/libtensorflow_cc.so.1.14.0 ${FAST_EXTERNAL_INSTALL_DIR}/lib/libtensorflow_cc_ROCm.so &&
-+ # cp -f ${FAST_EXTERNAL_BUILD_DIR}/tensorflow_rocm/src/tensorflow_download_rocm/bazel-bin/tensorflow/libtensorflow_framework.so.1.14.0 ${FAST_EXTERNAL_INSTALL_DIR}/lib/libtensorflow_framework_ROCm.so &&
-+ # chmod a+w ${FAST_EXTERNAL_INSTALL_DIR}/lib/libtensorflow_cc_ROCm.so &&
-+ # chmod a+w ${FAST_EXTERNAL_INSTALL_DIR}/lib/libtensorflow_framework_ROCm.so &&
-+ # patchelf --set-soname libtensorflow_cc_ROCm.so ${FAST_EXTERNAL_INSTALL_DIR}/lib/libtensorflow_cc_ROCm.so &&
-+ # patchelf --set-soname libtensorflow_framework_ROCm.so ${FAST_EXTERNAL_INSTALL_DIR}/lib/libtensorflow_framework_ROCm.so &&
-+ # patchelf --replace-needed libtensorflow_framework.so.1 libtensorflow_framework_ROCm.so ${FAST_EXTERNAL_INSTALL_DIR}/lib/libtensorflow_cc_ROCm.so &&
-+ # echo "Installing tensorflow headers" &&
-+ # cp -rf ${FAST_EXTERNAL_BUILD_DIR}/tensorflow_rocm/src/tensorflow_download_rocm/tensorflow/ ${FAST_EXTERNAL_INSTALL_DIR}/include/ &&
-+ # echo "Installing tensorflow generated headers" &&
-+ # cp -rf ${FAST_EXTERNAL_BUILD_DIR}/tensorflow_rocm/src/tensorflow_download_rocm/bazel-genfiles/tensorflow/ ${FAST_EXTERNAL_INSTALL_DIR}/include/ &&
-+ # echo "Installing tensorflow third_party headers" &&
-+ # cp -rf ${FAST_EXTERNAL_BUILD_DIR}/tensorflow_rocm/src/tensorflow_download_rocm/third_party/ ${FAST_EXTERNAL_INSTALL_DIR}/include/ &&
-+ # echo "Installing protobuf headers" &&
-+ # bash -c "cp $(readlink -f ${FAST_EXTERNAL_BUILD_DIR}/tensorflow_rocm/src/tensorflow_download_rocm/bazel-out/)/../../../external/protobuf_archive/src/google/ ${FAST_EXTERNAL_INSTALL_DIR}/include/ -Rf" &&
-+ # echo "Installing nsync headers" &&
-+ # bash -c "cp $(readlink -f ${FAST_EXTERNAL_BUILD_DIR}/tensorflow_rocm/src/tensorflow_download_rocm/bazel-out/)/../../../external/nsync/public/*.h ${FAST_EXTERNAL_INSTALL_DIR}/include/ -Rf" &&
-+ # echo "Installing absl headers" &&
-+ # bash -c "cp $(readlink -f ${FAST_EXTERNAL_BUILD_DIR}/tensorflow_rocm/src/tensorflow_download_rocm/bazel-out/)/../../../external/com_google_absl/absl/ ${FAST_EXTERNAL_INSTALL_DIR}/include/ -Rf"
-+ #)
-+ #endif()
-+ #if(FAST_BUILD_TensorFlow_CUDA)
-+ #ExternalProject_Add(tensorflow_CUDA
-+ # DEPENDS tensorflow_download
-+ # PREFIX ${FAST_EXTERNAL_BUILD_DIR}/tensorflow
-+ # BINARY_DIR ${FAST_EXTERNAL_BUILD_DIR}/tensorflow
-+ # DOWNLOAD_COMMAND ""
-+ # UPDATE_COMMAND ""
-+ # # Run TF configure in the form of a shell script. CUDA should be installed in /usr/local/cuda
-+ # CONFIGURE_COMMAND
-+ # cd ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/ && sh ${PROJECT_SOURCE_DIR}/cmake/TensorflowConfigureCUDA.sh
-+ # # Build using bazel
-+ # BUILD_COMMAND
-+ # echo "Building tensorflow with bazel and CUDA GPU support" &&
-+ # cd ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/ && bazel build -c opt --config=cuda --copt=-mfpmath=both --copt=-march=core-avx2 //tensorflow:libtensorflow_cc.so
-+ # INSTALL_COMMAND
-+ # echo "Installing tensorflow binary" &&
-+ # cp -f ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/bazel-bin/tensorflow/libtensorflow_cc.so ${FAST_EXTERNAL_INSTALL_DIR}/lib/libtensorflow_cc_CUDA.so &&
-+ # cp -f ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/bazel-bin/tensorflow/libtensorflow_framework.so ${FAST_EXTERNAL_INSTALL_DIR}/lib/libtensorflow_framework_CUDA.so &&
-+ # chmod a+w ${FAST_EXTERNAL_INSTALL_DIR}/lib/libtensorflow_cc_CUDA.so &&
-+ # chmod a+w ${FAST_EXTERNAL_INSTALL_DIR}/lib/libtensorflow_framework_CUDA.so &&
-+ # patchelf --set-soname libtensorflow_cc_CUDA.so ${FAST_EXTERNAL_INSTALL_DIR}/lib/libtensorflow_cc_CUDA.so &&
-+ # patchelf --set-soname libtensorflow_framework_CUDA.so ${FAST_EXTERNAL_INSTALL_DIR}/lib/libtensorflow_framework_CUDA.so &&
-+ # patchelf --replace-needed libtensorflow_framework.so libtensorflow_framework_CUDA.so ${FAST_EXTERNAL_INSTALL_DIR}/lib/libtensorflow_cc_CUDA.so &&
-+ # #echo "Installing mkl binaries" &&
-+ # #bash -c "cp $(readlink -f ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/bazel-out/)/../../../external/mkl/lib/libmklml_intel.so ${FAST_EXTERNAL_INSTALL_DIR}/lib/ -Rf" &&
-+ # #bash -c "cp $(readlink -f ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/bazel-out/)/../../../external/mkl/lib/libiomp5.so ${FAST_EXTERNAL_INSTALL_DIR}/lib/ -Rf" &&
-+ # echo "Installing tensorflow headers" &&
-+ # cp -rf ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/tensorflow/ ${FAST_EXTERNAL_INSTALL_DIR}/include/ &&
-+ # echo "Installing tensorflow generated headers" &&
-+ # cp -rf ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/bazel-genfiles/tensorflow/ ${FAST_EXTERNAL_INSTALL_DIR}/include/ &&
-+ # echo "Installing tensorflow third_party headers" &&
-+ # cp -rf ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/third_party/ ${FAST_EXTERNAL_INSTALL_DIR}/include/ &&
-+ # echo "Installing protobuf headers" &&
-+ # bash -c "cp $(readlink -f ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/bazel-out/)/../../../external/protobuf_archive/src/google/ ${FAST_EXTERNAL_INSTALL_DIR}/include/ -Rf" &&
-+ # echo "Installing nsync headers" &&
-+ # bash -c "cp $(readlink -f ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/bazel-out/)/../../../external/nsync/public/*.h ${FAST_EXTERNAL_INSTALL_DIR}/include/ -Rf" &&
-+ # echo "Installing absl headers" &&
-+ # bash -c "cp $(readlink -f ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/bazel-out/)/../../../external/com_google_absl/absl/ ${FAST_EXTERNAL_INSTALL_DIR}/include/ -Rf"
-+ #)
-+ #endif()
-+ #if(FAST_BUILD_TensorFlow_CPU)
-+ #ExternalProject_Add(tensorflow_CPU
-+ # DEPENDS tensorflow_download
-+ # PREFIX ${FAST_EXTERNAL_BUILD_DIR}/tensorflow
-+ # BINARY_DIR ${FAST_EXTERNAL_BUILD_DIR}/tensorflow
-+ # DOWNLOAD_COMMAND ""
-+ # UPDATE_COMMAND ""
-+ # # Run TF configure in the form of a shell script.
-+ # CONFIGURE_COMMAND
-+ # cd ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/ && sh ${PROJECT_SOURCE_DIR}/cmake/TensorflowConfigureCPU.sh
-+ # # Build using bazel
-+ # BUILD_COMMAND
-+ # echo "Building tensorflow with bazel for CPU" &&
-+ # cd ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/ && bazel build --config=opt --copt=-mfpmath=both --copt=-march=core-avx2 //tensorflow:libtensorflow_cc.so
-+ # INSTALL_COMMAND
-+ # echo "Installing tensorflow binary" &&
-+ # cp -f ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/bazel-bin/tensorflow/libtensorflow_cc.so ${FAST_EXTERNAL_INSTALL_DIR}/lib/libtensorflow_cc_CPU.so &&
-+ # cp -f ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/bazel-bin/tensorflow/libtensorflow_framework.so ${FAST_EXTERNAL_INSTALL_DIR}/lib/libtensorflow_framework_CPU.so &&
-+ # chmod a+w ${FAST_EXTERNAL_INSTALL_DIR}/lib/libtensorflow_cc_CPU.so &&
-+ # chmod a+w ${FAST_EXTERNAL_INSTALL_DIR}/lib/libtensorflow_framework_CPU.so &&
-+ # patchelf --set-soname libtensorflow_cc_CPU.so ${FAST_EXTERNAL_INSTALL_DIR}/lib/libtensorflow_cc_CPU.so &&
-+ # patchelf --set-soname libtensorflow_framework_CPU.so ${FAST_EXTERNAL_INSTALL_DIR}/lib/libtensorflow_framework_CPU.so &&
-+ # patchelf --replace-needed libtensorflow_framework.so libtensorflow_framework_CPU.so ${FAST_EXTERNAL_INSTALL_DIR}/lib/libtensorflow_cc_CPU.so &&
-+ # echo "Installing tensorflow headers" &&
-+ # cp -rf ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/tensorflow/ ${FAST_EXTERNAL_INSTALL_DIR}/include/ &&
-+ # echo "Installing tensorflow generated headers" &&
-+ # cp -rf ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/bazel-genfiles/tensorflow/ ${FAST_EXTERNAL_INSTALL_DIR}/include/ &&
-+ # echo "Installing tensorflow third_party headers" &&
-+ # cp -rf ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/third_party/ ${FAST_EXTERNAL_INSTALL_DIR}/include/ &&
-+ # echo "Installing protobuf headers" &&
-+ # bash -c "cp $(readlink -f ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/bazel-out/)/../../../external/protobuf_archive/src/google/ ${FAST_EXTERNAL_INSTALL_DIR}/include/ -Rf" &&
-+ # echo "Installing nsync headers" &&
-+ # bash -c "cp $(readlink -f ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/bazel-out/)/../../../external/nsync/public/*.h ${FAST_EXTERNAL_INSTALL_DIR}/include/ -Rf" &&
-+ # echo "Installing absl headers" &&
-+ # bash -c "cp $(readlink -f ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/bazel-out/)/../../../external/com_google_absl/absl/ ${FAST_EXTERNAL_INSTALL_DIR}/include/ -Rf"
-+ #)
-+ #endif()
-+ #endif(WIN32)
-
++#if(WIN32)
++# set(GIT_EXECUTABLE "git.exe")
++# # Use CMake to build tensorflow on windows
++# if(FAST_BUILD_TensorFlow_CPU OR FAST_BUILD_TensorFlow_CUDA)
++# ExternalProject_Add(tensorflow_download
++# PREFIX ${FAST_EXTERNAL_BUILD_DIR}/tensorflow
++# BINARY_DIR ${FAST_EXTERNAL_BUILD_DIR}/tensorflow
++# GIT_REPOSITORY "https://github.com/smistad/tensorflow.git"
++# GIT_TAG "fast-updated"
++# UPDATE_COMMAND ""
++# CONFIGURE_COMMAND ""
++# BUILD_COMMAND ""
++# INSTALL_COMMAND ""
++# )
++# endif()
++# if(FAST_BUILD_TensorFlow_CPU)
++#
++# ExternalProject_Add(tensorflow_CPU
++# DEPENDS tensorflow_download
++# PREFIX ${FAST_EXTERNAL_BUILD_DIR}/tensorflow
++# BINARY_DIR ${FAST_EXTERNAL_BUILD_DIR}/tensorflow
++# DOWNLOAD_COMMAND ""
++# UPDATE_COMMAND ""
++# CONFIGURE_COMMAND
++# echo "Configuring TensorFlow..." COMMAND
++# cd ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/ COMMAND
++# ${PROJECT_SOURCE_DIR}/cmake/TensorflowConfigureCPU.bat COMMAND
++# echo "Done TF configure"
++# BUILD_COMMAND
++# echo "Building tensorflow with bazel for CPU.." COMMAND
++# cd ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/ COMMAND
++# bazel build --config=opt //tensorflow:tensorflow.dll
++# INSTALL_COMMAND
++# echo "Installing tensorflow binary" COMMAND
++# ${CMAKE_COMMAND} -E copy ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/bazel-bin/tensorflow/tensorflow.dll.if.lib ${FAST_EXTERNAL_INSTALL_DIR}/lib/tensorflow_CPU.lib COMMAND
++# ${CMAKE_COMMAND} -E copy ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/bazel-bin/external/protobuf_archive/protobuf.lib ${FAST_EXTERNAL_INSTALL_DIR}/lib/protobuf.lib COMMAND
++# ${CMAKE_COMMAND} -E copy ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/bazel-bin/tensorflow/tensorflow.dll ${FAST_EXTERNAL_INSTALL_DIR}/bin/tensorflow_CPU.dll COMMAND
++# echo "Installing tensorflow headers" COMMAND
++# ${CMAKE_COMMAND} -E copy_directory ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/tensorflow ${FAST_EXTERNAL_INSTALL_DIR}/include/tensorflow/ COMMAND
++# echo "Installing tensorflow generated headers" COMMAND
++# ${CMAKE_COMMAND} -E copy_directory ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/bazel-genfiles/tensorflow ${FAST_EXTERNAL_INSTALL_DIR}/include/tensorflow/ COMMAND
++# echo "Installing tensorflow third party headers" COMMAND
++# ${CMAKE_COMMAND} -E copy_directory ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/third_party/ ${FAST_EXTERNAL_INSTALL_DIR}/include/third_party/ COMMAND
++# #echo "Installing protobuf headers" COMMAND
++# #${CMAKE_COMMAND} -E copy_directory ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/bazel-tensorflow_download/external/protobuf_archive/src/google/ ${FAST_EXTERNAL_INSTALL_DIR}/include/google/ COMMAND
++# #echo "Installing nsync headers" COMMAND
++# #xcopy ${src} ${dest} /y COMMAND
++# echo "Installing absl headers" COMMAND
++# ${CMAKE_COMMAND} -E copy_directory ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/bazel-tensorflow_download/external/com_google_absl/absl/ ${FAST_EXTERNAL_INSTALL_DIR}/include/absl/
++# )
++# endif()
++#else(WIN32)
++# # Use bazel to build tensorflow on linux
++# set(GIT_EXECUTABLE "git")
++# if(FAST_BUILD_TensorFlow_CPU OR FAST_BUILD_TensorFlow_CUDA)
++# ExternalProject_Add(tensorflow_download
++# PREFIX ${FAST_EXTERNAL_BUILD_DIR}/tensorflow
++# BINARY_DIR ${FAST_EXTERNAL_BUILD_DIR}/tensorflow
++# GIT_REPOSITORY "https://github.com/smistad/tensorflow.git"
++# GIT_TAG "fast-updated"
++# UPDATE_COMMAND ""
++# CONFIGURE_COMMAND ""
++# BUILD_COMMAND ""
++# INSTALL_COMMAND ""
++# )
++# endif()
++# if(FAST_BUILD_TensorFlow_ROCm)
++# # Need a seperate repo for rocm atm
++# ExternalProject_Add(tensorflow_download_rocm
++# PREFIX ${FAST_EXTERNAL_BUILD_DIR}/tensorflow_rocm
++# BINARY_DIR ${FAST_EXTERNAL_BUILD_DIR}/tensorflow_rocm
++# GIT_REPOSITORY "https://github.com/ROCmSoftwarePlatform/tensorflow-upstream"
++# GIT_TAG "r1.14-rocm"
++# UPDATE_COMMAND ""
++# CONFIGURE_COMMAND ""
++# BUILD_COMMAND ""
++# INSTALL_COMMAND ""
++# )
++# ExternalProject_Add(tensorflow_ROCm
++# DEPENDS tensorflow_download_rocm
++# PREFIX ${FAST_EXTERNAL_BUILD_DIR}/tensorflow_rocm
++# BINARY_DIR ${FAST_EXTERNAL_BUILD_DIR}/tensorflow_rocm
++# DOWNLOAD_COMMAND ""
++# UPDATE_COMMAND ""
++# # Run TF configure in the form of a shell script.
++# CONFIGURE_COMMAND
++# cd ${FAST_EXTERNAL_BUILD_DIR}/tensorflow_rocm/src/tensorflow_download_rocm/ && sh ${PROJECT_SOURCE_DIR}/cmake/TensorflowConfigureROCm.sh
++# # Build using bazel
++# BUILD_COMMAND
++# echo "Building tensorflow with bazel and ROCm (AMD) GPU support" &&
++# cd ${FAST_EXTERNAL_BUILD_DIR}/tensorflow_rocm/src/tensorflow_download_rocm/ && bazel build -c opt --config=rocm //tensorflow:libtensorflow_cc.so
++# INSTALL_COMMAND
++# echo "Installing tensorflow binary" &&
++# cp -f ${FAST_EXTERNAL_BUILD_DIR}/tensorflow_rocm/src/tensorflow_download_rocm/bazel-bin/tensorflow/libtensorflow_cc.so.1.14.0 ${FAST_EXTERNAL_INSTALL_DIR}/lib/libtensorflow_cc_ROCm.so &&
++# cp -f ${FAST_EXTERNAL_BUILD_DIR}/tensorflow_rocm/src/tensorflow_download_rocm/bazel-bin/tensorflow/libtensorflow_framework.so.1.14.0 ${FAST_EXTERNAL_INSTALL_DIR}/lib/libtensorflow_framework_ROCm.so &&
++# chmod a+w ${FAST_EXTERNAL_INSTALL_DIR}/lib/libtensorflow_cc_ROCm.so &&
++# chmod a+w ${FAST_EXTERNAL_INSTALL_DIR}/lib/libtensorflow_framework_ROCm.so &&
++# patchelf --set-soname libtensorflow_cc_ROCm.so ${FAST_EXTERNAL_INSTALL_DIR}/lib/libtensorflow_cc_ROCm.so &&
++# patchelf --set-soname libtensorflow_framework_ROCm.so ${FAST_EXTERNAL_INSTALL_DIR}/lib/libtensorflow_framework_ROCm.so &&
++# patchelf --replace-needed libtensorflow_framework.so.1 libtensorflow_framework_ROCm.so ${FAST_EXTERNAL_INSTALL_DIR}/lib/libtensorflow_cc_ROCm.so &&
++# echo "Installing tensorflow headers" &&
++# cp -rf ${FAST_EXTERNAL_BUILD_DIR}/tensorflow_rocm/src/tensorflow_download_rocm/tensorflow/ ${FAST_EXTERNAL_INSTALL_DIR}/include/ &&
++# echo "Installing tensorflow generated headers" &&
++# cp -rf ${FAST_EXTERNAL_BUILD_DIR}/tensorflow_rocm/src/tensorflow_download_rocm/bazel-genfiles/tensorflow/ ${FAST_EXTERNAL_INSTALL_DIR}/include/ &&
++# echo "Installing tensorflow third_party headers" &&
++# cp -rf ${FAST_EXTERNAL_BUILD_DIR}/tensorflow_rocm/src/tensorflow_download_rocm/third_party/ ${FAST_EXTERNAL_INSTALL_DIR}/include/ &&
++# echo "Installing protobuf headers" &&
++# bash -c "cp $(readlink -f ${FAST_EXTERNAL_BUILD_DIR}/tensorflow_rocm/src/tensorflow_download_rocm/bazel-out/)/../../../external/protobuf_archive/src/google/ ${FAST_EXTERNAL_INSTALL_DIR}/include/ -Rf" &&
++# #echo "Installing nsync headers" &&
++# #bash -c "cp $(readlink -f ${FAST_EXTERNAL_BUILD_DIR}/tensorflow_rocm/src/tensorflow_download_rocm/bazel-out/)/../../../external/nsync/public/*.h ${FAST_EXTERNAL_INSTALL_DIR}/include/ -Rf" &&
++# echo "Installing absl headers" &&
++# bash -c "cp $(readlink -f ${FAST_EXTERNAL_BUILD_DIR}/tensorflow_rocm/src/tensorflow_download_rocm/bazel-out/)/../../../external/com_google_absl/absl/ ${FAST_EXTERNAL_INSTALL_DIR}/include/ -Rf"
++# )
++# endif()
++# if(FAST_BUILD_TensorFlow_CUDA)
++# ExternalProject_Add(tensorflow_CUDA
++# DEPENDS tensorflow_download
++# PREFIX ${FAST_EXTERNAL_BUILD_DIR}/tensorflow
++# BINARY_DIR ${FAST_EXTERNAL_BUILD_DIR}/tensorflow
++# DOWNLOAD_COMMAND ""
++# UPDATE_COMMAND ""
++# # Run TF configure in the form of a shell script. CUDA should be installed in /usr/local/cuda
++# CONFIGURE_COMMAND
++# cd ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/ && sh ${PROJECT_SOURCE_DIR}/cmake/TensorflowConfigureCUDA.sh
++# # Build using bazel
++# BUILD_COMMAND
++# echo "Building tensorflow with bazel and CUDA GPU support" &&
++# cd ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/ && bazel build -c opt --config=cuda --copt=-mfpmath=both --copt=-march=core-avx2 //tensorflow:libtensorflow_cc.so
++# INSTALL_COMMAND
++# echo "Installing tensorflow binary" &&
++# cp -f ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/bazel-bin/tensorflow/libtensorflow_cc.so.1.14.0 ${FAST_EXTERNAL_INSTALL_DIR}/lib/libtensorflow_cc_CUDA.so &&
++# cp -f ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/bazel-bin/tensorflow/libtensorflow_framework.so.1.14.0 ${FAST_EXTERNAL_INSTALL_DIR}/lib/libtensorflow_framework_CUDA.so &&
++# chmod a+w ${FAST_EXTERNAL_INSTALL_DIR}/lib/libtensorflow_cc_CUDA.so &&
++# chmod a+w ${FAST_EXTERNAL_INSTALL_DIR}/lib/libtensorflow_framework_CUDA.so &&
++# patchelf --set-soname libtensorflow_cc_CUDA.so ${FAST_EXTERNAL_INSTALL_DIR}/lib/libtensorflow_cc_CUDA.so &&
++# patchelf --set-soname libtensorflow_framework_CUDA.so ${FAST_EXTERNAL_INSTALL_DIR}/lib/libtensorflow_framework_CUDA.so &&
++# patchelf --replace-needed libtensorflow_framework.so.1 libtensorflow_framework_CUDA.so ${FAST_EXTERNAL_INSTALL_DIR}/lib/libtensorflow_cc_CUDA.so &&
++# #echo "Installing mkl binaries" &&
++# #bash -c "cp $(readlink -f ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/bazel-out/)/../../../external/mkl/lib/libmklml_intel.so ${FAST_EXTERNAL_INSTALL_DIR}/lib/ -Rf" &&
++# #bash -c "cp $(readlink -f ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/bazel-out/)/../../../external/mkl/lib/libiomp5.so ${FAST_EXTERNAL_INSTALL_DIR}/lib/ -Rf" &&
++# echo "Installing tensorflow headers" &&
++# cp -rf ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/tensorflow/ ${FAST_EXTERNAL_INSTALL_DIR}/include/ &&
++# echo "Installing tensorflow generated headers" &&
++# cp -rf ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/bazel-genfiles/tensorflow/ ${FAST_EXTERNAL_INSTALL_DIR}/include/ &&
++# echo "Installing tensorflow third_party headers" &&
++# cp -rf ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/third_party/ ${FAST_EXTERNAL_INSTALL_DIR}/include/ &&
++# echo "Installing protobuf headers" &&
++# bash -c "cp $(readlink -f ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/bazel-out/)/../../../external/protobuf_archive/src/google/ ${FAST_EXTERNAL_INSTALL_DIR}/include/ -Rf" &&
++# #echo "Installing nsync headers" &&
++# #bash -c "cp $(readlink -f ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/bazel-out/)/../../../external/nsync/public/*.h ${FAST_EXTERNAL_INSTALL_DIR}/include/ -Rf" &&
++# echo "Installing absl headers" &&
++# bash -c "cp $(readlink -f ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/bazel-out/)/../../../external/com_google_absl/absl/ ${FAST_EXTERNAL_INSTALL_DIR}/include/ -Rf"
++# )
++# endif()
++# if(FAST_BUILD_TensorFlow_CPU)
++# ExternalProject_Add(tensorflow_CPU
++# DEPENDS tensorflow_download
++# PREFIX ${FAST_EXTERNAL_BUILD_DIR}/tensorflow
++# BINARY_DIR ${FAST_EXTERNAL_BUILD_DIR}/tensorflow
++# DOWNLOAD_COMMAND ""
++# UPDATE_COMMAND ""
++# # Run TF configure in the form of a shell script.
++# CONFIGURE_COMMAND
++# cd ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/ && sh ${PROJECT_SOURCE_DIR}/cmake/TensorflowConfigureCPU.sh
++# # Build using bazel
++# BUILD_COMMAND
++# echo "Building tensorflow with bazel for CPU" &&
++# cd ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/ && bazel build --config=opt --copt=-mfpmath=both --copt=-march=core-avx2 //tensorflow:libtensorflow_cc.so
++# INSTALL_COMMAND
++# echo "Installing tensorflow binary" &&
++# cp -f ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/bazel-bin/tensorflow/libtensorflow_cc.so.1.14.0 ${FAST_EXTERNAL_INSTALL_DIR}/lib/libtensorflow_cc_CPU.so &&
++# cp -f ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/bazel-bin/tensorflow/libtensorflow_framework.so.1.14.0 ${FAST_EXTERNAL_INSTALL_DIR}/lib/libtensorflow_framework_CPU.so &&
++# chmod a+w ${FAST_EXTERNAL_INSTALL_DIR}/lib/libtensorflow_cc_CPU.so &&
++# chmod a+w ${FAST_EXTERNAL_INSTALL_DIR}/lib/libtensorflow_framework_CPU.so &&
++# patchelf --set-soname libtensorflow_cc_CPU.so ${FAST_EXTERNAL_INSTALL_DIR}/lib/libtensorflow_cc_CPU.so &&
++# patchelf --set-soname libtensorflow_framework_CPU.so ${FAST_EXTERNAL_INSTALL_DIR}/lib/libtensorflow_framework_CPU.so &&
++# patchelf --replace-needed libtensorflow_framework.so.1 libtensorflow_framework_CPU.so ${FAST_EXTERNAL_INSTALL_DIR}/lib/libtensorflow_cc_CPU.so &&
++# echo "Installing tensorflow headers" &&
++# cp -rf ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/tensorflow/ ${FAST_EXTERNAL_INSTALL_DIR}/include/ &&
++# echo "Installing tensorflow generated headers" &&
++# cp -rf ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/bazel-genfiles/tensorflow/ ${FAST_EXTERNAL_INSTALL_DIR}/include/ &&
++# echo "Installing tensorflow third_party headers" &&
++# cp -rf ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/third_party/ ${FAST_EXTERNAL_INSTALL_DIR}/include/ &&
++# echo "Installing protobuf headers" &&
++# bash -c "cp $(readlink -f ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/bazel-out/)/../../../external/protobuf_archive/src/google/ ${FAST_EXTERNAL_INSTALL_DIR}/include/ -Rf" &&
++# #echo "Installing nsync headers" &&
++# #bash -c "cp $(readlink -f ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/bazel-out/)/../../../external/nsync/public/*.h ${FAST_EXTERNAL_INSTALL_DIR}/include/ -Rf" &&
++# echo "Installing absl headers" &&
++# bash -c "cp $(readlink -f ${FAST_EXTERNAL_BUILD_DIR}/tensorflow/src/tensorflow_download/bazel-out/)/../../../external/com_google_absl/absl/ ${FAST_EXTERNAL_INSTALL_DIR}/include/ -Rf"
++# )
++# endif()
++#endif(WIN32)
Index: fast/cmake/ExternalDCMTK.cmake
===================================================================
---- fast.orig/cmake/ExternalDCMTK.cmake 2019-08-09 02:35:51.324008777 +0100
-+++ fast/cmake/ExternalDCMTK.cmake 2019-08-09 02:47:25.669716111 +0100
+--- fast.orig/cmake/ExternalDCMTK.cmake 2019-08-11 12:39:37.925221619 +0100
++++ fast/cmake/ExternalDCMTK.cmake 2019-08-11 12:39:37.921221585 +0100
@@ -1,36 +1,36 @@
# Download and set up DCMTK
@@ -663,3 +660,46 @@ Index: fast/cmake/ExternalDCMTK.cmake
+#endif(WIN32)
+#list(APPEND LIBRARIES ${DCMTK_LIBRARIES})
+#list(APPEND FAST_EXTERNAL_DEPENDENCIES dcmtk)
+Index: fast/cmake/ExternalEigen.cmake
+===================================================================
+--- fast.orig/cmake/ExternalEigen.cmake 2019-08-11 12:39:37.925221619 +0100
++++ fast/cmake/ExternalEigen.cmake 2019-08-11 12:39:37.921221585 +0100
+@@ -1,21 +1,21 @@
+ # Download and set up Eigen
+
+-include(cmake/Externals.cmake)
++#include(cmake/Externals.cmake)
+
+-ExternalProject_Add(eigen
+- PREFIX ${FAST_EXTERNAL_BUILD_DIR}/eigen
+- BINARY_DIR ${FAST_EXTERNAL_BUILD_DIR}/eigen
+- #GIT_REPOSITORY "https://github.com/RLovelett/eigen.git"
+- #GIT_TAG "a46d2e7337c4656f00abe54a8115f6d76153a048"
+- URL "https://bitbucket.org/eigen/eigen/get/b4890dc.tar.gz"
+- INSTALL_DIR ${FAST_EXTERNAL_INSTALL_DIR}
+- CMAKE_CACHE_ARGS
+- -DCMAKE_BUILD_TYPE:STRING=Release
+- -DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF
+- -DCMAKE_INSTALL_MESSAGE:BOOL=LAZY
+- -DCMAKE_INSTALL_PREFIX:STRING=${FAST_EXTERNAL_INSTALL_DIR}
+- -DBUILD_TESTING:BOOL=OFF
+-)
++#ExternalProject_Add(eigen
++# PREFIX ${FAST_EXTERNAL_BUILD_DIR}/eigen
++# BINARY_DIR ${FAST_EXTERNAL_BUILD_DIR}/eigen
++# #GIT_REPOSITORY "https://github.com/RLovelett/eigen.git"
++# #GIT_TAG "a46d2e7337c4656f00abe54a8115f6d76153a048"
++# URL "https://bitbucket.org/eigen/eigen/get/b4890dc.tar.gz"
++# INSTALL_DIR ${FAST_EXTERNAL_INSTALL_DIR}
++# CMAKE_CACHE_ARGS
++# -DCMAKE_BUILD_TYPE:STRING=Release
++# -DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF
++# -DCMAKE_INSTALL_MESSAGE:BOOL=LAZY
++# -DCMAKE_INSTALL_PREFIX:STRING=${FAST_EXTERNAL_INSTALL_DIR}
++# -DBUILD_TESTING:BOOL=OFF
++#)
+
+-list(APPEND FAST_INCLUDE_DIRS ${FAST_EXTERNAL_INSTALL_DIR}/include/eigen3/)
+-list(APPEND FAST_EXTERNAL_DEPENDENCIES eigen)
++#list(APPEND FAST_INCLUDE_DIRS ${FAST_EXTERNAL_INSTALL_DIR}/include/eigen3/)
++#list(APPEND FAST_EXTERNAL_DEPENDENCIES eigen)
=====================================
debian/patches/remove_unneeded_installs.patch
=====================================
@@ -6,9 +6,9 @@ Last-Update: 2019-08-08
Index: fast/cmake/InstallFAST.cmake
===================================================================
---- fast.orig/cmake/InstallFAST.cmake 2019-08-10 14:33:29.761600902 +0100
-+++ fast/cmake/InstallFAST.cmake 2019-08-10 14:33:57.401871110 +0100
-@@ -47,9 +47,9 @@
+--- fast.orig/cmake/InstallFAST.cmake 2019-08-11 12:39:38.341225233 +0100
++++ fast/cmake/InstallFAST.cmake 2019-08-11 12:39:38.337225198 +0100
+@@ -50,9 +50,9 @@
endif()
# Install Qt plugins
@@ -21,7 +21,7 @@ Index: fast/cmake/InstallFAST.cmake
# Install qt.conf
install(FILES ${PROJECT_SOURCE_DIR}/cmake/InstallFiles/qt.conf
-@@ -81,10 +81,10 @@
+@@ -84,10 +84,10 @@
DESTINATION fast/include/
FILES_MATCHING PATTERN "*.hpp"
)
@@ -36,7 +36,7 @@ Index: fast/cmake/InstallFAST.cmake
-@@ -179,36 +179,36 @@
+@@ -182,36 +182,36 @@
# Install license files for depedencies
# Qt5
@@ -96,7 +96,7 @@ Index: fast/cmake/InstallFAST.cmake
if(FAST_MODULE_TensorFlow)
# Tensorflow license
-@@ -217,8 +217,8 @@
+@@ -220,8 +220,8 @@
)
endif()
=====================================
debian/patches/series
=====================================
@@ -1,4 +1,3 @@
-fix_test.patch
fix_source_openigtlink.patch
prevent_cmake_downloading.patch
remove_unneeded_installs.patch
=====================================
debian/patches/set_cmake_options.patch
=====================================
@@ -6,8 +6,8 @@ Last-Update: 2019-08-08
Index: fast/CMakeLists.txt
===================================================================
---- fast.orig/CMakeLists.txt 2019-08-11 07:16:23.604778105 +0100
-+++ fast/CMakeLists.txt 2019-08-11 07:16:41.540933812 +0100
+--- fast.orig/CMakeLists.txt 2019-08-11 12:39:38.949230514 +0100
++++ fast/CMakeLists.txt 2019-08-11 12:39:38.945230480 +0100
@@ -18,7 +18,7 @@
option(FAST_BUILD_TESTS "Build FAST tests." ON)
option(FAST_BUILD_EXAMPLES "Build examples." OFF)
=====================================
debian/patches/use_system_libs.patch
=====================================
@@ -5,8 +5,8 @@ Author: Shayan Doust <hello at shayandoust.me>
Index: fast/CMakeLists.txt
===================================================================
---- fast.orig/CMakeLists.txt 2019-08-09 05:56:37.211023586 +0100
-+++ fast/CMakeLists.txt 2019-08-09 05:57:42.647561464 +0100
+--- fast.orig/CMakeLists.txt 2019-08-11 12:39:38.645227873 +0100
++++ fast/CMakeLists.txt 2019-08-11 12:39:38.641227839 +0100
@@ -34,7 +34,7 @@
option(FAST_MODULE_WholeSlideImaging "Build whole slide imaging module" OFF)
option(FAST_MODULE_Clarius "Build clarius ultrasound module" OFF)
View it on GitLab: https://salsa.debian.org/med-team/fast/compare/2209ae2c6ffbf0c14cd147730a662a482ef3a5ec...49dd3f60c1dee6ecbdf4e17b895c4cf540bc1d53
--
View it on GitLab: https://salsa.debian.org/med-team/fast/compare/2209ae2c6ffbf0c14cd147730a662a482ef3a5ec...49dd3f60c1dee6ecbdf4e17b895c4cf540bc1d53
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20190811/4e9c55c5/attachment-0001.html>
More information about the debian-med-commit
mailing list