From fb28268d2784f1034ed9fb22834eb5347ccb1b20 Mon Sep 17 00:00:00 2001 From: Antonio Sanchez Date: Wed, 5 Feb 2025 14:30:37 -0800 Subject: [PATCH] Update ml_dtypes version and path. The include paths for headers within the ml_dtypes package have changed. We therefore need to adjust the TF/XLA build rules and paths to account for this. Also updated the pip ml_dtypes version to match. The main ml_dtypes repo name needed to be changed to avoid conflicts with the ml_dtypes subfolder. The subfolder contains the main python package that needs to be added to the PYTHON_PATH. PiperOrigin-RevId: 723654395 --- opensource_only.files | 1 - third_party/py/ml_dtypes/LICENSE | 202 -------------------- third_party/py/ml_dtypes/ml_dtypes.BUILD | 28 +-- third_party/py/ml_dtypes/ml_dtypes_py.BUILD | 8 + third_party/py/ml_dtypes/workspace.bzl | 12 +- tsl/platform/BUILD | 6 +- tsl/platform/ml_dtypes.h | 6 +- 7 files changed, 23 insertions(+), 240 deletions(-) delete mode 100644 third_party/py/ml_dtypes/LICENSE create mode 100644 third_party/py/ml_dtypes/ml_dtypes_py.BUILD diff --git a/opensource_only.files b/opensource_only.files index 8cd5f3a2e..4d42af592 100644 --- a/opensource_only.files +++ b/opensource_only.files @@ -101,7 +101,6 @@ third_party/py/BUILD.tpl: third_party/py/BUILD: third_party/py/manylinux_compliance_test.py: third_party/py/ml_dtypes/BUILD: -third_party/py/ml_dtypes/LICENSE: third_party/py/numpy/BUILD: third_party/py/py_import.bzl: third_party/py/py_manylinux_compliance_test.bzl: diff --git a/third_party/py/ml_dtypes/LICENSE b/third_party/py/ml_dtypes/LICENSE deleted file mode 100644 index d64569567..000000000 --- a/third_party/py/ml_dtypes/LICENSE +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/third_party/py/ml_dtypes/ml_dtypes.BUILD b/third_party/py/ml_dtypes/ml_dtypes.BUILD index 4e5a0254a..126287e05 100644 --- a/third_party/py/ml_dtypes/ml_dtypes.BUILD +++ b/third_party/py/ml_dtypes/ml_dtypes.BUILD @@ -1,3 +1,5 @@ +""" Main ml_dtypes library. """ + load("@pybind11_bazel//:build_defs.bzl", "pybind_extension") package( @@ -5,44 +7,20 @@ package( licenses = ["notice"], ) -exports_files(["LICENSE"]) - cc_library( name = "float8", hdrs = ["include/float8.h"], - include_prefix = "ml_dtypes", - # Internal headers are all relative to . but other packages - # include these headers with the prefix. - includes = [ - ".", - "ml_dtypes", - ], deps = ["@eigen_archive//:eigen3"], ) cc_library( name = "intn", hdrs = ["include/intn.h"], - include_prefix = "ml_dtypes", - # Internal headers are all relative to . but other packages - # include these headers with the prefix. - includes = [ - ".", - "ml_dtypes", - ], ) cc_library( name = "mxfloat", hdrs = ["include/mxfloat.h"], - include_prefix = "ml_dtypes", - # Internal headers are all relative to . but other packages - # include these headers with the prefix. - includes = [ - ".", - "float8", - "ml_dtypes", - ], deps = [ ":float8", "@eigen_archive//:eigen3", @@ -60,7 +38,6 @@ pybind_extension( "_src/numpy.h", "_src/ufuncs.h", ], - includes = ["ml_dtypes"], visibility = [":__subpackages__"], deps = [ ":float8", @@ -78,5 +55,6 @@ py_library( "_finfo.py", "_iinfo.py", ], + imports = ["."], # Import relative to _this_ directory, not the root. deps = [":_ml_dtypes_ext"], ) diff --git a/third_party/py/ml_dtypes/ml_dtypes_py.BUILD b/third_party/py/ml_dtypes/ml_dtypes_py.BUILD new file mode 100644 index 000000000..5f7f36b88 --- /dev/null +++ b/third_party/py/ml_dtypes/ml_dtypes_py.BUILD @@ -0,0 +1,8 @@ +""" Root ml_dtypes_py package. """ + +package( + default_visibility = ["//visibility:public"], + licenses = ["notice"], +) + +exports_files(["LICENSE"]) diff --git a/third_party/py/ml_dtypes/workspace.bzl b/third_party/py/ml_dtypes/workspace.bzl index 3ec62cf73..f7a49a40a 100644 --- a/third_party/py/ml_dtypes/workspace.bzl +++ b/third_party/py/ml_dtypes/workspace.bzl @@ -7,15 +7,15 @@ float8 varieties, and int4. load("//third_party:repo.bzl", "tf_http_archive", "tf_mirror_urls") def repo(): - ML_DTYPES_COMMIT = "0fa5313b65efe848c5968a15dd37dd220cc29567" - ML_DTYPES_SHA256 = "69c562bb961a21d92357c7709430553c226caac75a751c0aa52955ca14ce8641" + ML_DTYPES_COMMIT = "00d98cd92ade342fef589c0470379abb27baebe9" + ML_DTYPES_SHA256 = "f6e5880666661351e6cd084ac4178ddc4dabcde7e9a73722981c0d1500cf5937" tf_http_archive( - name = "ml_dtypes", - build_file = "//third_party/py/ml_dtypes:ml_dtypes.BUILD", + name = "ml_dtypes_py", + build_file = "//third_party/py/ml_dtypes:ml_dtypes_py.BUILD", link_files = { - "//third_party/py/ml_dtypes:LICENSE": "LICENSE", + "//third_party/py/ml_dtypes:ml_dtypes.BUILD": "ml_dtypes/BUILD.bazel", }, sha256 = ML_DTYPES_SHA256, - strip_prefix = "ml_dtypes-{commit}/ml_dtypes".format(commit = ML_DTYPES_COMMIT), + strip_prefix = "ml_dtypes-{commit}".format(commit = ML_DTYPES_COMMIT), urls = tf_mirror_urls("https://github.com/jax-ml/ml_dtypes/archive/{commit}/ml_dtypes-{commit}.tar.gz".format(commit = ML_DTYPES_COMMIT)), ) diff --git a/tsl/platform/BUILD b/tsl/platform/BUILD index 416e1ee9b..2a350e6e0 100644 --- a/tsl/platform/BUILD +++ b/tsl/platform/BUILD @@ -884,9 +884,9 @@ cc_library( hdrs = ["ml_dtypes.h"], compatible_with = get_compatible_with_portable(), deps = [ - "@ml_dtypes//:float8", - "@ml_dtypes//:intn", - "@ml_dtypes//:mxfloat", + "@ml_dtypes_py//ml_dtypes:float8", + "@ml_dtypes_py//ml_dtypes:intn", + "@ml_dtypes_py//ml_dtypes:mxfloat", ], ) diff --git a/tsl/platform/ml_dtypes.h b/tsl/platform/ml_dtypes.h index a03fa0244..b536e2f8a 100644 --- a/tsl/platform/ml_dtypes.h +++ b/tsl/platform/ml_dtypes.h @@ -16,9 +16,9 @@ limitations under the License. #ifndef TENSORFLOW_TSL_PLATFORM_ML_DTYPES_H_ #define TENSORFLOW_TSL_PLATFORM_ML_DTYPES_H_ -#include "ml_dtypes/include/float8.h" // from @ml_dtypes -#include "ml_dtypes/include/intn.h" // from @ml_dtypes -#include "ml_dtypes/include/mxfloat.h" // from @ml_dtypes +#include "ml_dtypes/include/float8.h" // from @ml_dtypes_py +#include "ml_dtypes/include/intn.h" // from @ml_dtypes_py +#include "ml_dtypes/include/mxfloat.h" // from @ml_dtypes_py namespace tsl { using float4_e2m1fn = ::ml_dtypes::float4_e2m1fn;