diff --git a/.gitignore b/.gitignore index be0a287a8e3..e3d6df93c18 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ node_modules /.bazelrc /.tf_configure.bazelrc /bazel-* +/bazel_pip /third_party/eigen3/mkl_include /third_party/mkl/* /third_party/py/numpy/numpy_include diff --git a/configure b/configure index 4e66e952c2b..05be9dc29b2 100755 --- a/configure +++ b/configure @@ -210,8 +210,8 @@ if [ "$TF_NEED_MKL" == "1" ]; then # TF_NEED_MKL ARCHIVE_BASENAME=mklml_lnx_2018.0.20170425.tgz GITHUB_RELEASE_TAG=v0.7 MKLURL="https://github.com/01org/mkl-dnn/releases/download/$GITHUB_RELEASE_TAG/$ARCHIVE_BASENAME" - if ! [ -e "$DST/third_party/mkl/$ARCHIVE_BASENAME" ]; then - wget --no-check-certificate -P $DST/third_party/mkl/ $MKLURL + if ! [ -e "${DST}/third_party/mkl/${ARCHIVE_BASENAME}" ]; then + curl -fSsL -o "${DST}/third_party/mkl/${ARCHIVE_BASENAME}" "${MKLURL}" fi tar -xzf $DST/third_party/mkl/$ARCHIVE_BASENAME -C $DST/third_party/mkl/ extracted_dir_name="${ARCHIVE_BASENAME%.*}" diff --git a/tensorflow/tools/ci_build/builds/configured b/tensorflow/tools/ci_build/builds/configured index 9fcf9169026..25cb51ea7cc 100755 --- a/tensorflow/tools/ci_build/builds/configured +++ b/tensorflow/tools/ci_build/builds/configured @@ -28,12 +28,6 @@ set -e CONTAINER_TYPE=$( echo "$1" | tr '[:upper:]' '[:lower:]' ) shift 1 -# Enable support for MKL, for Linux only. -if [[ $(uname) == "Linux" ]]; then - export TF_NEED_MKL=1 - export TF_DOWNLOAD_MKL=1 -fi - # Enable support for Google Cloud Platform (GCP) export TF_NEED_GCP=1 # Enable support for HDFS