Skip to content
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

Jump to bottom

Replace the docker check with an OS check. #14419

Merged
merged 2 commits into from
Nov 14, 2017
Merged

Replace the docker check with an OS check. #14419

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
82aabe8
Replace the docker check with an OS check.
Oct 31, 2017
909ed57
Merge branch 'r1.4' into mac_ci_param_fix
Nov 14, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions tensorflow/tools/ci_build/ci_parameterized_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,13 +201,13 @@ function get_cuda_capability_version() {
# Container type, e.g., CPU, GPU
CTYPE=${TF_BUILD_CONTAINER_TYPE}

# Determine if Docker is available
# Determine if the machine is a Mac
OPT_FLAG=""
if [[ -z "$(which docker)" ]]; then
if [[ "$(uname -s)" == "Darwin" ]]; then
DO_DOCKER=0

echo "It appears that Docker is not available on this system. "\
"Will perform build without Docker."
echo "It appears this machine is a Mac. "\
"We will perform this build without Docker."
echo "Also, the additional option flags will be applied to the build:"
echo " ${NO_DOCKER_OPT_FLAG}"
MAIN_CMD="${NO_DOCKER_MAIN_CMD} ${CTYPE}"
Expand Down