Skip to content

FIX: Better implementation of py36 testing #384

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

Merged
merged 1 commit into from
Jul 31, 2019
Merged

FIX: Better implementation of py36 testing #384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions tools/ci_testing/addons_cpu.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ if [[ ${PLATFORM} == "darwin" ]]; then
N_JOBS=$(sysctl -n hw.ncpu)
else
N_JOBS=$(grep -c ^processor /proc/cpuinfo)
tools/ci_testing/install_py36.sh # Patch to test on py36
fi


Expand All @@ -40,7 +39,7 @@ echo "Bazel will use ${N_JOBS} concurrent job(s)."
echo ""

export CC_OPT_FLAGS='-mavx'
export TF_NEED_CUDA=0 # TODO: Verify this is used in GPU custom-op
export TF_NEED_CUDA=0

export PYTHON_BIN_PATH=`which python`
ls -alh $PYTHON_BIN_PATH
Expand Down
1 change: 0 additions & 1 deletion tools/ci_testing/addons_gpu.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ fi

set -x

tools/ci_testing/install_py36.sh # Patch to test on py36
N_JOBS=1 # Must limit GPU testing to single job to prevent OOM error.

echo ""
Expand Down
1 change: 1 addition & 0 deletions tools/ci_testing/install_py36.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ apt-get -y -qq update && apt-get -y -qq install python3.6

python3.6 get-pip.py -q
python3.6 -m pip --version
rm get-pip.py

ln -sfn /usr/bin/python3.6 /usr/bin/python3
pip3 install scipy # Pre-installed in custom-op
2 changes: 1 addition & 1 deletion tools/run_docker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ if [[ -z "${COMMAND}" ]]; then
exit 1
fi

DOCKER_CMD="ln -sf ${PYTHON_LIB} /usr/bin/python && ${COMMAND}"
DOCKER_CMD="tools/ci_testing/install_py36.sh && ln -sf ${PYTHON_LIB} /usr/bin/python && ${COMMAND}"
Copy link
Member

@facaiy facaiy Aug 1, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about moving the installation to 79 line ?

case ${PYTHON} in
    py2) ENVIRONMENT_CMD = xxx
    py3) ENVIRONMENT_CMD = install_py36.sh and set environment variable

DOCER_CMD="${ENVIRONMENT_CMD} && ${COMMAND}"

echo "Docker image: ${DOCKER_IMAGE}"
echo "Docker command: ${DOCKER_CMD}"
docker run ${DOCKER_OPTS} \
Expand Down