Skip to content
This repository was archived by the owner on Jul 1, 2023. It is now read-only.

build: bump to CMake 3.16, centralise artifacts #1063

Merged
merged 1 commit into from
Aug 19, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.15.1)
cmake_minimum_required(VERSION 3.16.0)
project(TensorFlow
LANGUAGES Swift)

Expand All @@ -18,6 +18,9 @@ endif()

list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/modules)

set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
set(CMAKE_Swift_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/swift)

option(USE_BUNDLED_X10
Expand Down
7 changes: 2 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ For more models, go to [**tensorflow/swift-models**][swift-models].
(between `_TF_MIN_BAZEL_VERSION` and `_TF_MAX_BAZEL_VERSION` as specified in
[tensorflow/configure.py][configure.py]).
* Python3 with [numpy][numpy].
* CMake. CMake 3.16 or newer is required to build with CMake.

### Building and testing

Expand All @@ -117,11 +118,7 @@ $ swift test

*Note: CMake is required for building X10 modules.*

In-tree builds are not supported. The instructions here expect CMake 3.16
or newer, although the minimum required version is 3.15.1. Older releases
will not allow the use of the `-B` option to specific the build tree and
require that you are in the location of the build tree (and the `-B` option
and its argument are elided).
In-tree builds are not supported.

*Note: To enable CUDA support, run `export TF_NEED_CUDA=1` before the steps below.*

Expand Down