Skip to content

Commit

Permalink
Merge pull request #9584 from helinwang/with_fluid
Browse files Browse the repository at this point in the history
TeamCity build: handle case when WITH_FLUID_ONLY=OFF
  • Loading branch information
helinwang authored Apr 3, 2018
2 parents 37d9a72 + 974908f commit a4e437d
Showing 1 changed file with 13 additions and 3 deletions.
16 changes: 13 additions & 3 deletions paddle/scripts/docker/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,9 @@ EOF
# make install should also be test when unittest
make install -j `nproc`
pip install /usr/local/opt/paddle/share/wheels/*.whl
paddle version
if [[ ${WITH_FLUID_ONLY:-OFF} == "OFF" ]] ; then
paddle version
fi
fi
}

Expand Down Expand Up @@ -183,6 +185,14 @@ EOF
NCCL_DEPS=""
fi

if [[ ${WITH_FLUID_ONLY:-OFF} == "OFF" ]]; then
PADDLE_VERSION="paddle version"
CMD='"paddle", "version"'
else
PADDLE_VERSION="true"
CMD='"true"'
fi

cat >> /paddle/build/Dockerfile <<EOF
ADD python/dist/*.whl /
# run paddle version to install python packages first
Expand All @@ -192,15 +202,15 @@ EOF
pip install /*.whl; apt-get install -f -y && \
apt-get clean -y && \
rm -f /*.whl && \
paddle version && \
${PADDLE_VERSION} && \
ldconfig
${DOCKERFILE_CUDNN_DSO}
${DOCKERFILE_GPU_ENV}
ENV NCCL_LAUNCH_MODE PARALLEL
ADD go/cmd/pserver/pserver /usr/bin/
ADD go/cmd/master/master /usr/bin/
# default command shows the paddle version and exit
CMD ["paddle", "version"]
CMD [${CMD}]
EOF
}

Expand Down

0 comments on commit a4e437d

Please sign in to comment.