Fix the "devel" test wheel directory and error output

The build-*.sh tests are failing when trying to import the (successfully!) built pip packages, because the wheel is now in "pip_pkg", not "pip", as the old tests worked.

Also, the assembler didn't output stderr from the tests because of the wrong variable being used.

PiperOrigin-RevId: 287567386
Change-Id: I6d6e5d55bafec9a443271b1640fffcaf596d2f8b
This commit is contained in:
Austin Anderson 2019-12-30 10:24:07 -08:00 committed by Jacques Pienaar
parent 4ce94f020e
commit 3ae602667e
3 changed files with 3 additions and 3 deletions
tensorflow/tools/dockerfiles

View File

@ -656,7 +656,7 @@ def main(argv):
eprint('>>> No test standard out.')
if err:
eprint('>>> Output stderr:')
eprint(out.decode('utf-8'))
eprint(err.decode('utf-8'))
else:
eprint('>>> No test standard err.')
if code != 0:

View File

@ -34,5 +34,5 @@ yes "" | /usr/local/bin/python configure.py
# Build the pip package and import
bazel build --cxxopt="-D_GLIBCXX_USE_CXX11_ABI=0" --config=opt --config=v2 tensorflow/tools/pip_package:build_pip_package
./bazel-bin/tensorflow/tools/pip_package/build_pip_package pip_pkg --gpu --nightly_flag
pip --no-cache-dir install --upgrade /tmp/pip/tensorflow-*.whl
pip --no-cache-dir install --upgrade /tmp/pip_pkg/tensorflow-*.whl

View File

@ -37,4 +37,4 @@ yes "" | /usr/local/bin/python configure.py
# Build the pip package and import
bazel build --config=cuda --cxxopt="-D_GLIBCXX_USE_CXX11_ABI=0" --config=opt --config=v2 tensorflow/tools/pip_package:build_pip_package
./bazel-bin/tensorflow/tools/pip_package/build_pip_package pip_pkg --gpu --nightly_flag
pip --no-cache-dir install --upgrade /tmp/pip/tensorflow-*.whl
pip --no-cache-dir install --upgrade /tmp/pip_pkg/tensorflow-*.whl