gentoo auto-resync : 24:04:2023 - 12:10:01

3 files changed, 15 insertions, 1 deletions

diff --git a/sci-libs/caffe2/Manifest b/sci-libs/caffe2/Manifest
index e73775064479..75e148e2be4f 100644
--- a/sci-libs/caffe2/Manifest
+++ b/sci-libs/caffe2/Manifest
@@ -3,10 +3,11 @@ AUX caffe2-1.12.0-glog-0.6.0.patch 959 BLAKE2B eb0c18a34a2c5a1b68a420b9001eac5c8
 AUX caffe2-1.13.0-gentoo.patch 8000 BLAKE2B a11a6bccac970ce8658041db20f90814183a8eef45571565512bafa9f172348f08ccdb67f5e543c8f9e236a6283f2d50a608cfc671e18886319a82dc84cd95e5 SHA512 20a43490cb80174fc688f7a773ac332362a5a013885a7cfdfdfe89996bc3e2483ad4b29149d71730213174d27d8534707813e825bdf4ea3e3bc7b664bad39953
 AUX caffe2-1.13.0-install-dirs.patch 5737 BLAKE2B 10b10e3a29976344c7596e1c4e7a604856c66d91cb7518308422f7ffac82ffe183dc81becab27866814c06e321e97458ab6a6908aa01379299c7fdf8fdccf153 SHA512 1e2e4f646cec24b5373872865522a909d1c154623e232c06e3da361e4d29b8d7520c446f53fbf42aab5f00bab05d1f278ce9425e506a9a5ac73cbb10570bd325
 AUX caffe2-1.13.1-tensorpipe.patch 374 BLAKE2B 46d45aae88f99c213f0da039bad5aa0c470a6c505ed1d28088ecb8dd445547e52a6d2c087c52c15b20da31808cd9213c1e672880e9bf4afe9c487358b4d4cd9d SHA512 d7315408b3ad4630715c18fff853b07e589ae78f5fcc8eef7f8791202fca459a3b23481856a50a5d432aec26482eb33adf37ba0a37d45f719ceb29081449345d
+AUX caffe2-2.0.0-cudnn_include_fix.patch 526 BLAKE2B 63959783a94bfa2b02f78e36e754ef6c54d9f3dfb0bfdedd0fb9ef6553204b54b2dfb1676312689bbc3eace897d5f0441faf9af376f27c3c831c3ffcece31e5d SHA512 ff2ba61a4c69620bb1078aa7235b015a6165bc0df65e5e4ec04d4f3515f80dc865cc904d279fefbc90784b571f41d82441ce8045a27947ae7d3d52505e813b3c
 AUX caffe2-2.0.0-gcc13.patch 1203 BLAKE2B df55608c6019802da32809cb210b60cf0debf38e8d7a20135e92465be28d3537f2d0b52c67a61b264e241539b64fa02aa99eefb856686a9f9e3c45291b8d6a70 SHA512 59e933c60abef3ac97a1e3b2cd7a9935f9fdde4bc3ed1c2c53c729af6d7ed735ffd38cbdac08d32c668cd2751f3f871cc833883efd19732c04a0f67fbb49c41d
 AUX caffe2-2.0.0-gentoo.patch 6682 BLAKE2B 67657b1ca48ded05a6b07ce18df89c4b8759004cbe8b9a74e53ff1c11c2b7edc55f4282d08bc1531cc2fd1a5c330db4bd1ab2ca4fb6b44b91e1a784fe8da7324 SHA512 c42b59b7f8d44245bfd986c5e228412fe92546300083483b21486465d29bac2735e5c35e12bfd63c9a95210e16a10c733e70512d573c7b05a2f0b8bf083a0a66
 DIST pytorch-1.13.1.tar.gz 108279745 BLAKE2B 75de03b74dfdaf8d8fb5ea743fcc0c1b0e408a714ad4160c487921220a7b1755e5fa6e587e6bbc8c9f34dd75e096d2e6dd69c80d24821835fff6c833314434d3 SHA512 f16f89d027efade11d057245cad5b69a390e88b458398310ae30de2dbff7c8fd7f1165be7b8da7ea989c81ac3f5a66c5cb9050610e441a97c83fb8aa28c0bd62
 DIST pytorch-2.0.0.tar.gz 111327292 BLAKE2B 6d593a975c0ade714f0b189f7e3c4ff704b9a9a2377b5e441a9cefc202fa22779966d08948e63671912c6ea5a0eee124042155f4f57a654db34e19e42f013cc9 SHA512 4dd76160711c0d87f3026c8b7fa3ed149dd86b8ac0ee9ecea0eaf80d2e6ce8c29368392e77b9466d90b60634087b462b782495997a5d33367cc8ca9fe14c8a14
 EBUILD caffe2-1.13.1-r4.ebuild 5009 BLAKE2B dd92c8d27be86d635a832e286ed2b1617e10520f02447d7aaf097cdabcd9c8ba634490ef4af59325d64048bf63f39d00a693373ab921c855e5716514c212d38c SHA512 5269a5c121b2bb9c5d4a1a07c6d1300577e4abec418625c2cae88c6d0385768fe73f380a997b5f46837eba29948c6397e4a4ac642c9d1c94f5ac0fba6e794732
