Skip to content

Commit c928bb2

Browse files
hsharshazahiqbal
authored andcommitted
Fix build breaks due to
i. migrating third_party/mkl to @local_xla//xla/tsl/mkl ii. removal of cuda.h header iii. replace build_pip_package rule with wheel in build_rocm_python3 script
1 parent ed6bf74 commit c928bb2

File tree

1 file changed

+18
-31
lines changed

1 file changed

+18
-31
lines changed

build_rocm_python3

Lines changed: 18 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ while getopts "hrn" opt; do
2020
restriction=true
2121
;;
2222
n)
23-
nightly=true
23+
nightly=true
2424
esac
2525
done
2626
shift "$((OPTIND-1))"
@@ -47,35 +47,22 @@ else
4747
fi
4848

4949
if [ -f /usertools/rocm.bazelrc ]; then
50-
# Use the bazelrc files in /usertools if available
51-
TF_PKG_LOC=bazel-bin/tensorflow/tools/pip_package/wheel_house
52-
if [[ -n $nightly ]]; then
53-
# Remove any previous builds and build nightly
54-
rm -f $TF_PKG_LOC/tf_nightly_rocm*.whl
55-
export project_name=tf_nightly_rocm
56-
python3 tensorflow/tools/ci_build/update_version.py --nightly --rocm_version &&
57-
bazel --bazelrc=/usertools/rocm.bazelrc build $RESOURCE_OPTION --config=rocm --repo_env=WHEEL_NAME=tf_nightly_rocm --action_env=project_name=tf_nightly_rocm --action_env=TF_PYTHON_VERSION=$PYTHON_VERSION tensorflow/tools/pip_package:wheel --verbose_failures &&
58-
pip3 install --upgrade $TF_PKG_LOC/tf_nightly_rocm*.whl
59-
else
60-
# Remove any previous builds and build release
61-
rm -f $TF_PKG_LOC/tensorflow*.whl
62-
python3 tensorflow/tools/ci_build/update_version.py --rocm_version &&
63-
bazel --bazelrc=/usertools/rocm.bazelrc build $RESOURCE_OPTION --config=rocm --repo_env=WHEEL_NAME=tensorflow_rocm --action_env=project_name=tensorflow_rocm --action_env=TF_PYTHON_VERSION=$PYTHON_VERSION tensorflow/tools/pip_package:wheel --verbose_failures &&
64-
pip3 install --upgrade $TF_PKG_LOC/tensorflow*.whl
65-
fi
50+
# Use the bazelrc files in /usertools if available
51+
# Also, this is likely a tensorflow-build container so put the whl in /tf/pkg
52+
TF_PKG_LOC=/tf/pkg
53+
# Remove any previous builds and build nightly
54+
rm -f $TF_PKG_LOC/tensorflow*.whl
55+
python3 tensorflow/tools/ci_build/update_version.py --nightly --rocm_version &&
56+
bazel --bazelrc=/usertools/rocm.bazelrc build $RESOURCE_OPTION --config=rocm --action_env=TF_PYTHON_VERSION=$PYTHON_VERSION tensorflow/tools/pip_package:wheel --verbose_failures &&
57+
cp ./bazel-bin/tensorflow/tools/pip_package/wheel_house/tensorflow*.whl $TF_PKG_LOC/ &&
58+
pip3 install --upgrade $TF_PKG_LOC/tensorflow*.whl
6659
else
67-
# Legacy style: run configure then build
68-
TF_PKG_LOC=bazel-bin/tensorflow/tools/pip_package/wheel_house
69-
yes "" | TF_NEED_CLANG=0 ROCM_PATH=$ROCM_INSTALL_DIR TF_NEED_ROCM=1 PYTHON_BIN_PATH=/usr/bin/python3 ./configure &&
70-
if [[ -n $nightly ]]; then
71-
# Remove any previous builds and build nightly
72-
rm -f $TF_PKG_LOC/tf_nightly_rocm*.whl
73-
bazel build $RESOURCE_OPTION --config=opt --config=rocm --repo_env=WHEEL_NAME=tf_nightly_rocm --action_env=project_name=tf_nightly_rocm //tensorflow/tools/pip_package:wheel --verbose_failures &&
74-
pip3 install --upgrade $TF_PKG_LOC/tf_nightly_rocm*.whl
75-
else
76-
# Remove any previous builds and build release
77-
rm -f $TF_PKG_LOC/tensorflow*.whl
78-
bazel build $RESOURCE_OPTION --config=opt --config=rocm --repo_env=WHEEL_NAME=tensorflow_rocm --action_env=project_name=tensorflow_rocm //tensorflow/tools/pip_package:wheel --verbose_failures &&
79-
pip3 install --upgrade $TF_PKG_LOC/tensorflow*.whl
80-
fi
60+
# Legacy style: run configure then build
61+
TF_PKG_LOC=/tmp/tensorflow_pkg
62+
yes "" | TF_NEED_CLANG=0 ROCM_PATH=$ROCM_INSTALL_DIR TF_NEED_ROCM=1 PYTHON_BIN_PATH=/usr/bin/python3 ./configure &&
63+
# Remove any previous builds and build nightly
64+
rm -f $TF_PKG_LOC/tensorflow*.whl
65+
bazel build $RESOURCE_OPTION --config=opt --config=rocm //tensorflow/tools/pip_package:wheel --verbose_failures &&
66+
cp ./bazel-bin/tensorflow/tools/pip_package/wheel_house/tensorflow*.whl $TF_PKG_LOC/ &&
67+
pip3 install --upgrade $TF_PKG_LOC/tf_nightly_rocm*.whl
8168
fi

0 commit comments

Comments
 (0)