Skip to content

[tensorflow-cc] fix build issues on Windows #12546

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
strega-nil merged 11 commits into from
Aug 7, 2020
Merged

[tensorflow-cc] fix build issues on Windows #12546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
0ab169d
fix build issues occurring from default bazel config being used becau…
Jul 23, 2020
543e19d
[tensorflow-cc] Update CONTROL and ci.baseline.txt
LilyWangL Jul 24, 2020
820c455
fix also applies to windows static build
Jul 24, 2020
fec41d4
Revert "fix also applies to windows static build"
Jul 30, 2020
581ab3d
leave variables unset in order to let bazel auto-detect them the same…
Jul 30, 2020
70b26dd
bazel VC auto-detect doesn't work (it ends up in a dev command prompt…
Aug 4, 2020
71809d1
Merge branch 'master' of https://github.com/microsoft/vcpkg into fix-…
LilyWangL Aug 5, 2020
d8fdade
see if updating really outdated bazel fixes finding correct VC tools …
Aug 5, 2020
3be391c
Merge branch 'fix-ms-build-issues' of https://github.com/jgehw/vcpkg …
Aug 5, 2020
9ded366
setting x64-windows CI to fail again
jgehw Aug 6, 2020
6d7b640
revert bazel upgrade as tensorflow v1.14 requires outdated bazel 0.25
jgehw Aug 6, 2020
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
3 changes: 2 additions & 1 deletion ports/tensorflow-cc/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
Source: tensorflow-cc
Version: 1.14-3
Version: 1.14
Port-Version: 4
Description: Library for computation using data flow graphs for scalable machine learning
Build-Depends: c-ares
Supports: !x86
3 changes: 2 additions & 1 deletion ports/tensorflow-cc/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ if(CMAKE_HOST_WIN32)

set(ENV{BAZEL_VS} $ENV{VSInstallDir})
set(ENV{BAZEL_VC} $ENV{VCInstallDir})
set(ENV{BAZEL_VC_FULL_VERSION} $ENV{VCToolsVersion})
endif()

# tensorflow has long file names, which will not work on windows
Expand Down Expand Up @@ -79,7 +80,7 @@ set(ENV{TF_CONFIGURE_IOS} 0)
message(STATUS "Configuring TensorFlow")

vcpkg_execute_required_process(
COMMAND ${PYTHON3} ${SOURCE_PATH}/configure.py
COMMAND ${PYTHON3} ${SOURCE_PATH}/configure.py --workspace "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel"
WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel
LOGNAME config-${TARGET_TRIPLET}-rel
)
Expand Down