-EBUILD caffe2-2.0.0-r2.ebuild 5101 BLAKE2B 7315bb87a25381c5577631f91ba1339a50aef09fa71180c4a6e3bf794b563a6f36946948b35f869c571afda747936af2cfd5704c423b73a4ab1720541a9a4c75 SHA512 cc7f38c5bf10686ecfaf61f48e46537ad2ee00f927051e5126eab9ee50f3d5806233adeef7fb045c2e08f6fd375a67186d2595d313f182a490896b5dc255078b
+EBUILD caffe2-2.0.0-r2.ebuild 5145 BLAKE2B 01babac2df140c8cbe821e4a683143e7b2f1e6ad1279c656b551a8df48cdd304c80a36c9c8b5912aac36ed0e6309de1fcd32de3a1d8d4c5ae68375f40be9eae0 SHA512 343e956a16af420d17967a78ce1119461e132abe5bde5527cacc5ef89a8cc480fc901a844c22132aed0a0c075bb28589e46f106592f5dbbb93bfc463920eb9cf
 MISC metadata.xml 1116 BLAKE2B ac8f5d50c8727a42ab904c5705009247b89b695b8a4e918b2a9a184c7c3e11de19dde49dce207b1eafb0a73a03198efc2efe3890a3b697c18fe86b5740ce2b4b SHA512 6060fb034c36e65279e01ff3c858f944407fbf7a47359f795a13d7fbaa26f5f26945d28d26fbf4301ba359144fc53ba4d845c9dc89669496c0830146fea34724
diff --git a/sci-libs/caffe2/caffe2-2.0.0-r2.ebuild b/sci-libs/caffe2/caffe2-2.0.0-r2.ebuild
index 38ce9cd3befa..7667c7bbee17 100644
--- a/sci-libs/caffe2/caffe2-2.0.0-r2.ebuild
+++ b/sci-libs/caffe2/caffe2-2.0.0-r2.ebuild
@@ -81,6 +81,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.12.0-glog-0.6.0.patch
 	"${FILESDIR}"/${PN}-1.13.1-tensorpipe.patch
 	"${FILESDIR}"/${P}-gcc13.patch
+	"${FILESDIR}"/${P}-cudnn_include_fix.patch
 )
 
 src_prepare() {
diff --git a/sci-libs/caffe2/files/caffe2-2.0.0-cudnn_include_fix.patch b/sci-libs/caffe2/files/caffe2-2.0.0-cudnn_include_fix.patch
new file mode 100644
index 000000000000..ff64e4108087
--- /dev/null
+++ b/sci-libs/caffe2/files/caffe2-2.0.0-cudnn_include_fix.patch
@@ -0,0 +1,12 @@
+diff -uar pytorch-2.0.0/cmake/Dependencies.cmake pytorch-2.0.0orig/cmake/Dependencies.cmake
+--- a/cmake/Dependencies.cmake	2023-04-23 09:43:20.767566047 -0400
++++ b/cmake/Dependencies.cmake	2023-03-09 17:42:00.000000000 -0500
+@@ -1235,7 +1235,7 @@
+ 
+ # ---[ cuDNN
+ if(USE_CUDNN)
+-  set(CUDNN_FRONTEND_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/../third_party/cudnn_frontend/include)
++  set(CUDNN_FRONTEND_INCLUDE_DIR /opt/cuda/include)
+   target_include_directories(torch::cudnn INTERFACE ${CUDNN_FRONTEND_INCLUDE_DIR})
+ endif()
+