-
Notifications
You must be signed in to change notification settings - Fork 74.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Minor refactor: rename the 'lower bound batch threads' transform to a…
… more generic 'reconfig batch op'. It makes no logical changes. PiperOrigin-RevId: 636898956
- Loading branch information
1 parent
ae7327d
commit 471e2a6
Showing
33 changed files
with
378 additions
and
922 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...tfrt/tests/lower_bound_batch_threads.mlir → ...er/mlir/tfrt/tests/reconfig_batch_op.mlir
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
46 changes: 46 additions & 0 deletions
46
...low/tools/ci_build/Dockerfile.rbe.cuda12.1-cudnn9.1-ubuntu20.04-manylinux2014-multipython
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
# Dockerfile to build a manylinux 2010 compliant cross-compiler. | ||
# | ||
# Builds a devtoolset gcc/libstdc++ that targets manylinux 2010 compatible | ||
# glibc (2.12) and system libstdc++ (4.4). | ||
# | ||
# To push a new version, run: | ||
# $ docker build -f Dockerfile.rbe.cuda12.1-cudnn9.1-ubuntu20.04-manylinux2014-multipython \ | ||
# --tag "gcr.io/tensorflow-testing/nosla-cuda12.1-cudnn9.1-ubuntu20.04-manylinux2014-multipython" . | ||
# $ docker push gcr.io/tensorflow-testing/nosla-cuda12.1-cudnn9.1-ubuntu20.04-manylinux2014-multipython | ||
|
||
FROM gcr.io/tensorflow-sigs/build@sha256:3573cdabdea7f203b6440a93bb50a0e1a17c2c9a33f09fccdc0c97f514f9689c | ||
|
||
ENV DEBIAN_FRONTEND=noninteractive | ||
|
||
COPY install/install_bootstrap_deb_packages.sh /install/ | ||
RUN /install/install_bootstrap_deb_packages.sh | ||
|
||
COPY install/install_deb_packages.sh /install/ | ||
RUN /install/install_deb_packages.sh | ||
|
||
RUN apt-get update && apt-get install -y \ | ||
libbz2-dev \ | ||
libffi-dev \ | ||
libgdbm-dev \ | ||
libncurses5-dev \ | ||
libnss3-dev \ | ||
libreadline-dev \ | ||
libsqlite3-dev \ | ||
patchelf \ | ||
libcudnn9-dev-cuda-12=9.1.1.17-1 \ | ||
libcudnn9-cuda-12=9.1.1.17-1 \ | ||
&& \ | ||
rm -rf /var/lib/apt/lists/* | ||
|
||
COPY install/build_and_install_python.sh /install/ | ||
RUN /install/build_and_install_python.sh "3.9.18" | ||
RUN /install/build_and_install_python.sh "3.10.13" | ||
RUN /install/build_and_install_python.sh "3.11.6" | ||
RUN /install/build_and_install_python.sh "3.12.2" | ||
|
||
COPY install/install_pip_packages_by_version.sh /install/ | ||
# https://github.com/numpy/numpy/issues/22623 for `SETUPTOOLS_USE_DISTUTILS`. | ||
RUN SETUPTOOLS_USE_DISTUTILS=stdlib /install/install_pip_packages_by_version.sh "/usr/local/bin/pip3.9" "jax" | ||
RUN SETUPTOOLS_USE_DISTUTILS=stdlib /install/install_pip_packages_by_version.sh "/usr/local/bin/pip3.10" "jax" | ||
RUN SETUPTOOLS_USE_DISTUTILS=stdlib /install/install_pip_packages_by_version.sh "/usr/local/bin/pip3.11" "jax" | ||
RUN SETUPTOOLS_USE_DISTUTILS=stdlib /install/install_pip_packages_by_version.sh "/usr/local/bin/pip3.12" "jax" |
46 changes: 46 additions & 0 deletions
46
...low/tools/ci_build/Dockerfile.rbe.cuda12.2-cudnn9.1-ubuntu20.04-manylinux2014-multipython
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
# Dockerfile to build a manylinux 2010 compliant cross-compiler. | ||
# | ||
# Builds a devtoolset gcc/libstdc++ that targets manylinux 2010 compatible | ||
# glibc (2.12) and system libstdc++ (4.4). | ||
# | ||
# To push a new version, run: | ||
# $ docker build -f Dockerfile.rbe.cuda12.2-cudnn9.1-ubuntu20.04-manylinux2014-multipython \ | ||
# --tag "gcr.io/tensorflow-testing/nosla-cuda12.2-cudnn9.1-ubuntu20.04-manylinux2014-multipython" . | ||
# $ docker push gcr.io/tensorflow-testing/nosla-cuda12.2-cudnn9.1-ubuntu20.04-manylinux2014-multipython | ||
|
||
FROM gcr.io/tensorflow-sigs/build@sha256:7c8ecb6482e26c4b4efce0ddaefe3fb3667b3b958c83fe8d3cc3763c6ed7a4d1 | ||
|
||
ENV DEBIAN_FRONTEND=noninteractive | ||
|
||
COPY install/install_bootstrap_deb_packages.sh /install/ | ||
RUN /install/install_bootstrap_deb_packages.sh | ||
|
||
COPY install/install_deb_packages.sh /install/ | ||
RUN /install/install_deb_packages.sh | ||
|
||
RUN apt-get update && apt-get install -y \ | ||
libbz2-dev \ | ||
libffi-dev \ | ||
libgdbm-dev \ | ||
libncurses5-dev \ | ||
libnss3-dev \ | ||
libreadline-dev \ | ||
libsqlite3-dev \ | ||
patchelf \ | ||
libcudnn9-dev-cuda-12=9.1.1.17-1 \ | ||
libcudnn9-cuda-12=9.1.1.17-1 \ | ||
&& \ | ||
rm -rf /var/lib/apt/lists/* | ||
|
||
COPY install/build_and_install_python.sh /install/ | ||
RUN /install/build_and_install_python.sh "3.9.18" | ||
RUN /install/build_and_install_python.sh "3.10.13" | ||
RUN /install/build_and_install_python.sh "3.11.6" | ||
RUN /install/build_and_install_python.sh "3.12.0" | ||
|
||
COPY install/install_pip_packages_by_version.sh /install/ | ||
# https://github.com/numpy/numpy/issues/22623 for `SETUPTOOLS_USE_DISTUTILS`. | ||
RUN SETUPTOOLS_USE_DISTUTILS=stdlib /install/install_pip_packages_by_version.sh "/usr/local/bin/pip3.9" "jax" | ||
RUN SETUPTOOLS_USE_DISTUTILS=stdlib /install/install_pip_packages_by_version.sh "/usr/local/bin/pip3.10" "jax" | ||
RUN SETUPTOOLS_USE_DISTUTILS=stdlib /install/install_pip_packages_by_version.sh "/usr/local/bin/pip3.11" "jax" | ||
RUN SETUPTOOLS_USE_DISTUTILS=stdlib /install/install_pip_packages_by_version.sh "/usr/local/bin/pip3.12" "jax" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
14 changes: 0 additions & 14 deletions
14
third_party/triton/temporary/exclude_failing_h100_tests.patch
This file was deleted.
Oops, something went wrong.
35 changes: 35 additions & 0 deletions
35
third_party/triton/temporary/fp8_splat_partial_revert.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
This can be deleted on the next integrate; it is a revert of a previous patch. | ||
diff --git a/include/triton/Conversion/MLIRTypes.h b/include/triton/Conversion/MLIRTypes.h | ||
--- a/include/triton/Conversion/MLIRTypes.h | ||
+++ b/include/triton/Conversion/MLIRTypes.h | ||
@@ -26,6 +26,15 @@ inline Type f32Ty(MLIRContext *ctx) { re | ||
inline Type f64Ty(MLIRContext *ctx) { return FloatType::getF64(ctx); } | ||
inline Type bf16Ty(MLIRContext *ctx) { return FloatType::getBF16(ctx); } | ||
|
||
+inline bool isFloat(Type type) { | ||
+ return type.isF32() || type.isF64() || type.isF16() || type.isF128() || | ||
+ type.isBF16() || type.isFloat8E4M3B11FNUZ() || type.isFloat8E4M3FN() || | ||
+ type.isFloat8E4M3FNUZ() || type.isFloat8E5M2() || | ||
+ type.isFloat8E5M2FNUZ(); | ||
+} | ||
+ | ||
+inline bool isInt(Type type) { return type.isIntOrFloat() && !isFloat(type); } | ||
+ | ||
} // namespace type | ||
} // namespace triton | ||
} // namespace mlir | ||
diff --git a/lib/Conversion/TritonGPUToLLVM/ViewOpToLLVM.cpp b/lib/Conversion/TritonGPUToLLVM/ViewOpToLLVM.cpp | ||
--- a/lib/Conversion/TritonGPUToLLVM/ViewOpToLLVM.cpp | ||
+++ b/lib/Conversion/TritonGPUToLLVM/ViewOpToLLVM.cpp | ||
@@ -74,9 +74,9 @@ struct ArithConstantSplatOpConversion | ||
auto values = mlir::dyn_cast<SplatElementsAttr>(op.getValue()); | ||
auto elemType = values.getElementType(); | ||
Attribute val; | ||
- if (isa<FloatType>(elemType)) { | ||
+ if (type::isFloat(elemType)) { | ||
val = values.getValues<FloatAttr>()[0]; | ||
- } else if (isa<IntegerType>(elemType)) { | ||
+ } else if (type::isInt(elemType)) { | ||
val = values.getValues<IntegerAttr>()[0]; | ||
} else { | ||
llvm::errs() << "ArithConstantSplatOpConversion get unsupported type: " |
Oops, something went wrong.