<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/730bab5b32d24739ede1aa573c63b4ea3d8c4fcc">https://github.com/macports/macports-ports/commit/730bab5b32d24739ede1aa573c63b4ea3d8c4fcc</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 730bab5b32d py-pytorch: Update to version 2.3.0; Add Python 311 312
</span>730bab5b32d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 730bab5b32d24739ede1aa573c63b4ea3d8c4fcc
</span>Author: Steven Thomas Smith <s.t.smith@ieee.org>
AuthorDate: Thu May 23 22:48:17 2024 -0400
<span style='display:block; white-space:pre;color:#404040;'> py-pytorch: Update to version 2.3.0; Add Python 311 312
</span>---
python/py-pytorch/Portfile | 74 ++++-----
python/py-pytorch/files/Werror.patch | 169 +++++++--------------
python/py-pytorch/files/patch-macOS12-xcode14.diff | 37 +++--
python/py-pytorch/files/patch-macOS13-xcode14.diff | 41 +++++
python/py-pytorch/files/patch-pyproject_toml.diff | 13 ++
5 files changed, 170 insertions(+), 164 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pytorch/Portfile b/python/py-pytorch/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d35cfc1892a..b7bdfe8a3a2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pytorch/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-pytorch/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,23 +5,18 @@ PortGroup github 1.0
</span> PortGroup mpi 1.0
PortGroup python 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name py-pytorch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# NOTE: please remove blacklist of clang14+ after update
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.0.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup pytorch pytorch ${version} v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fetch.type git
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup pytorch pytorch 2.3.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name py-${github.project}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license BSD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers nomaintainer
</span> supported_archs arm64 x86_64
<span style='display:block; white-space:pre;background:#e0ffe0;'>+fetch.type git
</span>
# third_party/pthreadpool needs DISPATCH_APPLY_AUTO (as of torch 2.0.0), requiring 10.12+
# But builds fail for 10.12 - 10.14, so exclude those too
platforms {darwin >= 19}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-license BSD
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> description Tensors and dynamic neural networks in Python \
with strong GPU acceleration
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,7 +30,7 @@ long_description PyTorch is a Python package that provides two \
</span>
homepage https://pytorch.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.versions 38 39 310
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.versions 38 39 310 311 312
</span>
mpi.setup
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,9 +39,6 @@ compiler.cxx_standard 2017
</span>
compiler.blacklist-append *gcc*
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# See: https://github.com/pytorch/pytorch/issues/99223
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist-append {clang >= 1400} {macports-clang-1[4-9]}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> variant mkl description {Enable Intel Math Kernel Library support} { }
# py-mkl supports x86_64 and 10.12 and later only
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -85,20 +77,23 @@ use device \"mps\". Matrix multiplication example:
</span> default_variants-append +mps
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # fix on macOS 12 with Xcode 14:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # error: redefinition of 'MPSGraphResizeNearestRoundingMode'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { (${os.major} == 21) && [vercmp ${xcodeversion} 14] >= 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-macOS12-xcode14.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # fix on macOS 12-13 with Xcode 14:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.major} == 21 && [vercmp ${xcodeversion} 14] >= 0 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-macOS12-xcode14.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif { ${os.major} == 22 && [vercmp ${xcodeversion} 14] >= 0 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-macOS13-xcode14.diff
</span> }
}
if {${name} ne ${subport}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_build-append \
port:git \
path:bin/doxygen:doxygen \
port:cctools \
path:bin/cmake:cmake \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:bin/ninja:ninja \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-astunparse \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-requests \
</span> port:py${python.version}-setuptools
depends_lib-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -126,15 +121,23 @@ if {${name} ne ${subport}} {
</span> depends_run-append \
port:py${python.version}-onnx
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-fetch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # error: RPC failed; curl 92 HTTP/2 stream 5 was not closed cleanly: CANCEL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${workpath} "${git.cmd} config --global http.postBuffer 16777216"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-fetch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath} "git submodule update --init --recursive"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "${git.cmd} submodule update --init --recursive"
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # diff -Naur ./py-pytorch_orig ./py-pytorch_new | sed -E -e 's/\.\/py-pytorch_(orig|new)/\./g' | sed -E -e 's|/opt/local|@@PREFIX@@|g' > ~/Downloads/patch-pyproject_toml.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-pyproject_toml.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Patch to fix init issue with google-glog 0.5.0, caused by breaking API change.
# Refer to patch header for detailed background.
# Upstream PyTorch issue: https://github.com/pytorch/pytorch/issues/58054
# diff -NaurdwB ./py-pytorch-orig/c10/util/Logging.cpp ./py-pytorch-new/c10/util/Logging.cpp | sed -E -e 's/\.\/py-pytorch-(orig|new)/\.\//' | sed -E -e 's|/opt/local|@@PREFIX@@|g' > ~/Downloads/patch-glog-init-check.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-glog-init-check.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-glog-init-check.diff
</span>
# Disable -Werror in third_party/fbgemm
patchfiles-append Werror.patch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -151,16 +154,24 @@ if {${name} ne ${subport}} {
</span> reinplace "s|MACPORTS_PREFIX|${prefix}|g" \
cmake/Modules/FindMKL.cmake
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:py${python.version}-mkl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:py${python.version}-mkl-include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:py${python.version}-mkl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:py${python.version}-mkl-include
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.cpath-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${prefix}/include/libomp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.library_path-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${prefix}/lib/libomp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cppflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -I${prefix}/include/libomp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.ccache yes
# ZSTD support broke with 1.2.0-1.12.0. Check with future releases.
build.env-append \
CMAKE_LIBRARY_PATH=${prefix}/lib:${prefix}/lib/libomp \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBRARY_PATH=${prefix}/lib:${prefix}/lib/libomp \
</span> OpenCV_DIR=${prefix}/libexec/opencv4/cmake \
USE_CCACHE=OFF \
USE_CUDA=OFF \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -179,12 +190,6 @@ if {${name} ne ${subport}} {
</span> USE_ZMQ=ON \
USE_ZSTD=OFF
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.dir ${worksrcpath}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.post_args
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.dir ${worksrcpath}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.target install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-destroot {
set py_torch_root ${python.pkgd}/torch
foreach slib [glob -directory ${destroot}${py_torch_root} *.so] {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -200,14 +205,9 @@ if {${name} ne ${subport}} {
</span> # pytorch's tests all use GPU compilation
if { [lsearch ${build.env} {USE_CUDA=OFF}] != -1 } {
test.run yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.type none
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # overload the github livecheck regex to look for versions that
# are just numbers and '.', no letters (e.g., "3.7.3_rc2").
github.livecheck.regex {([0-9.]+)}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pytorch/files/Werror.patch b/python/py-pytorch/files/Werror.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 2f0f8daf213..f2a97e27642 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pytorch/files/Werror.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-pytorch/files/Werror.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,50 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- third_party/fbgemm/CMakeLists.txt.orig 2023-03-31 09:12:01
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ third_party/fbgemm/CMakeLists.txt 2023-03-31 09:14:00
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -144,7 +144,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else(MSVC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- string(APPEND CMAKE_CXX_FLAGS " -Wall")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- string(APPEND CMAKE_CXX_FLAGS " -Wextra")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- string(APPEND CMAKE_CXX_FLAGS " -Werror")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- string(APPEND CMAKE_CXX_FLAGS " -Wno-deprecated-declarations")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_compile_options(fbgemm_avx2 PRIVATE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "-m64" "-mavx2" "-mf16c" "-mfma")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- caffe2/CMakeLists.txt.orig 2023-04-01 02:16:59
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ caffe2/CMakeLists.txt 2023-04-01 02:34:02
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -532,8 +532,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Required workaround for LLVM 9 includes.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(NOT MSVC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set_source_files_properties(${TORCH_SRC_DIR}/csrc/jit/tensorexpr/llvm_jit.cpp PROPERTIES COMPILE_FLAGS -Wno-noexcept-type)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # Force -Werror on several files
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set_source_files_properties(${CMAKE_CURRENT_LIST_DIR}/../aten/src/ATen/native/mkldnn/Pooling.cpp PROPERTIES COMPILE_FLAGS "-Werror")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Disable certain warnings for GCC-9.X
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(CMAKE_COMPILER_IS_GNUCXX AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 9.0.0))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- third_party/ideep/mkl-dnn/cmake/platform.cmake.orig 2023-04-01 02:19:51
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ third_party/ideep/mkl-dnn/cmake/platform.cmake 2023-04-01 02:36:15
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -110,7 +110,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- append(CMAKE_CCXX_FLAGS "/fp:precise")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- elseif(UNIX OR MINGW)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- append(CMAKE_CCXX_FLAGS "-Wall -Werror -Wno-unknown-pragmas")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ append(CMAKE_CCXX_FLAGS "-Wall -Wno-unknown-pragmas")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(DNNL_GRAPH_WITH_SYCL OR CMAKE_BASE_NAME STREQUAL "icx" OR CMAKE_BASE_NAME STREQUAL "icpx")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # When using Debug build mode CMake adds "-g" option without "-O0"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # causing the warning. This probably happens because clang/gcc compilers
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- third_party/ideep/mkl-dnn/src/backend/graph_compiler/core/CMakeLists.txt.orig 2023-04-01 02:19:52
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ third_party/ideep/mkl-dnn/src/backend/graph_compiler/core/CMakeLists.txt 2023-04-01 02:40:35
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -224,8 +224,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wmissing-field-initializers")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wmissing-field-initializers")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden -ffunction-sections -fdata-sections -Wall -Wno-unused-variable -Wno-unused-function -std=c99 -fPIC -Werror -DSC_HOME=\"${CMAKE_CURRENT_SOURCE_DIR}\"")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -ffunction-sections -fdata-sections -Wall -Wno-unused-variable -Wno-unused-function -std=c++${SC_CPP_VER} -fPIC -Werror -DSC_HOME=\"${CMAKE_CURRENT_SOURCE_DIR}\"")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden -ffunction-sections -fdata-sections -Wall -Wno-unused-variable -Wno-unused-function -std=c99 -fPIC -DSC_HOME=\"${CMAKE_CURRENT_SOURCE_DIR}\"")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -ffunction-sections -fdata-sections -Wall -Wno-unused-variable -Wno-unused-function -std=c++${SC_CPP_VER} -fPIC -DSC_HOME=\"${CMAKE_CURRENT_SOURCE_DIR}\"")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Deal with Clang < 6.0's missing-braces issue
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- third_party/cub/CMakeLists.txt.orig 2023-04-01 02:19:18
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ third_party/cub/CMakeLists.txt 2023-04-01 02:41:20
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -Naur ./third_party/cub/CMakeLists.txt ./third_party/cub/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./third_party/cub/CMakeLists.txt 2024-05-26 07:42:46
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./third_party/cub/CMakeLists.txt 2024-05-26 07:55:35
</span> @@ -119,7 +119,6 @@
set(CUB_TREAT_FILE_AS_CXX "/TP")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,8 +9,20 @@
</span> append_option_if_available("-Wall" CUB_CXX_WARNINGS)
append_option_if_available("-Wextra" CUB_CXX_WARNINGS)
append_option_if_available("-Winit-self" CUB_CXX_WARNINGS)
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- third_party/tensorpipe/third_party/googletest/googletest/cmake/internal_utils.cmake.orig 2023-04-01 02:21:03
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ third_party/tensorpipe/third_party/googletest/googletest/cmake/internal_utils.cmake 2023-04-01 02:43:48
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -Naur ./third_party/fbgemm/CMakeLists.txt ./third_party/fbgemm/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./third_party/fbgemm/CMakeLists.txt 2024-05-26 07:42:48
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./third_party/fbgemm/CMakeLists.txt 2024-05-26 07:47:11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -189,7 +189,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else(MSVC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ string(APPEND CMAKE_CXX_FLAGS " -Wall")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ string(APPEND CMAKE_CXX_FLAGS " -Wextra")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- string(APPEND CMAKE_CXX_FLAGS " -Werror")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ string(APPEND CMAKE_CXX_FLAGS " -Wno-deprecated-declarations")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ string(APPEND CMAKE_CXX_FLAGS " -Wimplicit-fallthrough")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_compile_options(fbgemm_avx2 PRIVATE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -Naur ./third_party/fbgemm/third_party/googletest/googletest/cmake/internal_utils.cmake ./third_party/fbgemm/third_party/googletest/googletest/cmake/internal_utils.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./third_party/fbgemm/third_party/googletest/googletest/cmake/internal_utils.cmake 2024-05-26 07:42:56
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./third_party/fbgemm/third_party/googletest/googletest/cmake/internal_utils.cmake 2024-05-26 07:58:22
</span> @@ -82,13 +82,13 @@
# http://stackoverflow.com/questions/3232669 explains the issue.
set(cxx_base_flags "${cxx_base_flags} -wd4702")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,11 +39,12 @@
</span> if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0.0)
set(cxx_base_flags "${cxx_base_flags} -Wno-error=dangling-else")
endif()
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- third_party/fbgemm/third_party/googletest/googletest/cmake/internal_utils.cmake.orig 2023-04-01 02:19:34
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ third_party/fbgemm/third_party/googletest/googletest/cmake/internal_utils.cmake 2023-04-01 02:45:03
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -82,13 +82,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # http://stackoverflow.com/questions/3232669 explains the issue.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(cxx_base_flags "${cxx_base_flags} -wd4702")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -Naur ./third_party/googletest/googletest/cmake/internal_utils.cmake ./third_party/googletest/googletest/cmake/internal_utils.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./third_party/googletest/googletest/cmake/internal_utils.cmake 2024-05-26 07:42:57
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./third_party/googletest/googletest/cmake/internal_utils.cmake 2024-05-26 08:01:29
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -84,13 +84,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Ensure MSVC treats source files as UTF-8 encoded.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(cxx_base_flags "${cxx_base_flags} -utf-8")
</span> elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
- set(cxx_base_flags "-Wall -Wshadow -Werror -Wconversion")
+ set(cxx_base_flags "-Wall -Wshadow -Wconversion")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -89,8 +58,9 @@
</span> if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0.0)
set(cxx_base_flags "${cxx_base_flags} -Wno-error=dangling-else")
endif()
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- third_party/kineto/libkineto/third_party/dynolog/third_party/DCGM/CMakeLists.txt.orig 2023-04-01 02:20:30
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ third_party/kineto/libkineto/third_party/dynolog/third_party/DCGM/CMakeLists.txt 2023-04-01 02:49:10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -Naur ./third_party/kineto/libkineto/third_party/dynolog/third_party/DCGM/CMakeLists.txt ./third_party/kineto/libkineto/third_party/dynolog/third_party/DCGM/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./third_party/kineto/libkineto/third_party/dynolog/third_party/DCGM/CMakeLists.txt 2024-05-26 07:43:30
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./third_party/kineto/libkineto/third_party/dynolog/third_party/DCGM/CMakeLists.txt 2024-05-26 07:59:14
</span> @@ -30,7 +30,7 @@
set(CMAKE_C_VISIBILITY_PRESET hidden)
set(CMAKE_VISIBILITY_INLINES_HIDDEN 1)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -100,12 +70,16 @@
</span>
include(CheckCCompilerFlag)
check_c_compiler_flag("-Wno-cast-function-type" CC_HAS_WNO_CAST_FUNCTION_TYPE)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -83,10 +83,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -g -O0")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -80,13 +80,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(CMAKE_BUILD_TYPE STREQUAL "Debug")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -g -O0")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O0")
</span> set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${DCGM_CXX_FLAGS} -g -O0")
elseif(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -g -fno-omit-frame-pointer")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -fno-omit-frame-pointer")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -fno-omit-frame-pointer")
</span> set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${DCGM_CXX_FLAGS} -g -fno-omit-frame-pointer")
elseif(CMAKE_BUILD_TYPE STREQUAL "Release")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -s -O3 -g -fno-omit-frame-pointer")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -113,8 +87,9 @@
</span> set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${DCGM_CXX_FLAGS} -s -O3 -g -fno-omit-frame-pointer")
endif()
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- third_party/kineto/libkineto/third_party/dynolog/third_party/cpr/CMakeLists.txt.orig 2023-04-01 02:20:30
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ third_party/kineto/libkineto/third_party/dynolog/third_party/cpr/CMakeLists.txt 2023-04-01 02:50:06
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -Naur ./third_party/kineto/libkineto/third_party/dynolog/third_party/cpr/CMakeLists.txt ./third_party/kineto/libkineto/third_party/dynolog/third_party/cpr/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./third_party/kineto/libkineto/third_party/dynolog/third_party/cpr/CMakeLists.txt 2024-05-26 07:43:31
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./third_party/kineto/libkineto/third_party/dynolog/third_party/cpr/CMakeLists.txt 2024-05-26 07:59:58
</span> @@ -73,7 +73,7 @@
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -124,8 +99,9 @@
</span> endif()
# SSL
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- third_party/kineto/libkineto/third_party/dynolog/third_party/pfs/CMakeLists.txt.orig 2023-04-01 02:20:32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ third_party/kineto/libkineto/third_party/dynolog/third_party/pfs/CMakeLists.txt 2023-04-01 02:51:47
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -Naur ./third_party/kineto/libkineto/third_party/dynolog/third_party/pfs/CMakeLists.txt ./third_party/kineto/libkineto/third_party/dynolog/third_party/pfs/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./third_party/kineto/libkineto/third_party/dynolog/third_party/pfs/CMakeLists.txt 2024-05-26 07:43:32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./third_party/kineto/libkineto/third_party/dynolog/third_party/pfs/CMakeLists.txt 2024-05-26 08:00:28
</span> @@ -12,7 +12,7 @@
endif ()
message(STATUS "Build type: ${CMAKE_BUILD_TYPE}")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -135,8 +111,9 @@
</span>
include_directories (include)
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- third_party/kineto/libkineto/third_party/googletest/googletest/cmake/internal_utils.cmake.orig 2023-04-01 02:20:32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ third_party/kineto/libkineto/third_party/googletest/googletest/cmake/internal_utils.cmake 2023-04-01 02:52:47
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -Naur ./third_party/kineto/libkineto/third_party/googletest/googletest/cmake/internal_utils.cmake ./third_party/kineto/libkineto/third_party/googletest/googletest/cmake/internal_utils.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./third_party/kineto/libkineto/third_party/googletest/googletest/cmake/internal_utils.cmake 2024-05-26 07:43:32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./third_party/kineto/libkineto/third_party/googletest/googletest/cmake/internal_utils.cmake 2024-05-26 08:00:53
</span> @@ -82,13 +82,13 @@
# http://stackoverflow.com/questions/3232669 explains the issue.
set(cxx_base_flags "${cxx_base_flags} -wd4702")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -153,53 +130,9 @@
</span> if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0.0)
set(cxx_base_flags "${cxx_base_flags} -Wno-error=dangling-else")
endif()
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- third_party/googletest/googletest/cmake/internal_utils.cmake.orig 2023-04-01 02:19:35
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ third_party/googletest/googletest/cmake/internal_utils.cmake 2023-04-01 02:56:06
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -84,13 +84,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Ensure MSVC treats source files as UTF-8 encoded.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(cxx_base_flags "${cxx_base_flags} -utf-8")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(cxx_base_flags "-Wall -Wshadow -Werror -Wconversion")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(cxx_base_flags "-Wall -Wshadow -Wconversion")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(cxx_exception_flags "-fexceptions")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(cxx_no_exception_flags "-fno-exceptions")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(cxx_strict_flags "-W -Wpointer-arith -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch -Wunused-parameter -Wcast-align -Wchar-subscripts -Winline -Wredundant-decls")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(cxx_no_rtti_flags "-fno-rtti")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- elseif (CMAKE_COMPILER_IS_GNUCXX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(cxx_base_flags "-Wall -Wshadow -Werror")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(cxx_base_flags "-Wall -Wshadow")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0.0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(cxx_base_flags "${cxx_base_flags} -Wno-error=dangling-else")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- third_party/flatbuffers/CMakeLists.txt.orig 2023-04-01 02:19:34
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ third_party/flatbuffers/CMakeLists.txt 2023-04-01 02:57:11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -264,7 +264,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${CMAKE_CXX_FLAGS} -std=c++0x")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif(CYGWIN)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(CMAKE_CXX_FLAGS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "${CMAKE_CXX_FLAGS} -Wall -pedantic -Werror -Wextra -Werror=shadow")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "${CMAKE_CXX_FLAGS} -Wall -pedantic -Wextra -Werror=shadow")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(FLATBUFFERS_PRIVATE_CXX_FLAGS "-Wold-style-cast")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.4)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -288,7 +288,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic -Werror -Wextra -Wno-unused-parameter")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic -Wextra -Wno-unused-parameter")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(FLATBUFFERS_PRIVATE_CXX_FLAGS "-Wold-style-cast")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.8)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- list(APPEND FLATBUFFERS_PRIVATE_CXX_FLAGS "-Wimplicit-fallthrough" "-Wextra-semi" "-Werror=unused-private-field") # enable warning
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -750,4 +750,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Include for running Google Benchmarks.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(FLATBUFFERS_BUILD_BENCHMARKS AND CMAKE_VERSION VERSION_GREATER 3.13)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_subdirectory(benchmarks)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-\ No newline at end of file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- third_party/protobuf/third_party/googletest/googletest/cmake/internal_utils.cmake.orig 2023-04-01 02:20:53
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ third_party/protobuf/third_party/googletest/googletest/cmake/internal_utils.cmake 2023-04-01 02:59:10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -Naur ./third_party/protobuf/third_party/googletest/googletest/cmake/internal_utils.cmake ./third_party/protobuf/third_party/googletest/googletest/cmake/internal_utils.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./third_party/protobuf/third_party/googletest/googletest/cmake/internal_utils.cmake 2024-05-26 07:43:45
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./third_party/protobuf/third_party/googletest/googletest/cmake/internal_utils.cmake 2024-05-26 08:02:39
</span> @@ -76,7 +76,7 @@
# http://stackoverflow.com/questions/3232669 explains the issue.
set(cxx_base_flags "${cxx_base_flags} -wd4702")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -209,3 +142,15 @@
</span> if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0.0)
set(cxx_base_flags "${cxx_base_flags} -Wno-error=dangling-else")
endif()
<span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -Naur ./third_party/tensorpipe/third_party/googletest/googletest/cmake/internal_utils.cmake ./third_party/tensorpipe/third_party/googletest/googletest/cmake/internal_utils.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./third_party/tensorpipe/third_party/googletest/googletest/cmake/internal_utils.cmake 2024-05-26 07:43:50
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./third_party/tensorpipe/third_party/googletest/googletest/cmake/internal_utils.cmake 2024-05-26 07:57:24
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -82,7 +82,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # http://stackoverflow.com/questions/3232669 explains the issue.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(cxx_base_flags "${cxx_base_flags} -wd4702")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(cxx_base_flags "-Wall -Wshadow -Werror -Wconversion")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(cxx_base_flags "-Wall -Wshadow -Wconversion")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(cxx_exception_flags "-fexceptions")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(cxx_no_exception_flags "-fno-exceptions")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(cxx_strict_flags "-W -Wpointer-arith -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch -Wunused-parameter -Wcast-align -Wchar-subscripts -Winline -Wredundant-decls")
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pytorch/files/patch-macOS12-xcode14.diff b/python/py-pytorch/files/patch-macOS12-xcode14.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index c4a13ae1b88..26f4f3ec30b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pytorch/files/patch-macOS12-xcode14.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-pytorch/files/patch-macOS12-xcode14.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +1,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git aten/src/ATen/native/mps/MPSGraphVenturaOps.h aten/src/ATen/native/mps/MPSGraphVenturaOps.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 638d39a314..18b6716a1e 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- aten/src/ATen/native/mps/MPSGraphVenturaOps.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ aten/src/ATen/native/mps/MPSGraphVenturaOps.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4,20 +4,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // TODO: Remove me when moved to MacOS 13
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @interface MPSGraph (VenturaOps)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -Naur ./aten/src/ATen/native/mps/MPSGraphVenturaOps.h ./aten/src/ATen/native/mps/MPSGraphVenturaOps.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./aten/src/ATen/native/mps/MPSGraphVenturaOps.h 2024-06-05 07:51:01
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./aten/src/ATen/native/mps/MPSGraphVenturaOps.h 2024-06-06 11:04:33
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -38,15 +38,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if !defined(__MAC_13_0) && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (!defined(MAC_OS_X_VERSION_13_0) || (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_13_0))
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>--#if !defined(__MAC_13_0) && \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (!defined(MAC_OS_X_VERSION_13_0) || (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_13_0))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span> -typedef NS_ENUM(NSUInteger, MPSGraphResizeNearestRoundingMode)
-{
- MPSGraphResizeNearestRoundingModeRoundPreferCeil = 0L,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,8 +14,19 @@ index 638d39a314..18b6716a1e 100644
</span> - MPSGraphResizeNearestRoundingModeRoundToEven = 4L,
- MPSGraphResizeNearestRoundingModeRoundToOdd = 5L,
-};
<span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - (MPSGraphTensor * _Nonnull)cumulativeSumWithTensor:(MPSGraphTensor * _Nonnull)tensor
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- axis:(NSInteger)axis
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- name:(NSString * _Nullable)name;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// fix on macOS 12, Xcode 14:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// error: redefinition of 'MPSGraphResizeNearestRoundingMode'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * typedef NS_ENUM(NSUInteger, MPSGraphResizeNearestRoundingMode)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * MPSGraphResizeNearestRoundingModeRoundPreferCeil = 0L,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * MPSGraphResizeNearestRoundingModeRoundPreferFloor = 1L,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * MPSGraphResizeNearestRoundingModeCeil = 2L,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * MPSGraphResizeNearestRoundingModeFloor = 3L,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * MPSGraphResizeNearestRoundingModeRoundToEven = 4L,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * MPSGraphResizeNearestRoundingModeRoundToOdd = 5L,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Define complex enums for MacOS 12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define MPSDataTypeComplexBit 0x01000000
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pytorch/files/patch-macOS13-xcode14.diff b/python/py-pytorch/files/patch-macOS13-xcode14.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..8e1e1df2ccd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-pytorch/files/patch-macOS13-xcode14.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,41 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -Naur ./aten/src/ATen/native/mps/MPSGraphSonomaOps.h ./aten/src/ATen/native/mps/MPSGraphSonomaOps.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./aten/src/ATen/native/mps/MPSGraphSonomaOps.h 2024-06-05 07:25:16
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./aten/src/ATen/native/mps/MPSGraphSonomaOps.h 2024-06-06 13:56:47
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5,21 +5,29 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if !defined(__MAC_14_0) && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (!defined(MAC_OS_X_VERSION_14_0) || (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_14_0))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef NS_ENUM(NSUInteger, MPSGraphFFTScalingMode)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- MPSGraphFFTScalingModeNone = 0L,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- MPSGraphFFTScalingModeSize = 1L,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- MPSGraphFFTScalingModeUnitary = 2L,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// fix on macOS 13, Xcode 14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// error: redefinition of 'MPSGraphFFTScalingMode'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * typedef NS_ENUM(NSUInteger, MPSGraphFFTScalingMode)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * MPSGraphFFTScalingModeNone = 0L,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * MPSGraphFFTScalingModeSize = 1L,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * MPSGraphFFTScalingModeUnitary = 2L,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @interface FakeMPSGraphFFTDescriptor : NSObject<NSCopying>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @property (readwrite, nonatomic) BOOL inverse;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-@property (readwrite, nonatomic) MPSGraphFFTScalingMode scalingMode;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * @property (readwrite, nonatomic) MPSGraphFFTScalingMode scalingMode;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @property (readwrite, nonatomic) BOOL roundToOddHermitean;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ +(nullable instancetype) descriptor;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-@compatibility_alias MPSGraphFFTDescriptor FakeMPSGraphFFTDescriptor;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * @compatibility_alias MPSGraphFFTDescriptor FakeMPSGraphFFTDescriptor;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @interface MPSGraph (SonomaOps)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -(MPSGraphTensor * _Nonnull) conjugateWithTensor:(MPSGraphTensor * _Nonnull) tensor
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pytorch/files/patch-pyproject_toml.diff b/python/py-pytorch/files/patch-pyproject_toml.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..0ea6d54645a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-pytorch/files/patch-pyproject_toml.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -Naur ./pyproject.toml ./pyproject.toml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./pyproject.toml 2024-05-26 08:22:27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./pyproject.toml 2024-05-26 08:22:48
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4,9 +4,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "wheel",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "astunparse",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "numpy",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "ninja",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "pyyaml",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "cmake",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "typing-extensions",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "requests",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ]
</span></pre><pre style='margin:0'>
</pre>