Initial commit to resolve merge conflicts

Author: hsharsha

tensorflow/core/public/version.h

@@ -26,11 +26,7 @@ limitations under the License.
 
 // TF_VERSION_SUFFIX is non-empty for pre-releases (e.g. "-alpha", "-alpha.1",
 // "-beta", "-rc", "-rc.1")
-<<<<<<< HEAD
-#define TF_VERSION_SUFFIX ".620-dev20241212"
-=======
 #define TF_VERSION_SUFFIX "-rc0"
->>>>>>> upstream/r2.19
 
 #define TF_STR_HELPER(x) #x
 #define TF_STR(x) TF_STR_HELPER(x)

tensorflow/tensorflow.bzl

@@ -95,11 +95,7 @@ def register_extension_info(**kwargs):
 # not contain rc or alpha, only numbers.
 # Also update tensorflow/core/public/version.h
 # and tensorflow/tools/pip_package/setup.py
-<<<<<<< HEAD
-WHEEL_VERSION = "2.19.0.620-dev20241212"
-=======
 WHEEL_VERSION = "2.19.0-rc0"
->>>>>>> upstream/r2.19
 VERSION = "2.19.0"
 VERSION_MAJOR = VERSION.split(".")[0]
 two_gpu_tags = ["requires-gpu-nvidia:2", "manual", "no_pip"]

tensorflow/tools/pip_package/setup.py

@@ -48,11 +48,7 @@
 # result for pip.
 # Also update tensorflow/tensorflow.bzl and
 # tensorflow/core/public/version.h
-<<<<<<< HEAD
-_VERSION = '2.19.0.620-dev20241212'
-=======
 _VERSION = '2.19.0-rc0'
->>>>>>> upstream/r2.19
 
 # Update this version when a new libtpu stable version is released.
 LATEST_RELEASE_LIBTPU_VERSION = '0.0.9'

third_party/llvm/generated.patch

@@ -1,63 +1,4 @@
 Auto generated patch. Do not edit or delete it, even if empty.
-<<<<<<< HEAD
-diff -ruN --strip-trailing-cr a/lld/ELF/Config.h b/lld/ELF/Config.h
---- a/lld/ELF/Config.h
-+++ b/lld/ELF/Config.h
-@@ -619,7 +619,6 @@
-   };
-   ElfSym sym{};
-   std::unique_ptr<SymbolTable> symtab;
--  SmallVector<Symbol *, 0> synthesizedSymbols;
- 
-   SmallVector<std::unique_ptr<MemoryBuffer>> memoryBuffers;
-   SmallVector<ELFFileBase *, 0> objectFiles;
-diff -ruN --strip-trailing-cr a/lld/ELF/Writer.cpp b/lld/ELF/Writer.cpp
---- a/lld/ELF/Writer.cpp
-+++ b/lld/ELF/Writer.cpp
-@@ -149,7 +149,6 @@
-   if (!s || s->isDefined() || s->isCommon())
-     return nullptr;
- 
--  ctx.synthesizedSymbols.push_back(s);
-   s->resolve(ctx, Defined{ctx, ctx.internalFile, StringRef(), STB_GLOBAL,
-                           stOther, STT_NOTYPE, val,
-                           /*size=*/0, sec});
-@@ -283,7 +282,6 @@
- static void demoteSymbolsAndComputeIsPreemptible(Ctx &ctx) {
-   llvm::TimeTraceScope timeScope("Demote symbols");
-   DenseMap<InputFile *, DenseMap<SectionBase *, size_t>> sectionIndexMap;
--  bool hasDynSymTab = ctx.arg.hasDynSymTab;
-   for (Symbol *sym : ctx.symtab->getSymbols()) {
-     if (auto *d = dyn_cast<Defined>(sym)) {
-       if (d->section && !d->section->isLive())
-@@ -296,12 +294,11 @@
-                   sym->type)
-             .overwrite(*sym);
-         sym->versionId = VER_NDX_GLOBAL;
--        if (sym->includeInDynsym(ctx))
--          sym->isExported = true;
-       }
-     }
- 
--    if (hasDynSymTab)
-+    sym->isExported = sym->includeInDynsym(ctx);
-+    if (ctx.arg.hasDynSymTab)
-       sym->isPreemptible = sym->isExported && computeIsPreemptible(ctx, *sym);
-   }
- }
-@@ -1839,11 +1836,6 @@
-     }
-   }
- 
--  // If the previous code block defines any non-hidden symbols (e.g.
--  // __global_pointer$), they may be exported.
--  for (Symbol *sym : ctx.synthesizedSymbols)
--    sym->isExported = sym->includeInDynsym(ctx);
--
-   demoteSymbolsAndComputeIsPreemptible(ctx);
- 
-   if (ctx.arg.copyRelocs && ctx.arg.discard != DiscardPolicy::None)
-=======
 diff -ruN --strip-trailing-cr a/clang/include/clang/Basic/BuiltinsX86.td b/clang/include/clang/Basic/BuiltinsX86.td
 --- a/clang/include/clang/Basic/BuiltinsX86.td
 +++ b/clang/include/clang/Basic/BuiltinsX86.td
@@ -189,4 +130,3 @@ diff -ruN --strip-trailing-cr a/clang/lib/Headers/xmmintrin.h b/clang/lib/Header
  #define _mm_prefetch(a, sel) (__builtin_prefetch((const void *)(a), \
                                                   ((sel) >> 2) & 1, (sel) & 0x3))
  #endif
->>>>>>> upstream/r2.19

third_party/llvm/workspace.bzl

@@ -4,13 +4,8 @@ load("//third_party:repo.bzl", "tf_http_archive")
 
 def repo(name):
     """Imports LLVM."""
-<<<<<<< HEAD
-    LLVM_COMMIT = "2e5a5237daf82a657561c490845c406e13657311"
-    LLVM_SHA256 = "e0622b7f81a046e1576d8d07c5ba916346c2a1c06528655d3ddd45a1028eac89"
-=======
     LLVM_COMMIT = "f8287f6c373fcf993643dd6f0e30dde304c1be73"
     LLVM_SHA256 = "add2841174abc79c45aa309bdf0cf631aa8f97e7a4df57dcfca57c60df27527f"
->>>>>>> upstream/r2.19
 
     tf_http_archive(
         name = name,

third_party/triton/llvm_integration/series.bzl

@@ -8,11 +8,8 @@ LLVM nor MLIR integrator, please do not add any patches to this list.
 """
 
 llvm_patch_list = [
-<<<<<<< HEAD
     "//third_party/triton:llvm_integration/cl718257410.patch",
     "//third_party/triton:llvm_integration/cl718838076.patch",
-=======
     "//third_party/triton:llvm_integration/cl722861209.patch",
->>>>>>> upstream/r2.19
     # Add new patches just above this line
 ]