aboutsummaryrefslogtreecommitdiffhomepage
path: root/tensorflow
diff options
context:
space:
mode:
Diffstat (limited to 'tensorflow')
-rw-r--r--tensorflow/tools/docker/Dockerfile.devel12
-rw-r--r--tensorflow/tools/docker/Dockerfile.devel-gpu14
-rwxr-xr-xtensorflow/tools/docker/parameterized_docker_build.sh27
3 files changed, 33 insertions, 20 deletions
diff --git a/tensorflow/tools/docker/Dockerfile.devel b/tensorflow/tools/docker/Dockerfile.devel
index e14653d58a..688b52e901 100644
--- a/tensorflow/tools/docker/Dockerfile.devel
+++ b/tensorflow/tools/docker/Dockerfile.devel
@@ -6,6 +6,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
build-essential \
curl \
git \
+ libcurl3-dev \
libfreetype6-dev \
libpng12-dev \
libzmq3-dev \
@@ -67,7 +68,7 @@ RUN echo "build --spawn_strategy=standalone --genrule_strategy=standalone" \
>>/root/.bazelrc
ENV BAZELRC /root/.bazelrc
# Install the most recent bazel release.
-ENV BAZEL_VERSION 0.3.1
+ENV BAZEL_VERSION 0.3.2
WORKDIR /
RUN mkdir /bazel && \
cd /bazel && \
@@ -80,7 +81,7 @@ RUN mkdir /bazel && \
# Download and build TensorFlow.
-RUN git clone --recursive https://github.com/tensorflow/tensorflow.git && \
+RUN git clone https://github.com/tensorflow/tensorflow.git && \
cd tensorflow && \
git checkout r0.11
WORKDIR /tensorflow
@@ -89,10 +90,13 @@ WORKDIR /tensorflow
# more difficult to experiment with local changes. Instead, just add
# the built directory to the path.
-RUN ./configure && \
+RUN tensorflow/tools/ci_build/builds/configured CPU \
bazel build -c opt tensorflow/tools/pip_package:build_pip_package && \
bazel-bin/tensorflow/tools/pip_package/build_pip_package /tmp/pip && \
- pip install --upgrade /tmp/pip/tensorflow-*.whl
+ pip install --upgrade /tmp/pip/tensorflow-*.whl && \
+ rm -rf /tmp/pip && \
+ rm -rf /root/.cache
+# Clean up pip wheel and Bazel cache when done.
# TensorBoard
EXPOSE 6006
diff --git a/tensorflow/tools/docker/Dockerfile.devel-gpu b/tensorflow/tools/docker/Dockerfile.devel-gpu
index 01e22412a3..8693059369 100644
--- a/tensorflow/tools/docker/Dockerfile.devel-gpu
+++ b/tensorflow/tools/docker/Dockerfile.devel-gpu
@@ -6,6 +6,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
build-essential \
curl \
git \
+ libcurl3-dev \
libfreetype6-dev \
libpng12-dev \
libzmq3-dev \
@@ -31,6 +32,8 @@ RUN pip --no-cache-dir install \
jupyter \
matplotlib \
numpy \
+ scipy \
+ sklearn \
&& \
python -m ipykernel.kernelspec
@@ -66,7 +69,7 @@ RUN echo "build --spawn_strategy=standalone --genrule_strategy=standalone" \
>>/root/.bazelrc
ENV BAZELRC /root/.bazelrc
# Install the most recent bazel release.
-ENV BAZEL_VERSION 0.3.1
+ENV BAZEL_VERSION 0.3.2
WORKDIR /
RUN mkdir /bazel && \
cd /bazel && \
@@ -79,7 +82,7 @@ RUN mkdir /bazel && \
# Download and build TensorFlow.
-RUN git clone -b r0.11 --recursive --recurse-submodules https://github.com/tensorflow/tensorflow.git && \
+RUN git clone https://github.com/tensorflow/tensorflow.git && \
cd tensorflow && \
git checkout r0.11
WORKDIR /tensorflow
@@ -89,10 +92,13 @@ ENV LD_LIBRARY_PATH /usr/local/cuda/extras/CUPTI/lib64:$LD_LIBRARY_PATH
ENV TF_NEED_CUDA 1
ENV TF_CUDA_COMPUTE_CAPABILITIES=3.0,3.5,5.2
-RUN ./configure && \
+RUN tensorflow/tools/ci_build/builds/configured GPU \
bazel build -c opt --config=cuda tensorflow/tools/pip_package:build_pip_package && \
bazel-bin/tensorflow/tools/pip_package/build_pip_package /tmp/pip && \
- pip install --upgrade /tmp/pip/tensorflow-*.whl
+ pip install --upgrade /tmp/pip/tensorflow-*.whl && \
+ rm -rf /tmp/pip && \
+ rm -rf /root/.cache
+# Clean up pip wheel and Bazel cache when done.
WORKDIR /root
diff --git a/tensorflow/tools/docker/parameterized_docker_build.sh b/tensorflow/tools/docker/parameterized_docker_build.sh
index 30a6bca4d4..8d6099547c 100755
--- a/tensorflow/tools/docker/parameterized_docker_build.sh
+++ b/tensorflow/tools/docker/parameterized_docker_build.sh
@@ -128,8 +128,10 @@ else
fi
if [[ ${TF_DOCKER_BUILD_TYPE} == "cpu" ]]; then
- :
+ DOCKER_BINARY="docker"
elif [[ ${TF_DOCKER_BUILD_TYPE} == "gpu" ]]; then
+ DOCKER_BINARY="nvidia-docker"
+
FINAL_TAG="${FINAL_TAG}-gpu"
if [[ ${ORIG_DOCKERFILE} == *"."* ]]; then
# There is already a dot in the tag, use "-"
@@ -243,17 +245,18 @@ fi
IMG="${USER}/tensorflow:${FINAL_TAG}"
echo "Building docker image with image name and tag: ${IMG}"
-docker build --no-cache -t "${IMG}" -f "${DOCKERFILE}" "${TMP_DIR}"
+"${DOCKER_BINARY}" build --no-cache -t "${IMG}" -f "${DOCKERFILE}" "${TMP_DIR}"
if [[ $? == "0" ]]; then
- echo "docker build of ${IMG} succeeded"
+ echo "${DOCKER_BINARY} build of ${IMG} succeeded"
else
- die "FAIL: docker build of ${IMG} with Dockerfile ${DOCKERFILE} failed"
+ die "FAIL: ${DOCKER_BINARY} build of ${IMG} with Dockerfile ${DOCKERFILE} "\
+"failed"
fi
# Make sure that there is no other containers of the same image running
# TODO(cais): Move to an earlier place.
-if [[ ! -z $(docker ps | grep "${IMG}") ]]; then
+if [[ ! -z $("${DOCKER_BINARY}" ps | grep "${IMG}") ]]; then
die "ERROR: It appears that there are docker containers of the image "\
"${IMG} running. Please stop them before proceeding"
fi
@@ -266,7 +269,7 @@ echo " (Log file is at: ${DOCKER_RUN_LOG}"
echo ""
if [[ "${TF_DOCKER_BUILD_IS_DEVEL}" == "no" ]]; then
- docker run --rm -p ${CONTAINER_PORT}:${CONTAINER_PORT} \
+ "${DOCKER_BINARY}" run --rm -p ${CONTAINER_PORT}:${CONTAINER_PORT} \
-v ${TMP_DIR}/notebooks:/root/notebooks "${IMG}" \
2>&1 > "${DOCKER_RUN_LOG}" &
@@ -275,7 +278,7 @@ if [[ "${TF_DOCKER_BUILD_IS_DEVEL}" == "no" ]]; then
while [[ -z ${CONTAINER_ID} ]]; do
sleep 1
echo "Polling for container ID..."
- CONTAINER_ID=$(docker ps | grep "${IMG}" | awk '{print $1}')
+ CONTAINER_ID=$("${DOCKER_BINARY}" ps | grep "${IMG}" | awk '{print $1}')
done
echo "ID of the running docker container: ${CONTAINER_ID}"
@@ -301,10 +304,10 @@ if [[ "${TF_DOCKER_BUILD_IS_DEVEL}" == "no" ]]; then
# Stop the running docker container
sleep 1
- docker stop --time=0 ${CONTAINER_ID}
+ "${DOCKER_BINARY}" stop --time=0 ${CONTAINER_ID}
else
- docker run --rm -p ${CONTAINER_PORT}:${CONTAINER_PORT} \
+ "${DOCKER_BINARY}" run --rm -p ${CONTAINER_PORT}:${CONTAINER_PORT} \
-v ${TMP_DIR}/notebooks:/root/notebooks "${IMG}" \
bash -c \
"cd /tensorflow; tensorflow/tools/ci_build/builds/test_tutorials.sh"
@@ -332,9 +335,9 @@ fi
# Apply the final image name and tag
FINAL_IMG="${FINAL_IMAGE_NAME}:${FINAL_TAG}"
-DOCKER_VER=$(docker version | grep Version | head -1 | awk '{print $NF}')
+DOCKER_VER=$("${DOCKER_BINARY}" version | grep Version | head -1 | awk '{print $NF}')
if [[ -z "${DOCKER_VER}" ]]; then
- die "ERROR: Failed to determine docker version"
+ die "ERROR: Failed to determine ${DOCKER_BINARY} version"
fi
DOCKER_MAJOR_VER=$(echo "${DOCKER_VER}" | cut -d. -f 1)
DOCKER_MINOR_VER=$(echo "${DOCKER_VER}" | cut -d. -f 2)
@@ -345,7 +348,7 @@ if [[ "${DOCKER_MAJOR_VER}" -le 1 ]] && \
FORCE_TAG="--force"
fi
-docker tag ${FORCE_TAG} "${IMG}" "${FINAL_IMG}" || \
+"${DOCKER_BINARY}" tag ${FORCE_TAG} "${IMG}" "${FINAL_IMG}" || \
die "Failed to tag intermediate docker image ${IMG} as ${FINAL_IMG}"
echo ""
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-26 02:13:35 +0000