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.

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

Changes for r0.7 #1096

Merged
merged 1 commit into from Feb 14, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion tensorflow/core/public/version.h
Expand Up @@ -19,7 +19,7 @@ limitations under the License.
// TensorFlow uses semantic versioning, see http://semver.org/.

#define TF_MAJOR_VERSION 0
#define TF_MINOR_VERSION 6
#define TF_MINOR_VERSION 7
#define TF_PATCH_VERSION 0

// TF_VERSION_SUFFIX is non-empty for pre-releases (e.g. "-alpha", "-alpha.1",
Expand Down
3 changes: 2 additions & 1 deletion tensorflow/tools/ci_build/builds/configured
Expand Up @@ -24,7 +24,8 @@ CONTAINER_TYPE=$( echo "$1" | tr '[:upper:]' '[:lower:]' )
shift 1
COMMAND=("$@")

export PYTHON_BIN_PATH="${PYTHON_BIN_PATH:-$(which python)}"
export CI_BUILD_PYTHON="${CI_BUILD_PYTHON:-python}"
export PYTHON_BIN_PATH="${PYTHON_BIN_PATH:-$(which ${CI_BUILD_PYTHON})}"
if [ "${CONTAINER_TYPE}" == "gpu" ]; then
export TF_NEED_CUDA=1
else
Expand Down
3 changes: 2 additions & 1 deletion tensorflow/tools/ci_build/builds/with_the_same_user
Expand Up @@ -31,8 +31,9 @@ getent group "${CI_BUILD_GID}" || addgroup --gid "${CI_BUILD_GID}" "${CI_BUILD_G
getent passwd "${CI_BUILD_UID}" || adduser --gid "${CI_BUILD_GID}" --uid "${CI_BUILD_UID}" \
--gecos "${CI_BUILD_USER} (generated by with_the_same_user script)" \
--disabled-password --home "${CI_BUILD_HOME}" --quiet "${CI_BUILD_USER}"
sudo usermod -a -G sudo "${CI_BUILD_USER}"

cp /root/.bazelrc "${CI_BUILD_HOME}/.bazelrc"
chown "${CI_BUILD_UID}:${CI_BUILD_GID}" "${CI_BUILD_HOME}/.bazelrc"

sudo -u "#${CI_BUILD_UID}" --preserve-env -H ${COMMAND[@]}
sudo -u "#${CI_BUILD_UID}" --preserve-env "HOME=${CI_BUILD_HOME}" ${COMMAND[@]}
14 changes: 12 additions & 2 deletions tensorflow/tools/ci_build/ci_parameterized_build.sh
Expand Up @@ -92,6 +92,10 @@ BAZEL_TARGET="//tensorflow/..."

##########################################################

echo "Parameterized build starts at: $(date)"
echo ""
START_TIME=$(date +'%s')

# Convert all the required environment variables to lower case
TF_BUILD_CONTAINER_TYPE=$(to_lower ${TF_BUILD_CONTAINER_TYPE})
TF_BUILD_PYTHON_VERSION=$(to_lower ${TF_BUILD_PYTHON_VERSION})
Expand All @@ -110,6 +114,7 @@ echo " TF_BUILD_APPEND_CI_DOCKER_EXTRA_PARAMS="\
"${TF_BUILD_APPEND_CI_DOCKER_EXTRA_PARAMS}"
echo " TF_BUILD_APPEND_ARGUMENTS=${TF_BUILD_APPEND_ARGUMENTS}"
echo " TF_BUILD_BAZEL_TARGET=${TF_BUILD_BAZEL_TARGET}"
echo " TF_BUILD_BAZEL_CLEAN=${TF_BUILD_BAZEL_CLEAN}"
echo " TF_BUILD_SERIAL_TESTS=${TF_BUILD_SERIAL_TESTS}"

# Process container type
Expand Down Expand Up @@ -180,7 +185,7 @@ if [[ ${TF_BUILD_IS_PIP} == "no_pip" ]]; then
# The 1st (build) step will be done in parallel, as default
# But the 2nd (test) step will be done serially.

BUILD_ONLY_CMD="${BAZEL_BUILD_ONLY_CMD} ${OPT_FLAG}"\
BUILD_ONLY_CMD="${BAZEL_BUILD_ONLY_CMD} ${OPT_FLAG} "\
"${TF_BUILD_APPEND_ARGUMENTS} ${BAZEL_TARGET}"
echo "Build-only command: ${BUILD_ONLY_CMD}"

Expand Down Expand Up @@ -213,7 +218,7 @@ if [[ ${TF_BUILD_PYTHON_VERSION} == "python2" ]]; then
elif [[ ${TF_BUILD_PYTHON_VERSION} == "python3" ]]; then
# Supply proper environment variable to select Python 3
if [[ "${DO_DOCKER}" == "1" ]]; then
EXTRA_PARAMS="${EXTRA_PARAMS} -e PYTHON_BIN_PATH=/usr/bin/python3"
EXTRA_PARAMS="${EXTRA_PARAMS} -e CI_BUILD_PYTHON=python3"
else
# Determine the path to python3
PYTHON3_PATH=$(which python3 | head -1)
Expand Down Expand Up @@ -283,3 +288,8 @@ else
fi &&

rm -f ${TMP_SCRIPT}

END_TIME=$(date +'%s')
echo ""
echo "Parameterized build ends at: $(date) "\
"(Elapsed time: $((${END_TIME} - ${START_TIME})) s)"
4 changes: 2 additions & 2 deletions tensorflow/tools/pip_package/setup.py
Expand Up @@ -26,7 +26,7 @@
from setuptools.command.install import install as InstallCommandBase
from setuptools.dist import Distribution

_VERSION = '0.6.0'
_VERSION = '0.7.0'

REQUIRED_PACKAGES = [
'numpy >= 1.8.2',
Expand Down Expand Up @@ -157,7 +157,7 @@ def find_files(pattern, root):
version=_VERSION,
description='TensorFlow helps the tensors flow',
long_description='',
url='http://tensorflow.com/',
url='http://tensorflow.org/',
author='Google Inc.',
author_email='opensource@google.com',
# Contained modules and scripts.
Expand Down