diff options
Diffstat (limited to 'tensorflow/contrib')
-rw-r--r-- | tensorflow/contrib/cmake/CMakeLists.txt | 3 | ||||
-rw-r--r-- | tensorflow/contrib/cmake/external/fft2d.cmake | 37 | ||||
-rw-r--r-- | tensorflow/contrib/cmake/patches/fft2d/CMakeLists.txt | 17 |
3 files changed, 0 insertions, 57 deletions
diff --git a/tensorflow/contrib/cmake/CMakeLists.txt b/tensorflow/contrib/cmake/CMakeLists.txt index 31a3d45a98..e27df6898e 100644 --- a/tensorflow/contrib/cmake/CMakeLists.txt +++ b/tensorflow/contrib/cmake/CMakeLists.txt @@ -108,7 +108,6 @@ include(eigen) include(gemmlowp) include(jsoncpp) include(farmhash) -include(fft2d) include(highwayhash) include(protobuf) if (tensorflow_BUILD_CC_TESTS) @@ -122,7 +121,6 @@ set(tensorflow_EXTERNAL_LIBRARIES ${jpeg_STATIC_LIBRARIES} ${jsoncpp_STATIC_LIBRARIES} ${farmhash_STATIC_LIBRARIES} - ${fft2d_STATIC_LIBRARIES} ${highwayhash_STATIC_LIBRARIES} ${protobuf_STATIC_LIBRARIES} ) @@ -137,7 +135,6 @@ set(tensorflow_EXTERNAL_DEPENDENCIES protobuf eigen gemmlowp - fft2d ) include_directories( diff --git a/tensorflow/contrib/cmake/external/fft2d.cmake b/tensorflow/contrib/cmake/external/fft2d.cmake deleted file mode 100644 index 50c6b91684..0000000000 --- a/tensorflow/contrib/cmake/external/fft2d.cmake +++ /dev/null @@ -1,37 +0,0 @@ -include (ExternalProject) - -set(fft2d_URL http://www.kurims.kyoto-u.ac.jp/~ooura/fft.tgz) -set(fft2d_HASH SHA256=52bb637c70b971958ec79c9c8752b1df5ff0218a4db4510e60826e0cb79b5296) -set(fft2d_BUILD ${CMAKE_CURRENT_BINARY_DIR}/fft2d/) -set(fft2d_INSTALL ${CMAKE_CURRENT_BINARY_DIR}/fft2d/src) - -if(WIN32) - set(fft2d_STATIC_LIBRARIES ${fft2d_BUILD}/src/lib/fft2d.lib) - - ExternalProject_Add(fft2d - PREFIX fft2d - URL ${fft2d_URL} - URL_HASH ${fft2d_HASH} - DOWNLOAD_DIR "${DOWNLOAD_LOCATION}" - BUILD_IN_SOURCE 1 - PATCH_COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/patches/fft2d/CMakeLists.txt ${fft2d_BUILD}/src/fft2d/CMakeLists.txt - INSTALL_DIR ${fft2d_INSTALL} - CMAKE_CACHE_ARGS - -DCMAKE_BUILD_TYPE:STRING=Release - -DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF - -DCMAKE_INSTALL_PREFIX:STRING=${fft2d_INSTALL}) -else() - set(fft2d_STATIC_LIBRARIES ${fft2d_BUILD}/src/fft2d/libfft2d.a) - - ExternalProject_Add(fft2d - PREFIX fft2d - URL ${fft2d_URL} - URL_HASH ${fft2d_HASH} - DOWNLOAD_DIR "${DOWNLOAD_LOCATION}" - BUILD_IN_SOURCE 1 - PATCH_COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/patches/fft2d/CMakeLists.txt ${fft2d_BUILD}/src/fft2d/CMakeLists.txt - INSTALL_DIR $(fft2d_INSTALL) - INSTALL_COMMAND echo - BUILD_COMMAND $(MAKE)) - -endif() diff --git a/tensorflow/contrib/cmake/patches/fft2d/CMakeLists.txt b/tensorflow/contrib/cmake/patches/fft2d/CMakeLists.txt deleted file mode 100644 index b31ea3ed98..0000000000 --- a/tensorflow/contrib/cmake/patches/fft2d/CMakeLists.txt +++ /dev/null @@ -1,17 +0,0 @@ -cmake_minimum_required(VERSION 2.8.3) - -project(fft2d) - -set(CMAKE_POSITION_INDEPENDENT_CODE ON) - -set(FFT2D_SRCS - "fftsg.c" -) - -include_directories("${CMAKE_CURRENT_SOURCE_DIR}") - -add_library(fft2d ${FFT2D_SRCS}) - -install(TARGETS fft2d - LIBRARY DESTINATION lib COMPONENT RuntimeLibraries - ARCHIVE DESTINATION lib COMPONENT Development) |