From 69254bba933b914e8e9a0676600e2e5ec024ea48 Mon Sep 17 00:00:00 2001 From: Ivan Razumov Date: Wed, 10 Jul 2024 16:56:51 +0200 Subject: [PATCH 01/10] Update pytorch to version 2.3.1 --- pytorch-system-fmt.patch | 12 ++++++------ pytorch.spec | 14 +++++++++----- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/pytorch-system-fmt.patch b/pytorch-system-fmt.patch index 1561c227728..b76f0239b57 100644 --- a/pytorch-system-fmt.patch +++ b/pytorch-system-fmt.patch @@ -1,15 +1,15 @@ diff --git a/c10/CMakeLists.txt b/c10/CMakeLists.txt index feebad7cbb7..8a2ad840286 100644 ---- a/c10/CMakeLists.txt -+++ b/c10/CMakeLists.txt -@@ -87,6 +87,7 @@ endif() - if(${USE_GLOG}) - target_link_libraries(c10 PUBLIC glog::glog) +--- a/c10/CMakeLists.txt 2024-07-10 13:31:50.729017827 +0200 ++++ b/c10/CMakeLists.txt 2024-07-10 13:32:36.649765887 +0200 +@@ -87,6 +87,7 @@ + if(C10_USE_GLOG) + target_link_libraries(c10 PUBLIC glog::glog) endif() +find_package(fmt REQUIRED) target_link_libraries(c10 PRIVATE fmt::fmt-header-only) - find_package(Backtrace) + if(C10_USE_NUMA) diff --git a/caffe2/CMakeLists.txt b/caffe2/CMakeLists.txt index 74d0d557190..ff3e94b1c4b 100644 --- a/caffe2/CMakeLists.txt diff --git a/pytorch.spec b/pytorch.spec index db932b16071..fc682107f5a 100644 --- a/pytorch.spec +++ b/pytorch.spec @@ -1,9 +1,9 @@ -### RPM external pytorch 2.1.1 +### RPM external pytorch 2.3.1 ## INCLUDE cuda-flags ## INCLUDE microarch_flags %define cuda_arch_float $(echo %{cuda_arch} | tr ' ' '\\n' | sed -E 's|([0-9])$|.\\1|' | tr '\\n' ' ') -%define tag bb938bbe9f53414dda1e1159795b7536dbffd041 +%define tag 63d5e9221bedd1546b7d364b5ce4171547db12a9 %define branch cms/v%{realversion} Source: git+https://github.com/cms-externals/pytorch.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&submodules=1&output=/%{n}-%{realversion}.tgz @@ -16,13 +16,14 @@ Patch2: pytorch-system-fmt BuildRequires: cmake ninja Requires: eigen fxdiv numactl openmpi protobuf psimd python3 py3-PyYAML -Requires: OpenBLAS zlib protobuf fmt py3-pybind11 +Requires: OpenBLAS zlib protobuf fmt py3-pybind11 py3-typing-extensions %{!?without_cuda:Requires: cuda cudnn} +%{!?without_rocm:Requires: rocm} %prep %setup -n %{n}-%{realversion} -%patch0 -p1 -%patch1 -p1 +#%patch0 -p1 +#%patch1 -p1 %patch2 -p1 %build @@ -49,6 +50,9 @@ cmake ../%{n}-%{realversion} \ -DTORCH_CUDA_ARCH_LIST="%{cuda_arch_float}" \ -DCUDNN_INCLUDE_DIR=${CUDNN_ROOT}/include \ -DCUDNN_LIBRARY=${CUDNN_ROOT}/lib64/libcudnn.so \ +%endif +%if 0%{!?without_rocm:1} + -DUSE_ROCM=ON \ %endif -DUSE_NCCL=OFF \ -DUSE_FBGEMM=OFF \ From e5fb08f5f37b53af476f6437ad02c601eba5047f Mon Sep 17 00:00:00 2001 From: Ivan Razumov Date: Thu, 11 Jul 2024 09:38:50 +0200 Subject: [PATCH 02/10] Explicitly set TORCH_CUDA_ARCH_LIST in packages depending on pytorch --- pytorch-cluster.spec | 19 ++++++++++++++++--- pytorch-scatter.spec | 17 +++++++++++++++-- pytorch-sparse.spec | 18 ++++++++++++++++-- 3 files changed, 47 insertions(+), 7 deletions(-) diff --git a/pytorch-cluster.spec b/pytorch-cluster.spec index cd2cec49d4b..a25f9aad7ea 100644 --- a/pytorch-cluster.spec +++ b/pytorch-cluster.spec @@ -1,6 +1,8 @@ ### RPM external pytorch-cluster 1.6.3 ## INCLUDE compilation_flags ## INCLUDE cpp-standard +## INCLUDE cuda-flags + %define tag f2d99195a0003ca2d2ba9ed50d0117e2f23360e0 %define branch master %define github_user rusty1s @@ -9,7 +11,8 @@ Source: git+https://github.com/%{github_user}/pytorch_cluster.git?obj=%{branch}/ BuildRequires: cmake Requires: pytorch -%define build_flags -Wall -Wextra -pedantic %{?arch_build_flags} +%define build_flags -Wall -Wextra -pedantic %{?arch_build_flags} +%define cuda_arch_float $(echo %{cuda_arch} | tr ' ' '\\n' | sed -E 's|([0-9])$|.\\1|' | tr '\\n' ' ') %prep %setup -n %{n}-%{realversion} @@ -17,11 +20,17 @@ Requires: pytorch grep -q 'CMAKE_CXX_STANDARD *14' CMakeLists.txt sed -i -e 's|CMAKE_CXX_STANDARD *14|CMAKE_CXX_STANDARD %{cms_cxx_standard}|' CMakeLists.txt +USE_CUDA=OFF +%if "%{cmsos}" != "slc7_aarch64" +if [ "%{cuda_gcc_support}" = "true" ] ; then +USE_CUDA=%{!?without_cuda:ON} +fi +%endif + %build rm -rf ../build && mkdir ../build && cd ../build - cmake ../%{n}-%{realversion} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=%{i} \ @@ -33,7 +42,11 @@ cmake ../%{n}-%{realversion} \ -DWITH_PYTHON=OFF \ -DWITH_CUDA=OFF \ -DBUILD_TEST=OFF \ - -DBUILD_SHARED_LIBS=ON +%if 0%{!?without_cuda:1} + -DUSE_CUDA=${USE_CUDA} \ + -DTORCH_CUDA_ARCH_LIST="%{cuda_arch_float}" \ +%endif + -DBUILD_SHARED_LIBS=ON make %{makeprocesses} VERBOSE=1 diff --git a/pytorch-scatter.spec b/pytorch-scatter.spec index c79cb4aa513..5a6939b3a75 100644 --- a/pytorch-scatter.spec +++ b/pytorch-scatter.spec @@ -1,6 +1,7 @@ ### RPM external pytorch-scatter 2.1.2 ## INCLUDE compilation_flags ## INCLUDE cpp-standard +## INCLUDE cuda-flags %define tag c095c62e4334fcd05e4ac3c4bb09d285960d6be6 %define branch master %define github_user rusty1s @@ -9,7 +10,8 @@ Source: git+https://github.com/%{github_user}/pytorch_scatter.git?obj=%{branch}/ BuildRequires: cmake Requires: pytorch -%define build_flags -Wall -Wextra -pedantic %{?arch_build_flags} +%define build_flags -Wall -Wextra -pedantic %{?arch_build_flags} +%define cuda_arch_float $(echo %{cuda_arch} | tr ' ' '\\n' | sed -E 's|([0-9])$|.\\1|' | tr '\\n' ' ') %prep %setup -n %{n}-%{realversion} @@ -17,6 +19,13 @@ Requires: pytorch grep -q 'CMAKE_CXX_STANDARD *14' CMakeLists.txt sed -i -e 's|CMAKE_CXX_STANDARD *14|CMAKE_CXX_STANDARD %{cms_cxx_standard}|' CMakeLists.txt +USE_CUDA=OFF +%if "%{cmsos}" != "slc7_aarch64" +if [ "%{cuda_gcc_support}" = "true" ] ; then +USE_CUDA=%{!?without_cuda:ON} +fi +%endif + %build rm -rf ../build && mkdir ../build && cd ../build @@ -33,7 +42,11 @@ cmake ../%{n}-%{realversion} \ -DWITH_PYTHON=OFF \ -DWITH_CUDA=OFF \ -DBUILD_TEST=OFF \ - -DBUILD_SHARED_LIBS=ON +%if 0%{!?without_cuda:1} + -DUSE_CUDA=${USE_CUDA} \ + -DTORCH_CUDA_ARCH_LIST="%{cuda_arch_float}" \ +%endif + -DBUILD_SHARED_LIBS=ON make %{makeprocesses} VERBOSE=1 diff --git a/pytorch-sparse.spec b/pytorch-sparse.spec index 36b5f9bce0f..c9b1cd2bd25 100644 --- a/pytorch-sparse.spec +++ b/pytorch-sparse.spec @@ -1,6 +1,8 @@ ### RPM external pytorch-sparse 0.6.18 ## INCLUDE compilation_flags ## INCLUDE cpp-standard +## INCLUDE cuda-flags + %define tag 2d559810c6af7f8b2cf88553dd5a5824a667a07d %define branch master %define github_user rusty1s @@ -9,7 +11,8 @@ Source: git+https://github.com/%{github_user}/pytorch_sparse.git?obj=%{branch}/% BuildRequires: cmake Requires: pytorch -%define build_flags -Wall -Wextra -pedantic %{?arch_build_flags} +%define build_flags -Wall -Wextra -pedantic %{?arch_build_flags} +%define cuda_arch_float $(echo %{cuda_arch} | tr ' ' '\\n' | sed -E 's|([0-9])$|.\\1|' | tr '\\n' ' ') %prep %setup -n %{n}-%{realversion} @@ -17,6 +20,13 @@ Requires: pytorch grep -q 'CMAKE_CXX_STANDARD *14' CMakeLists.txt sed -i -e 's|CMAKE_CXX_STANDARD *14|CMAKE_CXX_STANDARD %{cms_cxx_standard}|' CMakeLists.txt +USE_CUDA=OFF +%if "%{cmsos}" != "slc7_aarch64" +if [ "%{cuda_gcc_support}" = "true" ] ; then +USE_CUDA=%{!?without_cuda:ON} +fi +%endif + %build rm -rf ../build && mkdir ../build && cd ../build @@ -33,7 +43,11 @@ cmake ../%{n}-%{realversion} \ -DWITH_PYTHON=OFF \ -DWITH_CUDA=OFF \ -DBUILD_TEST=OFF \ - -DBUILD_SHARED_LIBS=ON +%if 0%{!?without_cuda:1} + -DUSE_CUDA=${USE_CUDA} \ + -DTORCH_CUDA_ARCH_LIST="%{cuda_arch_float}" \ +%endif + -DBUILD_SHARED_LIBS=ON make %{makeprocesses} VERBOSE=1 From 8d40948db1585e29e505919d055e5f79d326ee3e Mon Sep 17 00:00:00 2001 From: Ivan Razumov Date: Thu, 11 Jul 2024 14:20:43 +0200 Subject: [PATCH 03/10] Disable ROCm; patch for missing braces is still needed --- pytorch.spec | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pytorch.spec b/pytorch.spec index fc682107f5a..249882a3f27 100644 --- a/pytorch.spec +++ b/pytorch.spec @@ -18,12 +18,12 @@ BuildRequires: cmake ninja Requires: eigen fxdiv numactl openmpi protobuf psimd python3 py3-PyYAML Requires: OpenBLAS zlib protobuf fmt py3-pybind11 py3-typing-extensions %{!?without_cuda:Requires: cuda cudnn} -%{!?without_rocm:Requires: rocm} +#%{!?without_rocm:Requires: rocm rocm-rocrand} %prep %setup -n %{n}-%{realversion} #%patch0 -p1 -#%patch1 -p1 +%patch1 -p1 %patch2 -p1 %build @@ -38,6 +38,11 @@ USE_CUDA=%{!?without_cuda:ON} fi %endif +#%if 0%{!?without_rocm:1} +#export ROCM_PATH=${ROCM_ROOT} +#export PYTORCH_ROCM_ARCH=gfx900,gfx906,gfx908,gfx90a,gfx1030 +#%endif + cmake ../%{n}-%{realversion} \ -G Ninja \ -DCMAKE_INSTALL_PREFIX=%{i} \ @@ -50,9 +55,6 @@ cmake ../%{n}-%{realversion} \ -DTORCH_CUDA_ARCH_LIST="%{cuda_arch_float}" \ -DCUDNN_INCLUDE_DIR=${CUDNN_ROOT}/include \ -DCUDNN_LIBRARY=${CUDNN_ROOT}/lib64/libcudnn.so \ -%endif -%if 0%{!?without_rocm:1} - -DUSE_ROCM=ON \ %endif -DUSE_NCCL=OFF \ -DUSE_FBGEMM=OFF \ @@ -98,6 +100,4 @@ ninja -v %{makeprocesses} install %{relocateConfig}include/caffe2/core/macros.h %{relocateConfig}share/cmake/ATen/ATenConfig.cmake -# For ROCm, pre-build -# NOTICE: can't build with both cuda and rocm -# python @{_builddir}/tools/amd_build/build_amd.py +# NOTICE: can't build with both cuda and rocm - see aten/CMakeLists.txt From f359925bdf296419501c3ad8011ab070a7b0131f Mon Sep 17 00:00:00 2001 From: Ivan Razumov Date: Thu, 11 Jul 2024 21:51:23 +0200 Subject: [PATCH 04/10] Fix one more instance of missing braces --- pytorch-missing-braces.patch | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pytorch-missing-braces.patch b/pytorch-missing-braces.patch index 23c98888f14..47902463104 100644 --- a/pytorch-missing-braces.patch +++ b/pytorch-missing-braces.patch @@ -19,3 +19,23 @@ index a1a956f1327..a4e02c795d9 100644 + "instructions" }}; } // namespace profiler } // namespace torch + +diff --git a/c10/util/typeid.h b/c10/util/typeid.h +index 2c6ac38882f..d165059a956 100644 +--- a/c10/util/typeid.h ++++ b/c10/util/typeid.h +@@ -303,12 +303,12 @@ class _Uninitialized final {}; + // + + // item sizes for TypeMeta::itemsize() fast path +-static constexpr std::array scalarTypeItemSizes = { ++static constexpr std::array scalarTypeItemSizes = {{ + #define SCALAR_TYPE_SIZE(T, name) sizeof(T), + AT_FORALL_SCALAR_TYPES_WITH_COMPLEX_AND_QINTS(SCALAR_TYPE_SIZE) + #undef SCALAR_TYPE_SIZE + 0, // Undefined +-}; ++}}; + + /** + * TypeMeta is a thin class that allows us to store the type of a container such From c3a0c6f3474b3a35ecfff66bb4944d32ab644ecc Mon Sep 17 00:00:00 2001 From: iarspider Date: Sun, 14 Jul 2024 09:57:23 -0700 Subject: [PATCH 05/10] Update fmt to 10.2.1 --- fmt.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fmt.spec b/fmt.spec index 82b2a19833c..d47a10a250b 100644 --- a/fmt.spec +++ b/fmt.spec @@ -1,4 +1,4 @@ -### RPM external fmt 8.0.1 +### RPM external fmt 10.2.1 ## INCLUDE compilation_flags Source: https://github.com/fmtlib/fmt/archive/%{realversion}.tar.gz BuildRequires: gmake cmake From 555b1b70df5c2c3cbff2bba7f977a0a5db65633d Mon Sep 17 00:00:00 2001 From: iarspider Date: Mon, 15 Jul 2024 21:56:03 +0200 Subject: [PATCH 06/10] Update patch --- pytorch-missing-braces.patch | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/pytorch-missing-braces.patch b/pytorch-missing-braces.patch index 47902463104..74359bd3687 100644 --- a/pytorch-missing-braces.patch +++ b/pytorch-missing-braces.patch @@ -39,3 +39,32 @@ index 2c6ac38882f..d165059a956 100644 /** * TypeMeta is a thin class that allows us to store the type of a container such +--- a/c10/util/order_preserving_flat_hash_map.h ++++ b/c10/util/order_preserving_flat_hash_map.h +@@ -177,11 +177,11 @@ struct sherwood_v3_entry { + }; + + inline int8_t log2(uint64_t value) { +- static constexpr std::array table = { ++ static constexpr std::array table = {{ + 63, 0, 58, 1, 59, 47, 53, 2, 60, 39, 48, 27, 54, 33, 42, 3, + 61, 51, 37, 40, 49, 18, 28, 20, 55, 30, 34, 11, 43, 14, 22, 4, + 62, 57, 46, 52, 38, 26, 32, 41, 50, 36, 17, 19, 29, 10, 13, 21, +- 56, 45, 25, 31, 35, 16, 9, 12, 44, 24, 15, 8, 23, 7, 6, 5}; ++ 56, 45, 25, 31, 35, 16, 9, 12, 44, 24, 15, 8, 23, 7, 6, 5}}; + value |= value >> 1; + value |= value >> 2; + value |= value >> 4; +--- a/torch/csrc/jit/runtime/operator.h ++++ b/torch/csrc/jit/runtime/operator.h +@@ -35,8 +35,8 @@ using ::c10::Symbol; + using OperationCreator = Operation (*)(const Node*); + + namespace { +-const std::array kJitOnlyOperatorTags = { +- at::Tag::pt2_compliant_tag}; ++const std::array kJitOnlyOperatorTags = {{ ++ at::Tag::pt2_compliant_tag}}; + } + + /* From b2dddc0b638beb24d0e5a7835de96c067570fbd6 Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Thu, 25 Jul 2024 09:47:23 +0200 Subject: [PATCH 07/10] Update pytorch to 2.4.0 which has riscv support --- pytorch.spec | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/pytorch.spec b/pytorch.spec index 249882a3f27..50baf0ef295 100644 --- a/pytorch.spec +++ b/pytorch.spec @@ -1,16 +1,13 @@ -### RPM external pytorch 2.3.1 +### RPM external pytorch 2.4.0 ## INCLUDE cuda-flags ## INCLUDE microarch_flags %define cuda_arch_float $(echo %{cuda_arch} | tr ' ' '\\n' | sed -E 's|([0-9])$|.\\1|' | tr '\\n' ' ') -%define tag 63d5e9221bedd1546b7d364b5ce4171547db12a9 -%define branch cms/v%{realversion} -Source: git+https://github.com/cms-externals/pytorch.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&submodules=1&output=/%{n}-%{realversion}.tgz +Source: git+https://github.com/pytorch/pytorch.git?obj=main/v%{realversion}&export=%{n}-%{realversion}&submodules=1&output=/%{n}-%{realversion}.tgz Source1: FindEigen3.cmake Source2: FindFMT.cmake Source99: scram-tools.file/tools/eigen/env -Patch0: pytorch-ignore-different-cuda-include-dir Patch1: pytorch-missing-braces Patch2: pytorch-system-fmt @@ -18,11 +15,9 @@ BuildRequires: cmake ninja Requires: eigen fxdiv numactl openmpi protobuf psimd python3 py3-PyYAML Requires: OpenBLAS zlib protobuf fmt py3-pybind11 py3-typing-extensions %{!?without_cuda:Requires: cuda cudnn} -#%{!?without_rocm:Requires: rocm rocm-rocrand} %prep %setup -n %{n}-%{realversion} -#%patch0 -p1 %patch1 -p1 %patch2 -p1 @@ -32,17 +27,12 @@ rm -rf ../build && mkdir ../build && cd ../build source %{_sourcedir}/env USE_CUDA=OFF -%if "%{cmsos}" != "slc7_aarch64" +%if 0%{!?without_cuda:1} if [ "%{cuda_gcc_support}" = "true" ] ; then -USE_CUDA=%{!?without_cuda:ON} +USE_CUDA=ON fi %endif -#%if 0%{!?without_rocm:1} -#export ROCM_PATH=${ROCM_ROOT} -#export PYTORCH_ROCM_ARCH=gfx900,gfx906,gfx908,gfx90a,gfx1030 -#%endif - cmake ../%{n}-%{realversion} \ -G Ninja \ -DCMAKE_INSTALL_PREFIX=%{i} \ From 4749038945fdb3c649d189cb25e1e40d860d8799 Mon Sep 17 00:00:00 2001 From: Ivan Razumov Date: Thu, 25 Jul 2024 10:08:56 +0200 Subject: [PATCH 08/10] Changes from review --- pytorch-cluster.spec | 4 ++-- pytorch-sparse.spec | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pytorch-cluster.spec b/pytorch-cluster.spec index a25f9aad7ea..f63e3fcfbcb 100644 --- a/pytorch-cluster.spec +++ b/pytorch-cluster.spec @@ -21,9 +21,9 @@ grep -q 'CMAKE_CXX_STANDARD *14' CMakeLists.txt sed -i -e 's|CMAKE_CXX_STANDARD *14|CMAKE_CXX_STANDARD %{cms_cxx_standard}|' CMakeLists.txt USE_CUDA=OFF -%if "%{cmsos}" != "slc7_aarch64" +%if 0%{!?without_cuda:1} if [ "%{cuda_gcc_support}" = "true" ] ; then -USE_CUDA=%{!?without_cuda:ON} +USE_CUDA=ON fi %endif diff --git a/pytorch-sparse.spec b/pytorch-sparse.spec index c9b1cd2bd25..6667b6ff48d 100644 --- a/pytorch-sparse.spec +++ b/pytorch-sparse.spec @@ -21,9 +21,9 @@ grep -q 'CMAKE_CXX_STANDARD *14' CMakeLists.txt sed -i -e 's|CMAKE_CXX_STANDARD *14|CMAKE_CXX_STANDARD %{cms_cxx_standard}|' CMakeLists.txt USE_CUDA=OFF -%if "%{cmsos}" != "slc7_aarch64" +%if 0%{!?without_cuda:1} if [ "%{cuda_gcc_support}" = "true" ] ; then -USE_CUDA=%{!?without_cuda:ON} +USE_CUDA=ON fi %endif From b821aff98501c4ec3f8a67cc404123b1e6374711 Mon Sep 17 00:00:00 2001 From: Ivan Razumov Date: Thu, 25 Jul 2024 10:42:42 +0200 Subject: [PATCH 09/10] Update patch for v2.4.0 --- pytorch-missing-braces.patch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pytorch-missing-braces.patch b/pytorch-missing-braces.patch index 74359bd3687..ce4eaedb85a 100644 --- a/pytorch-missing-braces.patch +++ b/pytorch-missing-braces.patch @@ -1,8 +1,8 @@ diff --git a/torch/csrc/profiler/events.h b/torch/csrc/profiler/events.h -index a1a956f1327..a4e02c795d9 100644 +index 78bac1fea19..f08683223f0 100644 --- a/torch/csrc/profiler/events.h +++ b/torch/csrc/profiler/events.h -@@ -11,7 +11,7 @@ namespace profiler { +@@ -11,7 +11,7 @@ namespace torch::profiler { using perf_counters_t = std::vector; /* Standard list of performance events independent of hardware or backend */ @@ -11,15 +11,13 @@ index a1a956f1327..a4e02c795d9 100644 /* * Number of Processing Elelement (PE) cycles between two points of interest * in time. This should correlate positively with wall-time. Measured in -@@ -25,6 +25,6 @@ constexpr std::array ProfilerPerfEvents = { +@@ -25,5 +25,5 @@ constexpr std::array ProfilerPerfEvents = { * (i.e. work). Across repeat executions, the number of instructions should * be more or less invariant. Measured in uint64_t. PE can be non cpu. */ - "instructions"}; -+ "instructions" }}; - } // namespace profiler - } // namespace torch - ++ "instructions"}}; + } // namespace torch::profiler diff --git a/c10/util/typeid.h b/c10/util/typeid.h index 2c6ac38882f..d165059a956 100644 --- a/c10/util/typeid.h @@ -68,3 +66,5 @@ index 2c6ac38882f..d165059a956 100644 } /* + + From 69849e41f81bad3077e01802e71ac1c4ec9d2823 Mon Sep 17 00:00:00 2001 From: Ivan Razumov Date: Thu, 25 Jul 2024 11:22:52 +0200 Subject: [PATCH 10/10] Update patch --- pytorch-system-fmt.patch | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pytorch-system-fmt.patch b/pytorch-system-fmt.patch index b76f0239b57..ef5a0daa5d0 100644 --- a/pytorch-system-fmt.patch +++ b/pytorch-system-fmt.patch @@ -1,15 +1,15 @@ diff --git a/c10/CMakeLists.txt b/c10/CMakeLists.txt -index feebad7cbb7..8a2ad840286 100644 ---- a/c10/CMakeLists.txt 2024-07-10 13:31:50.729017827 +0200 -+++ b/c10/CMakeLists.txt 2024-07-10 13:32:36.649765887 +0200 -@@ -87,6 +87,7 @@ - if(C10_USE_GLOG) - target_link_libraries(c10 PUBLIC glog::glog) - endif() -+find_package(fmt REQUIRED) - target_link_libraries(c10 PRIVATE fmt::fmt-header-only) +index 82eb9690383..2f40c80a66e 100644 +--- a/c10/CMakeLists.txt ++++ b/c10/CMakeLists.txt +@@ -94,6 +94,7 @@ if(NOT BUILD_LIBTORCHLESS) + if(C10_USE_GLOG) + target_link_libraries(c10 PUBLIC glog::glog) + endif() ++ find_package(fmt REQUIRED) + target_link_libraries(c10 PRIVATE fmt::fmt-header-only) - if(C10_USE_NUMA) + if(C10_USE_NUMA) diff --git a/caffe2/CMakeLists.txt b/caffe2/CMakeLists.txt index 74d0d557190..ff3e94b1c4b 100644 --- a/caffe2/CMakeLists.txt @@ -55,3 +55,4 @@ index c3abce52e4c..5e89d3eb43a 100644 # ---[ Kineto # edge profiler depends on KinetoProfiler but it only does cpu +