<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a9d05e09427101a0d6d803b72b9f3d23599e05f6">https://github.com/macports/macports-ports/commit/a9d05e09427101a0d6d803b72b9f3d23599e05f6</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 a9d05e09427 py-pytorch: fix build on macOS 12 with Xcode 14
</span>a9d05e09427 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a9d05e09427101a0d6d803b72b9f3d23599e05f6
</span>Author: Kirill A. Korinsky <kirill@korins.ky>
AuthorDate: Mon Apr 24 15:29:48 2023 +0200
<span style='display:block; white-space:pre;color:#404040;'> py-pytorch: fix build on macOS 12 with Xcode 14
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> I've also removed useless dependency from tbb
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> [skip ci]
</span>---
python/py-pytorch/Portfile | 10 +++++++--
python/py-pytorch/files/patch-macOS12-xcode14.diff | 25 ++++++++++++++++++++++
2 files changed, 33 insertions(+), 2 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 68f36cb7bb0..7de8f8d2bde 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;'>@@ -4,10 +4,11 @@ PortSystem 1.0
</span> PortGroup github 1.0
PortGroup mpi 1.0
PortGroup python 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup xcodeversion 1.0
</span>
name py-pytorch
version 2.0.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> github.setup pytorch pytorch ${version} v
fetch.type git
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,6 +79,12 @@ use device \"mps\". Matrix multiplication example:
</span>
default_variants-append +mps
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # fix on macOS 12 with 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;'>+ 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;'>+ }
</span> }
if {${name} ne ${subport}} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -97,7 +104,6 @@ if {${name} ne ${subport}} {
</span> path:lib/opencv4/libopencv_core.dylib:opencv4 \
port:zmq \
port:zstd \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:tbb \
</span> port:google-glog \
port:gflags \
port:leveldb \
<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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..c4a13ae1b88
</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-macOS12-xcode14.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,25 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+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:#e0ffe0;'>+index 638d39a314..18b6716a1e 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- aten/src/ATen/native/mps/MPSGraphVenturaOps.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ aten/src/ATen/native/mps/MPSGraphVenturaOps.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4,20 +4,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // TODO: Remove me when moved to MacOS 13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @interface MPSGraph (VenturaOps)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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:#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;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ - (MPSGraphTensor * _Nonnull)cumulativeSumWithTensor:(MPSGraphTensor * _Nonnull)tensor
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ axis:(NSInteger)axis
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ name:(NSString * _Nullable)name;
</span></pre><pre style='margin:0'>
</pre>