Update the ToT git commit

This broke the 0001-disable-submodule-serach.patch.
So convert patch into a sed command.

Signed-off-by: Tom Rix <trix@redhat.com>
This commit is contained in:
Tom Rix 2024-06-05 14:07:59 -06:00
commit 511c020e43
2 changed files with 5 additions and 28 deletions

View file

@ -1,25 +0,0 @@
From e0b0ea90ecc0dbefc6aef2650e88ba88260935b9 Mon Sep 17 00:00:00 2001
From: Tom Rix <trix@redhat.com>
Date: Fri, 29 Sep 2023 17:21:13 -0700
Subject: [PATCH] disable submodule search
---
setup.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/setup.py b/setup.py
index 0fd886d945..e397df8fb6 100644
--- a/setup.py
+++ b/setup.py
@@ -458,7 +458,7 @@ def mirror_files_into_torchgen():
def build_deps():
report("-- Building version " + version)
- check_submodules()
+ # check_submodules()
check_pydep("yaml", "pyyaml")
build_caffe2(
--
2.43.0

View file

@ -7,9 +7,9 @@
%bcond_with gitcommit
%if %{with gitcommit}
# ToT
%global commit0 b36e01801b89a516f4271f796773d5f4b43f1186
%global commit0 6e545392cd27b9ee14a86cf6189c71211e79205d
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
%global date0 20240521
%global date0 20240605
%global pypi_version 2.4.0
%else
%global pypi_version 2.3.0
@ -162,7 +162,6 @@ Source50: https://github.com/mreineck/pocketfft/archive/%{pf_commit}/pocke
Patch0: 0001-no-third_party-foxi.patch
Patch3: 0001-Stub-in-kineto-ActivityType.patch
Patch5: 0001-disable-submodule-search.patch
%if %{with caffe2}
Patch6: 0001-reenable-foxi-linking.patch
@ -499,6 +498,9 @@ sed -i -e 's@if(NOT TARGET fxdiv)@if(MSVC AND USE_XNNPACK)@' caffe2/CMakeLists.t
sed -i -e 's@TARGET_LINK_LIBRARIES(torch_cpu PRIVATE fxdiv)@#TARGET_LINK_LIBRARIES(torch_cpu PRIVATE fxdiv)@' caffe2/CMakeLists.txt
%endif
# Disable the use of check_submodule's in the setup.py, we are a tarball, not a git repo
sed -i -e 's@check_submodules()$@#check_submodules()@' setup.py
# Release comes fully loaded with third party src
# Remove what we can
#