diff options
29 files changed, 0 insertions, 1164 deletions
diff --git a/sci-libs/pytorch/Manifest b/sci-libs/pytorch/Manifest deleted file mode 100644 index 1df2744f2..000000000 --- a/sci-libs/pytorch/Manifest +++ /dev/null @@ -1,38 +0,0 @@ -DIST FP16-4dfe081cf6bcd15db339cf2680b9281b8451eeb3.tar.gz 71301 BLAKE2B f6a2115a82ca9acd7ccb1bf94c59f68e6ffea4b0e20aa5152349a10119b45d8ba45f5673899b6f18ee044289a51141944e41d7b0972889afc1d93db88d88ed7c SHA512 e79a1f6f8d4aeca85982158d5b070923d31d4f2062ed84cfa6f26c47a34f2e8ac49e0f330b7d49f5732d5e1eec6e7afccdac43645070060fb7827e2ce261dd3e -DIST FXdiv-b408327ac2a15ec3e43352421954f5b1967701d1.tar.gz 9652 BLAKE2B ce2082f9e0ec55ab43cfee57e29cfc8f1957bdde70c1bbeadc599ac34ed8ade9d1334e68583a0fb14b4405357cc1039579b09fff4b39a5190bdae304c4ea3de3 SHA512 d46d7c1437eccf8dc5ab5e51b0641d190839451ab059c8a24a220a9cf05a84a66b5d08c3ff730622efe491152a8378a2c726fd9abad19a3df98db40d6a13e4b9 -DIST NNPACK-c07e3a0400713d546e0dea2d5466dd22ea389c73.tar.gz 219318 BLAKE2B 6b6619c8a706ef9630f20fda1e276314b2ef7f6c9aed26836a48bdaa0ae198a86383e68b04c651f37c07d34e400bc54b5daa75b06fc18cdb0a9c55e2cb33bbe1 SHA512 f0b261e8698b412d12dd739e5d0cf71c284965ae28da735ae22814a004358ba3ecaea6cd26fa17b594c0245966b7dd2561c1e05c6cbf0592fd7b85ea0f21eb37 -DIST PeachPy-07d8fde8ac45d7705129475c0f94ed8925b93473.tar.gz 401648 BLAKE2B c563cd77a9e2eda34bbec6a34f94111a6db9500b7cda9a18e791984b789c29dde7199ed21696f10cdfb088b05e18163b02a8ca8c9e48a91b9e4a757020f096b0 SHA512 8d6cc91c8c4d56b86ef93f0acd6768a1830ecd078524b21d1a3b9ecb015f06607070148de3e634d9c5ce63ed523a8e34aa388d490e7eee061200098f39126afa -DIST QNNPACK-7d2a4e9931a82adc3814275b6219a03e24e36b4c.tar.gz 205600 BLAKE2B f174051cba9e3307633f0b12326a37d8fde23562d47e09d3c078350146439094ca6cb2f032cf3aa4af40e5968ee16b8847241f787f7c84ea501124e0528fb82d SHA512 437a835acfedae851a9a8572fa6eea9854dcb8bcca499bc4a2582314e44f5f199778e857932da4aecf943bea7cb2eb5b1c41d4b4ca6075bddbe0f18b2c7b9127 -DIST XNNPACK-79cd5f9e18ad0925ac9a050b00ea5a36230072db.tar.gz 3955905 BLAKE2B d787d4a965c53c8d65887f3b111da950f3b5558cd28ce468764c5bf8efbaddeea567803cfcd89a1aab4a0bc781816871dcca2901e762257aaf96a1d8f868ffd2 SHA512 72c3e53b00d77cfd94db93c60276ca7fd419554dadddf74286e85e0500dbdad0bf65694e451e832de89ea17e7731a9ec9e9f1d831b03c1b81946e0dacb96197d -DIST asmjit-d0d14ac774977d0060a351f66e35cb57ba0bf59c.tar.gz 717277 BLAKE2B 1e743a3293f780aadd413efe896d75851dfde03a60604f09f2230a6bb3923e57a12a5b124531dddb8ca3d226b4abf7c3906c007da47e9326250a5864d5241f9d SHA512 2822763fcb3c18f6699119c1773404667d81f8afb86f8f2e8dbe627526a2877b049d16505557e680e4e310f0e0667263dc4ac442f682e95f2568bf0bf8b61b4b -DIST benchmark-5b7683f4.tar.gz 102332 BLAKE2B a7210a2c7a173a9df8bf03b83fc9712d5b52ded13c932e4d13a93004b93ad816895b722acc941b1d94c6b403e4ccb846141f5a38f42baafc5fb3cb108c039559 SHA512 a4e69ee8ec824e418abd713cb3597175cd40ecee9bc539e2d3592f9ec0f8ee54e7466984874f410b78beee82b4c396a7f2824880f808c4217704cf9970411ebf -DIST benchmark-e776aa02.tar.gz 126890 BLAKE2B 389a4fc0bfedc20227de31d4b1447b8370300a8e3cbea8a8d4b1c82ee90757c2a035ea0324e762217f5a6279a4277f431b7e511d8a9a3bcf226fe31c0022b83c SHA512 d9f70c617af75683dfcf5a0d7ff14b3374258bcf869e3b69b23e85c980366cc4f9859fef3d3dd84a2a92933729053eb02663eaf4bbe0a020a2e001f42b85230d -DIST benchmark-e991355c02b93fe17713efe04cbc2e278e00fdbd.tar.gz 176771 BLAKE2B 22280c0777635d57574852e6e3ad276683d582eed9b17ef93f09f6a5560dc3d06bbabdead9cfc72f5059570436515855a841118c47f23c3793e1b83e368cc75b SHA512 aa4455fa0f8546ec5762f14065e0be6667b5874e6991ca6dd21dc7b29e38c7c74cfddb2c99c7a1ed2f7636aa7bdec8fc0fc1523967b179f5642c2dc2e968089c -DIST breakpad-edbb99f95c75be27d038fffb1d969cdacf705db2.tar.gz 5352009 BLAKE2B 7647a03ca4292d77be30f2d9e901a11e5ad18ba900185e46796b6bbe5069fbe903bd2c7dc094de737b3762456eac718829ad381a00917122a4320830a4318bd4 SHA512 af7dae04546d10c851e71b30b62d316724d86f6e98d62ba3c365fc94a8f3f182b3b1fcc3f9ca4355756ecfdf15f5e1978c112d8ecce25f90df6df44fddaa3dc5 -DIST cpuinfo-5916273f79a21551890fd3d56fc5375a78d1598d.tar.gz 3496223 BLAKE2B 4da452faf12138fbc1abd266d8ae6e0a0192f48a84faccb55fd05c3ac85d0bea2ecbd80b5eda69bb51c6704a223f90dd83d1f0fc79d56d35dd21cae5c5b8fab5 SHA512 50e537b61d991e8579577fb1ecf8d9ceb2171dbad96dfe159a062eadfdc0b2372b94988fc6f223c20e327453c7f55042ee06779f5b5fe0922f4470f746c9686b -DIST cpuinfo-63b25457.tar.gz 3495405 BLAKE2B bb7cefa2bfe6e44134c52b8ba8048a84f0063623e566e89dd92ed6ff5e383a150c554a45b66ee5c4ba6d1544de948ac978ab6e53101399d4768bace20110b4e6 SHA512 44f4a55eea9c0d707818dedfec26f007c2bc2271c7bf9375e6e30171384fb0fa2e1d5731cb946570c717e6d88e6b1496d498e6e55dbf37d66174a4c675a3a006 -DIST cub-d106ddb991a56c3df1b6d51b2409e36ba8181ce4.tar.gz 398104 BLAKE2B 287f020189be877c7a9e667bdfb591da14046199b7336074040c3301d69110c8408d89a72cdcd74d8519deb200ec61823a6d2160d4ecbd00002338651dbf312e SHA512 8d65c0407448125378495190ee2a2c0e3b27a3577efbd6bb5aa8ad76f5bf2bf17becdc6ef931672a4d16b033fd7c0a199bb60e62b0b2b311e5f59c4136f55835 -DIST fbgemm-7588d9d804826b428fc0e4fd418e9cc3f7a72e52.tar.gz 465305 BLAKE2B 6ec6915d9a0ca91600ff3d948bdb17a8db75d5b53db2c32488a296a9c114259501f98df460fac50e27486bd1302fc3279bd6c37a719ce5fea5911d53f992f893 SHA512 f3f01bb8e3abf415001812cfae423fee39267baec13e7794f703a14c58f34c23f0e03f26c8ac9aaf9341cb4bdaae745b99b9c8f301cd23d8b6e7ea621745ab71 -DIST fmt-cd4af11efc9c622896a3e4cb599fa28668ca3d05.tar.gz 740467 BLAKE2B da998415363b8205cb3be5c677ff8c3ea4aa5636741a5cfe45d7b6e54c1f6d0a36696158e2e21f37978323a11150e01efb2793de6a42af4ed19aac52381e0afc SHA512 24b42288be97849533dc82282fc08833d74642ad2afeb511e65c6389d88c709cf25345dec5b550c18af3705f4c0847fa0d4066308b51cd41ccfdda1a2c3babd0 -DIST foxi-c278588e34e535f0bb8f00df3880d26928038cad.tar.gz 28960 BLAKE2B 06c960f829b090eec4fe9e8c981e119578f358724e0b63991173bb7e318d23654261b901d1e15efeb6240bba75cc05fd45ab32fb30bbdf48369e139cf152f398 SHA512 ad42cfd70e40ba0f0a9187b34ae9e3bd361c8c0038669f4c1591c4f7421d12ad93f76f42b33c2575eea1a3ddb3ff781da2895cdc636df5b60422598f450203c7 -DIST gemmlowp-3fb5c176.tar.gz 826382 BLAKE2B c5e68cb78429fe8ce96c752270e747382287937d0a0c1af26b444eda495a78438193c54900cd7906b34b369e170d582c5599f541d23d1280e38f972d6daea1ea SHA512 1c97bba41931c7fddf0e7c01312892cfa3d87abe2a4cdaf4cd20d846a102c5ad3d85329ccdb386f7047f2f037e92639cbcf91b317c2bf38bee11c12e71584afc -DIST gloo-c22a5cfba94edf8ea4f53a174d38aa0c629d070f.tar.gz 247789 BLAKE2B a8b72ee81c47d6b52559a5a7dc7a74dec56747c2fa46437fc9b3be9535b2ac577031a235c1a2cc7029c840a1ad28e58d2e91d7db820af3c0ce474e2a3ebea8a8 SHA512 1aa7bd5511a55ecb7a318cafa6ae1bde94d7cbc4d1483727e3b07c86a4c6e32864aa740d5a58a452d7cb7f37d84a928fa740f1fdb73e3309061d88b018083c56 -DIST googletest-0fc5466d.tar.gz 993626 BLAKE2B f80e5d7e92c665a964add6370b6420ac00b0309768d21d52ce74e87b548293e05271456c63d171eb36389c601febc3514ea81d991145b1921e27f38e5fc0e084 SHA512 ac57b52454c027d4c14b0ca339ff4b5d36b66da38c7420164c44c11c214b617c79cf690b74b6f2f233b5df5dff200d97afa40c9b814f8b6117cd3d9e382a20c5 -DIST googletest-2fe3bd99.tar.gz 993527 BLAKE2B fa631eadc310607dbe19cec6d66d8fb1c5e99e2dfc5031fff26f8c12c951d7798ad2062edf21589020cafc821bfe4b5e89310ee4e85f45d7d7fcd435ddd5eef9 SHA512 130182d2c1067bcd263fb27999c164d240f5d06d837475e71e7cadbf65c7211de00154dc1e15deae0b6ec2963799e55c0c21ee971e1c588064c5063e69a2bf1e -DIST googletest-5ec7f0c4.tar.gz 961649 BLAKE2B 2c518a4006e7a9decff3d4b81c30a910c01f6bf2a71593da25f6e74d5117cbf56de486078a3caf6be255df473fc1c2a04de5317cf882396114be0625d67d041b SHA512 623b077b3334958fafcbc34aa85891883277994af33be530efd903f47738a3e3562001cbf3b6da1a5e7d03803c5bd51bcc1fab81490db85d5a4f2b15e7de1495 -DIST googletest-e2239ee6043f73722e7aa812a459f54a28552929.tar.gz 887296 BLAKE2B 8f29b7028a6dd8190a113cd93398705b23b61d88bee38beaf9dcc0dfc8a463aed7fcd3719f6f1b131d4363aa57231629aaeffa108f6558efb58416cfface6d6e SHA512 cf9e7f3fd3e31ce6677eac355fb8bfe19c5b56a8ec3af8b9417d0904cdf5da92f99f7411a08131cc9fa4fc7d38e6a71fcfac993648e47b269a74a27de7607f7a -DIST ideep-9ca27bbfd88fa1469cbf0467bd6f14cd1738fa40.tar.gz 30949 BLAKE2B 07028f6544e5e088c01b111e89defd02eed022663536c4b1fe582e3b8da65a383aeb75e191f433e4cf497236630dcc531fa16a2758cd9be6db504c6b04f2a9b0 SHA512 0b51c41124ed033fd608b1ae7a6de3ebbb5c8b96c53cea594966178b5e0bd38d8b1b2773c4ba5e8f7b2f4af6d6ce1aef8fcb84bbe05780822976644d0e79b20f -DIST kineto-879a203d9bf554e95541679ddad6e0326f272dc1.tar.gz 7478317 BLAKE2B 0e73fdb99d2f8b4fb0ed53ef6d3f0360a313c5ed26418a705bcaf6fdd0e73ad578cc0793da4015eb43be007aec6420f46f1b3678da5687a42fe87d522fabe7eb SHA512 1d530eceb5d2e1d69e50951983c6b3d1e5b7a07552b7e7ffe7d776a3034566b7176ed5eb124c25d838e1d7b381fffa64a98ce5cbeeaa5f77fd94f186e61eafcb -DIST libnop-aa95422e.tar.gz 124202 BLAKE2B 5a74ecbf473dba09db1a11172a4aa432d81b14adb3826bef9aa8bae1bf1e2d0d5a7bf775fd4343fa9d7b235b17cafe949e47c903e92fd5eae9cc0717a552ea45 SHA512 62b21be874d2117294925c2497394d166da43d534776764c9c124699b5799d99790a2c6420804f8e143e1a18a536106852082f3a9d0052a726abc624fc19f937 -DIST libuv-48e04275332f5753427d21a52f17ec6206451f2c.tar.gz 1293971 BLAKE2B da9d51bb0bf577f7221676a58a1d92b4cc4eaee5389ea68e9cc6ba28560727ab1c1890847caeb2df2da19cf83cb666aa59d9792be922677d693fadc0084607f2 SHA512 27e442de6bbacd58bf63c76cb6608d513ebdd1289232a5628d961a88aee7e1e104cd494e3318a2c62ea8a247f96a3274ee49536a6a2690695f1018f8a46664c5 -DIST lss-e1e7b0ad8ee99a875b272c8e33e308472e897660.tar.gz 38399 BLAKE2B 6646858cde85b62664d157c9af9697f41c432fc97e4492b8159718c15c00de2b6441341648c5925d6d1a987cc6dee942382abaeebbae3b850a683dd42b5d648e SHA512 79b0deb923d69b34cbb239bfda9c36635b27f67eca0e2112967fa72a4d8235e0232dae3782eebf8a61e109503eac50e962bcbdd10b32e8ad8ddaf87ea953f66b -DIST mkl-dnn-5ef631a0.tar.gz 5799312 BLAKE2B ea2aafcf45adadb0546781b00b44a0e9712c28e4937ef4daeef8b910e76bbb152e5434e45bec2aae0f6cb86fd7b5098e61842d7e99258db6fa846a79996d2e23 SHA512 66df9ea574010616df46d85ef25d23bd9ed31f9719cdbec4c727de58728fe095cd412d7663c2d456dba2f26848e45c1d67e34bffe4e25beeef9c1d40f187e8d6 -DIST nccl-c5790b36722d5b41ee2a9b2bad69e364180ffd22.tar.gz 240451 BLAKE2B 8f66d009f2f236f2341c782ca668a3f736581a8329ab3aee3cbcf2874f6fb771bd40e18050c47f08e91917b69dfa693c39007ee9eb038e638fa151b6aa4a23df SHA512 b3e95c56215bbb74ab703f0b08fa828e0afea322763148eb499438eefd2f4935fc39f07a483f77dbb7517077e9cfb732733f2349893f759165dcd767caf63a7d -DIST onnx-29e7aa7048809784465d06e897f043a4600642b2.tar.gz 9332964 BLAKE2B 20858ed93a7e2064624f13bb345ad7ad699ddc8c5e9ce9af27ae49d14bd7db9a0d9ff463919dd0c840595916ac7a720344608c586e87b522d5e2b78fde42eb6a SHA512 bcc1edbc4ce29b1c3c9f1ac4854f13d547d9efa6b712ddb5afb3d84637687aba1dbb2224ac4278a2b2e677ee485397c432554e7f02d51333c57a1ed7e0909d32 -DIST onnx-a82c6a70.tar.gz 4874549 BLAKE2B 055f89d63c03304264b7dd64d5eb6c892a4a280693001ca932f0d352379630870d96dadd6e734b1ec1044cfd92856cd9bb362021a6424ef79e6a408a9c17bc3c SHA512 1ead6644cd28198a428ebcd0f127343c6cbcfdbf39a0832c62ee5ee320a06c655448f508406637702e2da33057c92f76da12302b403ac339a5cad8ea4b5ebab2 -DIST onnx-tensorrt-c153211418a7c57ce071d9ce2a41f8d1c85a878f.tar.gz 72464 BLAKE2B 45301706ca5c91c39e24db84e1dc4e968a8540b760d7b16df08f3a76c407dfceb38962520d822b84618be088fc3d69431f738a8bc7b0f578c84f35234061e99a SHA512 9e814b5dfc3a65ddba229bbddada4c686afab233463329a02cea176b6b1994643f9835ce44a84a9ac1a49e12a7fe2325fd6cd9d2d99a422284089df0202a69a5 -DIST psimd-072586a71b55b7f8c584153d223e95687148a90.tar.gz 6825 BLAKE2B db255d2a62ffa320b1e190a7a9ac923d812e918a72ce8ecfeeb926709ece92d05497430196b0fc833d910b9d24bf0140d20bcce1de695e1c39211158440608db SHA512 a18faea093423dd9fe19ece8b228e011dccce0a2a22222f777ea19b023a13173966d4a8aea01147e8fc58de5d39cffcedeb2221a1572ae52bd5aba1295f86a94 -DIST pthreadpool-a134dd5d4cee80cce15db81a72e7f929d71dd413.tar.gz 49011 BLAKE2B 7bfbca81321243e64aa53c668dfe380ce4f7b88477a1c794a4dea9062c9b0969ca745dbfe0abbb95fffbf44080763506609c387ed085d89f6c612be6804b5cc2 SHA512 5f5a1275bbcef13cea88e381010bf2654c9646d30c5fb061f1d6e9e9a0ae6398e137c5e4f7da69f7d8d8b58fb5a7e79f7a4c0c1c3bbaad8f3d0c896d21bc7691 -DIST pytorch-1.10.2.tar.gz 18475199 BLAKE2B 56fc3f7e052637853f31190f604323ec66d25e4966c102d1adeafa560ac5613d357a8e9115402456f26d5d0350839f645dd7ec226c353d06f484c4e297a13f33 SHA512 fb3722f0c0760419cb197aedf4e23726bd8e8eb498e1ebe39f8f244f95f1fd40334ef8bc95a3e0f5c45beb95abc8683b73cf4fed107e21e7f5690b1d15661699 -DIST sleef-e0a003ee838b75d11763aa9c3ef17bf71a725bff.tar.gz 1642070 BLAKE2B 366fa96e35f429199e8462c63bc9cfbd1888aa65170d3203a5b0391fb855c29241eb225f847e416650e6ed5544f17a745c5a43a622a2847416ad7bd207572840 SHA512 13ea28745e796f8b77a40c99f679e0955e213128fb05d17b61cdcef102b7a758cbda04def3544767a81ddf170b7800f168d25fb1b55093614c7126456765cbea -DIST tensorpipe-d2aa3485e8229c98891dfd604b514a39d45a5c99.tar.gz 259599 BLAKE2B 89a948430a4a662a475417b60c8a962e5f89eadabe72f303275d113bcd768ad4d86308cceb902c9c65b1c6f23eeef6fe0e5e5329d270d37ae87632ca34406de8 SHA512 fbefc18792458ac2234045df8e3cce8dbb17a5e719258f020c2c1d388092358bd2562e53a0377ca18f40bcfbeae4367c277a74c31c5e45296b891453a962e460 diff --git a/sci-libs/pytorch/files/0002-Don-t-build-libtorch-again-for-PyTorch-1.4.0.patch b/sci-libs/pytorch/files/0002-Don-t-build-libtorch-again-for-PyTorch-1.4.0.patch deleted file mode 100644 index de9fe9a0d..000000000 --- a/sci-libs/pytorch/files/0002-Don-t-build-libtorch-again-for-PyTorch-1.4.0.patch +++ /dev/null @@ -1,30 +0,0 @@ -From e5003b88ad3a504eb04c0ba66c2f439149de2ee3 Mon Sep 17 00:00:00 2001 -From: Alexey Chernov <4ernov@gmail.com> -Date: Tue, 5 Nov 2019 00:58:17 +0300 -Subject: [PATCH 2/7] Don't build `libtorch` again for PyTorch - -If starting with building of `libtorch` using CMake, -don't build it again for the sake of running `setup.py` -to build Python version (PyTorch). ---- - setup.py | 7 ------- - 1 file changed, 7 deletions(-) - -Index: pytorch-1.4.0_p0/setup.py -=================================================================== ---- pytorch-1.4.0_p0.orig/setup.py -+++ pytorch-1.4.0_p0/setup.py -@@ -303,13 +303,6 @@ def build_deps(): - check_pydep('yaml', 'pyyaml') - check_pydep('typing', 'typing') - -- build_caffe2(version=version, -- cmake_python_library=cmake_python_library, -- build_python=True, -- rerun_cmake=RERUN_CMAKE, -- cmake_only=CMAKE_ONLY, -- cmake=cmake) -- - version_path = os.path.join(cwd, 'torch', 'version.py') - with open(version_path, 'w') as f: - f.write("__version__ = '{}'\n".format(version)) diff --git a/sci-libs/pytorch/files/0002-Don-t-build-libtorch-again-for-PyTorch-1.7.1.patch b/sci-libs/pytorch/files/0002-Don-t-build-libtorch-again-for-PyTorch-1.7.1.patch deleted file mode 100644 index 16d2c1f2e..000000000 --- a/sci-libs/pytorch/files/0002-Don-t-build-libtorch-again-for-PyTorch-1.7.1.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/setup.py b/setup.py -index 2db381644c..2241a33015 100644 ---- a/setup.py -+++ b/setup.py -@@ -307,13 +307,6 @@ def build_deps(): - check_pydep('yaml', 'pyyaml') - check_pydep('typing', 'typing') - -- build_caffe2(version=version, -- cmake_python_library=cmake_python_library, -- build_python=True, -- rerun_cmake=RERUN_CMAKE, -- cmake_only=CMAKE_ONLY, -- cmake=cmake) -- - if CMAKE_ONLY: - report('Finished running cmake. Run "ccmake build" or ' - '"cmake-gui build" to adjust build options and ' diff --git a/sci-libs/pytorch/files/0003-Change-path-to-caffe2-build-dir-made-by-libtorch.patch b/sci-libs/pytorch/files/0003-Change-path-to-caffe2-build-dir-made-by-libtorch.patch deleted file mode 100644 index f71ba17bc..000000000 --- a/sci-libs/pytorch/files/0003-Change-path-to-caffe2-build-dir-made-by-libtorch.patch +++ /dev/null @@ -1,46 +0,0 @@ -From dbb0bac77986016217cdfe779499a2ccd0e10570 Mon Sep 17 00:00:00 2001 -From: Alexey Chernov <4ernov@gmail.com> -Date: Wed, 6 Nov 2019 00:16:24 +0300 -Subject: [PATCH 3/4] Change path to `caffe2` build dir made by `libtorch` - -Setup and use properly `caffe2` build dir made while -`libtorch` building with CMake, so that it was used -by the Python installation. ---- - setup.py | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/setup.py b/setup.py -index f4bfdc99cd..60502b6add 100644 ---- a/setup.py -+++ b/setup.py -@@ -236,7 +236,7 @@ else: - cwd = os.path.dirname(os.path.abspath(__file__)) - lib_path = os.path.join(cwd, "torch", "lib") - third_party_path = os.path.join(cwd, "third_party") --caffe2_build_dir = os.path.join(cwd, "build") -+caffe2_build_dir = os.environ.get("CMAKE_BUILD_DIR", os.path.join(cwd, "build")) - # lib/pythonx.x/site-packages - rel_site_packages = distutils.sysconfig.get_python_lib(prefix='') - # full absolute path to the dir above -@@ -279,7 +279,7 @@ elif sha != 'Unknown': - version += '+' + sha[:7] - report("Building wheel {}-{}".format(package_name, version)) - --cmake = CMake() -+cmake = CMake(caffe2_build_dir) - - # all the work we need to do _before_ setup runs - def build_deps(): -@@ -445,7 +445,7 @@ class build_ext(setuptools.command.build_ext.build_ext): - filename = self.get_ext_filename(fullname) - report("\nCopying extension {}".format(ext.name)) - -- src = os.path.join("torch", rel_site_packages, filename) -+ src = os.path.join(caffe2_build_dir, filename) - if not os.path.exists(src): - report("{} does not exist".format(src)) - del self.extensions[i] --- -2.23.0 - diff --git a/sci-libs/pytorch/files/0004-Don-t-fill-rpath-of-Caffe2-library-for-system-wide-i.patch b/sci-libs/pytorch/files/0004-Don-t-fill-rpath-of-Caffe2-library-for-system-wide-i.patch deleted file mode 100644 index c8f57d9e6..000000000 --- a/sci-libs/pytorch/files/0004-Don-t-fill-rpath-of-Caffe2-library-for-system-wide-i.patch +++ /dev/null @@ -1,104 +0,0 @@ -From a0ace7295b6895954d2a0f8d6fe311a34a7c4e85 Mon Sep 17 00:00:00 2001 -From: Alexey Chernov <4ernov@gmail.com> -Date: Tue, 12 Nov 2019 02:01:36 +0300 -Subject: [PATCH 4/4] Don't fill rpath of Caffe2 library for system-wide - install - -Don't fill in runtime path of Caffe2 library for the case of -building for system-wide installation. ---- - CMakeLists.txt | 3 +++ - caffe2/CMakeLists.txt | 18 +++++++++++++++--- - cmake/Dependencies.cmake | 19 +++++++++++-------- - 3 files changed, 29 insertions(+), 11 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 20923c0544..45a882ae0e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -193,6 +193,9 @@ option(USE_TBB "Use TBB" OFF) - # Used when building Caffe2 through setup.py - option(BUILDING_WITH_TORCH_LIBS "Tell cmake if Caffe2 is being built alongside torch libs" ON) - -+# Used when building Caffe2 for further system-wide installation -+option(BUILDING_SYSTEM_WIDE "Tell cmake if Caffe2 is being built for system-wide installation" OFF) -+ - # /Z7 override option - # When generating debug symbols, CMake default to use the flag /Zi. - # However, it is not compatible with sccache. So we rewrite it off. -diff --git a/caffe2/CMakeLists.txt b/caffe2/CMakeLists.txt -index 1f7d037243..30d5615cdb 100644 ---- a/caffe2/CMakeLists.txt -+++ b/caffe2/CMakeLists.txt -@@ -1235,7 +1235,11 @@ if (BUILD_PYTHON) - if (MSVC AND BUILD_SHARED_LIBS) - install(FILES $<TARGET_PDB_FILE:caffe2_pybind11_state> DESTINATION "${PYTHON_LIB_REL_PATH}/caffe2/python" OPTIONAL) - endif() -- set_target_properties(caffe2_pybind11_state PROPERTIES INSTALL_RPATH "${caffe2_pybind11_rpath}") -+ if (NOT BUILDING_SYSTEM_WIDE) -+ set_target_properties(caffe2_pybind11_state PROPERTIES INSTALL_RPATH "${caffe2_pybind11_rpath}") -+else() -+ set_target_properties(caffe2_pybind11_state PROPERTIES SKIP_BUILD_RPATH ON) -+ endif() - - if(USE_CUDA) - add_library(caffe2_pybind11_state_gpu MODULE ${Caffe2_GPU_PYTHON_SRCS}) -@@ -1261,7 +1265,11 @@ if (BUILD_PYTHON) - if (MSVC AND BUILD_SHARED_LIBS) - install(FILES $<TARGET_PDB_FILE:caffe2_pybind11_state_gpu> DESTINATION "${PYTHON_LIB_REL_PATH}/caffe2/python" OPTIONAL) - endif() -- set_target_properties(caffe2_pybind11_state_gpu PROPERTIES INSTALL_RPATH "${caffe2_pybind11_rpath}") -+ if (NOT BUILDING_SYSTEM_WIDE) -+ set_target_properties(caffe2_pybind11_state_gpu PROPERTIES INSTALL_RPATH "${caffe2_pybind11_rpath}") -+ else() -+ set_target_properties(caffe2_pybind11_state_gpu PROPERTIES SKIP_BUILD_RPATH ON) -+ endif() - endif() - - if(USE_ROCM) -@@ -1284,7 +1292,11 @@ if (BUILD_PYTHON) - caffe2_pybind11_state_hip PROPERTIES LIBRARY_OUTPUT_DIRECTORY - ${CMAKE_BINARY_DIR}/caffe2/python) - install(TARGETS caffe2_pybind11_state_hip DESTINATION "${PYTHON_LIB_REL_PATH}/caffe2/python") -- set_target_properties(caffe2_pybind11_state_hip PROPERTIES INSTALL_RPATH "${caffe2_pybind11_rpath}") -+ if (NOT BUILDING_SYSTEM_WIDE) -+ set_target_properties(caffe2_pybind11_state_hip PROPERTIES INSTALL_RPATH "${caffe2_pybind11_rpath}") -+ else() -+ set_target_properties(caffe2_pybind11_state_hip PROPERTIES SKIP_BUILD_RPATH ON) -+ endif() - endif() - - if (MSVC AND CMAKE_GENERATOR MATCHES "Visual Studio") -diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake -index a8e9769536..6ef9d7b0e2 100644 ---- a/cmake/Dependencies.cmake -+++ b/cmake/Dependencies.cmake -@@ -6,14 +6,17 @@ if (APPLE) - else() - set(_rpath_portable_origin $ORIGIN) - endif(APPLE) --# Use separate rpaths during build and install phases --set(CMAKE_SKIP_BUILD_RPATH FALSE) --# Don't use the install-rpath during the build phase --set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) --set(CMAKE_INSTALL_RPATH "${_rpath_portable_origin}") --# Automatically add all linked folders that are NOT in the build directory to --# the rpath (per library?) --set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) -+ -+if (NOT BUILDING_SYSTEM_WIDE) -+ # Use separate rpaths during build and install phases -+ set(CMAKE_SKIP_BUILD_RPATH FALSE) -+ # Don't use the install-rpath during the build phase -+ set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) -+ set(CMAKE_INSTALL_RPATH "${_rpath_portable_origin}") -+ # Automatically add all linked folders that are NOT in the build directory to -+ # the rpath (per library?) -+ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) -+endif() - - # UBSAN triggers when compiling protobuf, so we need to disable it. - set(UBSAN_FLAG "-fsanitize=undefined") --- -2.23.0 - diff --git a/sci-libs/pytorch/files/0005-Change-library-directory-according-to-CMake-build.patch b/sci-libs/pytorch/files/0005-Change-library-directory-according-to-CMake-build.patch deleted file mode 100644 index 324b8f682..000000000 --- a/sci-libs/pytorch/files/0005-Change-library-directory-according-to-CMake-build.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 52019a3f395e5fa97b26d424152d91f73b400f8e Mon Sep 17 00:00:00 2001 -From: Alexey Chernov <4ernov@gmail.com> -Date: Wed, 13 Nov 2019 23:44:12 +0300 -Subject: [PATCH 5/5] Change library directory according to CMake build - -Change `lib_path` in favour of out-of-tree CMake build -directory, so that all the C++ libraries be found. ---- - setup.py | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/setup.py b/setup.py -index 60502b6add..cbced52192 100644 ---- a/setup.py -+++ b/setup.py -@@ -234,9 +234,10 @@ else: - - # Constant known variables used throughout this file - cwd = os.path.dirname(os.path.abspath(__file__)) --lib_path = os.path.join(cwd, "torch", "lib") -+cmake_build_dir = os.environ.get("CMAKE_BUILD_DIR", os.path.join(cwd, "build")) -+lib_path = os.path.join(cmake_build_dir, "lib") - third_party_path = os.path.join(cwd, "third_party") --caffe2_build_dir = os.environ.get("CMAKE_BUILD_DIR", os.path.join(cwd, "build")) -+caffe2_build_dir = cmake_build_dir - # lib/pythonx.x/site-packages - rel_site_packages = distutils.sysconfig.get_python_lib(prefix='') - # full absolute path to the dir above --- -2.23.0 - diff --git a/sci-libs/pytorch/files/0010-Remove-conversion-ambiguity-in-ternary-operators.patch b/sci-libs/pytorch/files/0010-Remove-conversion-ambiguity-in-ternary-operators.patch deleted file mode 100644 index 49835d201..000000000 --- a/sci-libs/pytorch/files/0010-Remove-conversion-ambiguity-in-ternary-operators.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 0f3a0d9a948fdd8481a5f7751a255ecd9ed4d37a Mon Sep 17 00:00:00 2001 -From: Alexey Chernov <4ernov@gmail.com> -Date: Mon, 20 Jan 2020 01:21:22 +0300 -Subject: [PATCH 3/3] Remove conversion ambiguity in ternary operators - -It fails to compile with recent versions of Clang -(namely, version 10 used behind HCC compiler when -being built with ROCm support) with the -`conditional expression is ambiguous` error. ---- - caffe2/operators/relu_op.cu | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/caffe2/operators/relu_op.cu b/caffe2/operators/relu_op.cu -index f6edf7105e..ab49540fc9 100644 ---- a/caffe2/operators/relu_op.cu -+++ b/caffe2/operators/relu_op.cu -@@ -51,7 +51,7 @@ __global__ void ReluCUDAKernel<half2>(const int N, const half2* X, half2* Y) { - #else - const float2 xx = __half22float2(X[i]); - Y[i] = -- __floats2half2_rn(xx.x > 0.0f ? xx.x : 0.0f, xx.y > 0.0f ? xx.y : 0.0f); -+ __floats2half2_rn(xx.x > 0.0f ? float(xx.x) : 0.0f, xx.y > 0.0f ? float(xx.y) : 0.0f); - #endif - } - } -@@ -101,7 +101,7 @@ __global__ void ReluGradientCUDAKernel<half2>( - const float2 dy = __half22float2(dY[i]); - const float2 yy = __half22float2(Y[i]); - dX[i] = -- __floats2half2_rn(yy.x > 0.0f ? dy.x : 0.0f, yy.y > 0.0f ? dy.y : 0.0f); -+ __floats2half2_rn(yy.x > 0.0f ? float(dy.x) : 0.0f, yy.y > 0.0f ? float(dy.y) : 0.0f); - #endif - } - } --- -2.24.1 - diff --git a/sci-libs/pytorch/files/get_third_parties b/sci-libs/pytorch/files/get_third_parties deleted file mode 100644 index 8c38a9b73..000000000 --- a/sci-libs/pytorch/files/get_third_parties +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -path_url() { - local dir=$(dirname $1)/ - git config --file $1 --get-regexp '(path|url)' | sed -r -e "N;s,[^ ]* ([^ ]*)\n[^ ]* ([^ ]*),${dir#./}\1 \2," -} - -join \ - <(for gm in $(find . -name '.gitmodules' | sort -r); do path_url $gm; done | sort -u) \ - <(git submodule status --recursive | awk '{print $2 " " $1}' | sort -u) | \ -while read path url hash; do - [[ ${path} =~ (eigen|six|ios|neon2sse|protobuf|pybind11|python-enum|tbb|zstd|fbjni) ]] && continue - u=${url%.git} - hfull=${hash#-} - h=${hfull:0:8} - p=$(basename $u) - echo "${u}/archive/${h}.tar.gz -> ${p}-${h}.tar.gz" >> SRC_URI - [[ $p = fbgemm ]] && p=${p^^} - echo "rmdir ${path} && ln -sv \"\${WORKDIR}\"/${p}-${hfull} ${path}" >> src_prepare -done diff --git a/sci-libs/pytorch/files/pytorch-1.10.0-clhpp2.patch b/sci-libs/pytorch/files/pytorch-1.10.0-clhpp2.patch deleted file mode 100644 index 9c267dc6e..000000000 --- a/sci-libs/pytorch/files/pytorch-1.10.0-clhpp2.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff --git a/caffe2/contrib/opencl/OpenCL/cl.hpp b/caffe2/contrib/opencl/OpenCL/cl.hpp -index 87cc4a1..7c27e33 100644 ---- a/caffe2/contrib/opencl/OpenCL/cl.hpp -+++ b/caffe2/contrib/opencl/OpenCL/cl.hpp -@@ -76,7 +76,7 @@ - * #if defined(__APPLE__) || defined(__MACOSX) - * #include <OpenCL/cl.hpp> - * #else -- * #include <CL/cl.hpp> -+ * #include <CL/cl2.hpp> - * #endif - * #include <cstdio> - * #include <cstdlib> -diff --git a/caffe2/contrib/opencl/context.h b/caffe2/contrib/opencl/context.h -index b1e61c2..968d3c7 100644 ---- a/caffe2/contrib/opencl/context.h -+++ b/caffe2/contrib/opencl/context.h -@@ -11,7 +11,7 @@ - #if defined(__APPLE__) || defined(__MACOSX) - #include <OpenCL/cl.hpp> - #else --#include <CL/cl.hpp> -+#include <CL/cl2.hpp> - #endif - - #define OPENCL_CHECK(expr) (void)expr -diff --git a/caffe2/mobile/contrib/libopencl-stub/include/CL/cl.hpp b/caffe2/mobile/contrib/libopencl-stub/include/CL/cl.hpp -index f3badf7..928c9f0 100644 ---- a/caffe2/mobile/contrib/libopencl-stub/include/CL/cl.hpp -+++ b/caffe2/mobile/contrib/libopencl-stub/include/CL/cl.hpp -@@ -76,7 +76,7 @@ - * #if defined(__APPLE__) || defined(__MACOSX) - * #include <OpenCL/cl.hpp> - * #else -- * #include <CL/cl.hpp> -+ * #include <CL/cl2.hpp> - * #endif - * #include <cstdio> - * #include <cstdlib> -diff --git a/third_party/tensorflow_cuda_bazel_build/cuda/BUILD b/third_party/tensorflow_cuda_bazel_build/cuda/BUILD -index f7271af..334f4ec 100755 ---- a/third_party/tensorflow_cuda_bazel_build/cuda/BUILD -+++ b/third_party/tensorflow_cuda_bazel_build/cuda/BUILD -@@ -188,7 +188,7 @@ CUDA_INCLUDES_FILES = [ - "include/CL/cl_gl_ext.h", - "include/CL/cl_gl.h", - "include/CL/cl.h", -- "include/CL/cl.hpp", -+ "include/CL/cl2.hpp", - "include/CL/cl_platform.h", - "include/CL/opencl.h", - "include/common_functions.h", diff --git a/sci-libs/pytorch/files/pytorch-1.10.0-fix-distutils.patch b/sci-libs/pytorch/files/pytorch-1.10.0-fix-distutils.patch deleted file mode 100644 index 334bcda6f..000000000 --- a/sci-libs/pytorch/files/pytorch-1.10.0-fix-distutils.patch +++ /dev/null @@ -1,93 +0,0 @@ -This fix distutils-r1_src_install failure with setuptools-59 - -From 9af2edb158b3603c44eff6e12896f1d215e8b898 Mon Sep 17 00:00:00 2001 -From: Nikita Shulga <nshulga@fb.com> -Date: Tue, 14 Dec 2021 07:15:34 -0800 -Subject: [PATCH] Properly import LooseVersion - -This fixes regression introduced by https://github.com/pytorch/pytorch/pull/57040 - -Somehow importing `distutils` from `setuptool` caused import of -`distutils.versions`, which is not a documented dependency and got -change with the release of -[setuptools-59.6.0](https://github.com/pypa/setuptools/tree/v59.6.0) -We should not rely on that, as -`import distutils` never re-imports `distutils.version`, which one can -see by observing -https://github.com/python/cpython/blob/3.9/Lib/distutils/__init__.py -or by running: -``` -% python3 -c "import distutils;print(distutils.__version__, dir(distutils))" -3.7.5 ['__builtins__', '__cached__', '__doc__', '__file__', '__loader__', '__name__', '__package__', '__path__', '__spec__', '__version__', 'sys'] -% python3 -c "from setuptools import distutils;print(distutils.__version__, dir(distutils))" -3.7.5 ['__builtins__', '__cached__', '__doc__', '__file__', '__loader__', '__name__', '__package__', '__path__', '__spec__', '__version__', 'archive_util', 'ccompiler', 'cmd', 'config', 'core', 'debug', 'dep_util', 'dir_util', 'dist', 'errors', 'extension', 'fancy_getopt', 'file_util', 'filelist', 'log', 'spawn', 'sys', 'sysconfig', 'util', 'version'] -``` ---- - test/run_test.py | 4 ++-- - tools/setup_helpers/cmake.py | 8 ++++---- - torch/testing/_internal/common_methods_invocations.py | 8 ++++---- - 3 files changed, 10 insertions(+), 10 deletions(-) - -diff --git a/tools/setup_helpers/cmake.py b/tools/setup_helpers/cmake.py -index 01e87b4bca879..686b5c4a34f4c 100644 ---- a/tools/setup_helpers/cmake.py -+++ b/tools/setup_helpers/cmake.py -@@ -8,7 +8,7 @@ - from subprocess import check_call, check_output, CalledProcessError - import sys - import sysconfig --from setuptools import distutils # type: ignore[import] -+from distutils.version import LooseVersion - from typing import IO, Any, Dict, List, Optional, Union, cast - - from . import which -@@ -120,10 +120,10 @@ def _get_cmake_command() -> str: - return cmake_command - cmake3 = which('cmake3') - cmake = which('cmake') -- if cmake3 is not None and CMake._get_version(cmake3) >= distutils.version.LooseVersion("3.10.0"): -+ if cmake3 is not None and CMake._get_version(cmake3) >= LooseVersion("3.10.0"): - cmake_command = 'cmake3' - return cmake_command -- elif cmake is not None and CMake._get_version(cmake) >= distutils.version.LooseVersion("3.10.0"): -+ elif cmake is not None and CMake._get_version(cmake) >= LooseVersion("3.10.0"): - return cmake_command - else: - raise RuntimeError('no cmake or cmake3 with version >= 3.10.0 found') -@@ -134,7 +134,7 @@ def _get_version(cmd: str) -> Any: - - for line in check_output([cmd, '--version']).decode('utf-8').split('\n'): - if 'version' in line: -- return distutils.version.LooseVersion(line.strip().split(' ')[2]) -+ return LooseVersion(line.strip().split(' ')[2]) - raise RuntimeError('no version found') - - def run(self, args: List[str], env: Dict[str, str]) -> None: -diff --git a/torch/testing/_internal/common_methods_invocations.py b/torch/testing/_internal/common_methods_invocations.py -index b66e6470b590c..6ec77c2b0ce2e 100644 ---- a/torch/testing/_internal/common_methods_invocations.py -+++ b/torch/testing/_internal/common_methods_invocations.py -@@ -40,7 +40,7 @@ - freeze_rng_state) - import torch.testing._internal.opinfo_helper as opinfo_helper - --from setuptools import distutils -+from distutils.version import LooseVersion - - has_scipy_fft = False - if TEST_SCIPY: -@@ -14008,11 +14008,11 @@ def ref_pairwise_distance(input1, input2): - skips=( - # Reference: https://github.com/pytorch/pytorch/pull/49155#issuecomment-742664611 - DecorateInfo(unittest.skip("Skipped!"), 'TestUnaryUfuncs', 'test_reference_numerics_extremal', -- active_if=TEST_SCIPY and distutils.version.LooseVersion(scipy.__version__) < "1.4.0"), -+ active_if=TEST_SCIPY and LooseVersion(scipy.__version__) < "1.4.0"), - DecorateInfo(unittest.skip("Skipped!"), 'TestUnaryUfuncs', 'test_reference_numerics_hard', -- active_if=TEST_SCIPY and distutils.version.LooseVersion(scipy.__version__) < "1.4.0"), -+ active_if=TEST_SCIPY and LooseVersion(scipy.__version__) < "1.4.0"), - DecorateInfo(unittest.skip("Skipped!"), 'TestUnaryUfuncs', 'test_reference_numerics_normal', -- active_if=TEST_SCIPY and distutils.version.LooseVersion(scipy.__version__) < "1.4.0"), -+ active_if=TEST_SCIPY and LooseVersion(scipy.__version__) < "1.4.0"), - )), - UnaryUfuncInfo('lgamma', - ref=reference_lgamma if TEST_SCIPY else _NOTHING, diff --git a/sci-libs/pytorch/files/pytorch-1.10.0-nonull.patch b/sci-libs/pytorch/files/pytorch-1.10.0-nonull.patch deleted file mode 100644 index adc258556..000000000 --- a/sci-libs/pytorch/files/pytorch-1.10.0-nonull.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/torch/csrc/jit/frontend/ir_emitter.cpp 2021-10-15 05:35:23.000000000 +0400 -+++ b/torch/csrc/jit/frontend/ir_emitter.cpp 2021-10-15 05:35:23.000000000 +0400 -@@ -1678,7 +1678,7 @@ - << "Union type annotation `" << type_hint->repr_str() - << "` can hold " << vector_repr.str() << ", but none of " - << "those list types can hold the types of the given dict" -- << " elements, which were unified to " << candidate->repr_str(); -+ << " elements, which were unified"; - } else { - refined_type_hint = candidate; - } - diff --git a/sci-libs/pytorch/files/pytorch-1.10.1-nccl-nvccflags.patch b/sci-libs/pytorch/files/pytorch-1.10.1-nccl-nvccflags.patch deleted file mode 100644 index 0ac12a1e7..000000000 --- a/sci-libs/pytorch/files/pytorch-1.10.1-nccl-nvccflags.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 7b04cd503fa1a6265893e0320ee246bcc0bd98cf Mon Sep 17 00:00:00 2001 -From: Miezhiko <Miezhiko@gmail.com> -Date: Mon, 27 Dec 2021 14:48:12 +0400 -Subject: [PATCH] neutral flags - ---- - makefiles/common.mk | 10 +--------- - 1 file changed, 1 insertion(+), 9 deletions(-) - -diff --git a/makefiles/common.mk b/makefiles/common.mk -index 64f8d2dc6..7a979c90f 100644 ---- a/makefiles/common.mk -+++ b/makefiles/common.mk -@@ -55,7 +55,7 @@ CXXFLAGS := -DCUDA_MAJOR=$(CUDA_MAJOR) -DCUDA_MINOR=$(CUDA_MINOR) -fPIC -fvisi - # Maxrregcount needs to be set accordingly to NCCL_MAX_NTHREADS (otherwise it will cause kernel launch errors) - # 512 : 120, 640 : 96, 768 : 80, 1024 : 60 - # We would not have to set this if we used __launch_bounds__, but this only works on kernels, not on functions. --NVCUFLAGS := -ccbin $(CXX) $(NVCC_GENCODE) -std=c++11 --expt-extended-lambda -Xptxas -maxrregcount=96 -Xfatbin -compress-all -+NVCUFLAGS := $(NVCCFLAGS) $(NVCC_GENCODE) -std=c++11 --expt-extended-lambda -Xptxas -maxrregcount=96 -Xfatbin -compress-all - # Use addprefix so that we can specify more than one path - NVLDFLAGS := -L${CUDA_LIB} -lcudart -lrt - -@@ -69,14 +69,6 @@ NVLDFLAGS += ${GCOV_FLAGS:%=-Xcompiler %} - # $(warning GCOV_FLAGS=${GCOV_FLAGS}) - ########## GCOV ########## - --ifeq ($(DEBUG), 0) --NVCUFLAGS += -O3 --CXXFLAGS += -O3 -g --else --NVCUFLAGS += -O0 -G -g --CXXFLAGS += -O0 -g -ggdb3 --endif -- - ifneq ($(VERBOSE), 0) - NVCUFLAGS += -Xptxas -v -Xcompiler -Wall,-Wextra,-Wno-unused-parameter - CXXFLAGS += -Wall -Wextra diff --git a/sci-libs/pytorch/files/pytorch-1.2.0-setup.patch b/sci-libs/pytorch/files/pytorch-1.2.0-setup.patch deleted file mode 100644 index 85e796a60..000000000 --- a/sci-libs/pytorch/files/pytorch-1.2.0-setup.patch +++ /dev/null @@ -1,24 +0,0 @@ -Index: pytorch-1.4.0_p0/setup.py -=================================================================== ---- pytorch-1.4.0_p0.orig/setup.py -+++ pytorch-1.4.0_p0/setup.py -@@ -288,9 +288,7 @@ def build_deps(): - sys.exit(1) - - check_file(os.path.join(third_party_path, "gloo", "CMakeLists.txt")) -- check_file(os.path.join(third_party_path, "pybind11", "CMakeLists.txt")) - check_file(os.path.join(third_party_path, 'cpuinfo', 'CMakeLists.txt')) -- check_file(os.path.join(third_party_path, 'tbb', 'Makefile')) - check_file(os.path.join(third_party_path, 'onnx', 'CMakeLists.txt')) - check_file(os.path.join(third_party_path, 'foxi', 'CMakeLists.txt')) - check_file(os.path.join(third_party_path, 'QNNPACK', 'CMakeLists.txt')) -@@ -341,9 +339,6 @@ def build_deps(): - if not same: - shutil.copyfile(orig_file, sym_file) - -- dir_util.copy_tree('third_party/pybind11/include/pybind11/', -- 'torch/include/pybind11') -- - ################################################################################ - # Building dependent libraries - ################################################################################ diff --git a/sci-libs/pytorch/files/pytorch-1.4.0-nccl-nvccflags.patch b/sci-libs/pytorch/files/pytorch-1.4.0-nccl-nvccflags.patch deleted file mode 100644 index 165e79dd4..000000000 --- a/sci-libs/pytorch/files/pytorch-1.4.0-nccl-nvccflags.patch +++ /dev/null @@ -1,28 +0,0 @@ -Index: nccl-7c72dee660e4d055b81721dd6b03e4e1c0a983cf/makefiles/common.mk -=================================================================== ---- nccl-7c72dee660e4d055b81721dd6b03e4e1c0a983cf.orig/makefiles/common.mk -+++ nccl-7c72dee660e4d055b81721dd6b03e4e1c0a983cf/makefiles/common.mk -@@ -46,7 +46,7 @@ endif - CXXFLAGS := -DCUDA_MAJOR=$(CUDA_MAJOR) -DCUDA_MINOR=$(CUDA_MINOR) -fPIC -fvisibility=hidden - CXXFLAGS += -Wall -Wno-unused-function -Wno-sign-compare -std=c++11 -Wvla - CXXFLAGS += -I $(CUDA_INC) --NVCUFLAGS := -ccbin $(CXX) $(NVCC_GENCODE) -lineinfo -std=c++11 -Xptxas -maxrregcount=96 -Xfatbin -compress-all -+NVCUFLAGS := $(NVCCFLAGS) $(NVCC_GENCODE) -lineinfo -std=c++11 -Xptxas -maxrregcount=96 -Xfatbin -compress-all - # Use addprefix so that we can specify more than one path - NVLDFLAGS := -L${CUDA_LIB} -lcudart -lrt - -@@ -60,14 +60,6 @@ NVLDFLAGS += ${GCOV_FLAGS:%=-Xcompiler - # $(warning GCOV_FLAGS=${GCOV_FLAGS}) - ########## GCOV ########## - --ifeq ($(DEBUG), 0) --NVCUFLAGS += -O3 --CXXFLAGS += -O3 -g --else --NVCUFLAGS += -O0 -G -g --CXXFLAGS += -O0 -g -ggdb3 --endif -- - ifneq ($(VERBOSE), 0) - NVCUFLAGS += -Xptxas -v -Xcompiler -Wall,-Wextra,-Wno-unused-parameter - CXXFLAGS += -Wall -Wextra diff --git a/sci-libs/pytorch/files/pytorch-1.4.0-skip-tests.patch b/sci-libs/pytorch/files/pytorch-1.4.0-skip-tests.patch deleted file mode 100644 index 3682469d7..000000000 --- a/sci-libs/pytorch/files/pytorch-1.4.0-skip-tests.patch +++ /dev/null @@ -1,28 +0,0 @@ -Disable expected test failures. - -TCPStoreTest is too slow to run. - -Reference: https://github.com/pytorch/pytorch/issues/13746 -Reference: https://github.com/pytorch/pytorch/issues/21873 - -Index: pytorch-1.4.0_p0/torch/lib/c10d/test/CMakeLists.txt -=================================================================== ---- pytorch-1.4.0_p0.orig/torch/lib/c10d/test/CMakeLists.txt -+++ pytorch-1.4.0_p0/torch/lib/c10d/test/CMakeLists.txt -@@ -14,7 +14,6 @@ function(c10d_add_test test_src) - endfunction() - - c10d_add_test(FileStoreTest.cpp c10d) --c10d_add_test(TCPStoreTest.cpp c10d) - - if(USE_CUDA) - if(USE_C10D_GLOO) -Index: pytorch-1.4.0_p0/caffe2/share/contrib/depthwise/CMakeLists.txt -=================================================================== ---- pytorch-1.4.0_p0.orig/caffe2/share/contrib/depthwise/CMakeLists.txt -+++ pytorch-1.4.0_p0/caffe2/share/contrib/depthwise/CMakeLists.txt -@@ -6,4 +6,3 @@ set(Caffe2_CONTRIB_DEPTHWISE3x3_TEST_CPU - ) - - set(Caffe2_CPU_SRCS ${Caffe2_CPU_SRCS} ${Caffe2_CONTRIB_DEPTHWISE3x3_CPU_SRC} PARENT_SCOPE) --set(Caffe2_CPU_TEST_SRCS ${Caffe2_CPU_TEST_SRCS} ${Caffe2_CONTRIB_DEPTHWISE3x3_TEST_CPU_SRC} PARENT_SCOPE) diff --git a/sci-libs/pytorch/files/pytorch-1.4.0-sleef.patch b/sci-libs/pytorch/files/pytorch-1.4.0-sleef.patch deleted file mode 100644 index 222a0f73e..000000000 --- a/sci-libs/pytorch/files/pytorch-1.4.0-sleef.patch +++ /dev/null @@ -1,15 +0,0 @@ -Give the location of sleef.h. - -Reference: https://github.com/pytorch/pytorch/issues/26555 -Index: pytorch-1.4.0/caffe2/CMakeLists.txt -=================================================================== ---- pytorch-1.4.0.orig/caffe2/CMakeLists.txt -+++ pytorch-1.4.0/caffe2/CMakeLists.txt -@@ -1062,6 +1062,7 @@ if (BUILD_TEST) - add_executable(${test_name} "${test_src}") - target_link_libraries(${test_name} ${Caffe2_MAIN_LIBS} gtest_main) - target_include_directories(${test_name} PRIVATE $<INSTALL_INTERFACE:include>) -+ target_include_directories(${test_name} PRIVATE $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/include>) - target_include_directories(${test_name} PRIVATE ${Caffe2_CPU_INCLUDE}) - add_test(NAME ${test_name} COMMAND $<TARGET_FILE:${test_name}>) - if (INSTALL_TEST) diff --git a/sci-libs/pytorch/files/pytorch-1.6.0-global-dlopen.patch b/sci-libs/pytorch/files/pytorch-1.6.0-global-dlopen.patch deleted file mode 100644 index 1e9388ff1..000000000 --- a/sci-libs/pytorch/files/pytorch-1.6.0-global-dlopen.patch +++ /dev/null @@ -1,15 +0,0 @@ -Don't hardcode the library path. Leave it to the dynamic loader. - -Index: pytorch-1.6.0/torch/__init__.py -=================================================================== ---- pytorch-1.6.0.orig/torch/__init__.py -+++ pytorch-1.6.0/torch/__init__.py -@@ -138,7 +138,7 @@ def _load_global_deps(): - here = os.path.abspath(__file__) - lib_path = os.path.join(os.path.dirname(here), 'lib', lib_name) - -- ctypes.CDLL(lib_path, mode=ctypes.RTLD_GLOBAL) -+ ctypes.CDLL(lib_name, mode=ctypes.RTLD_GLOBAL) - - - if (USE_RTLD_GLOBAL_WITH_LIBTORCH or os.getenv('TORCH_USE_RTLD_GLOBAL')) and \ diff --git a/sci-libs/pytorch/files/pytorch-1.6.0-nccl-nvccflags.patch b/sci-libs/pytorch/files/pytorch-1.6.0-nccl-nvccflags.patch deleted file mode 100644 index 052474ee4..000000000 --- a/sci-libs/pytorch/files/pytorch-1.6.0-nccl-nvccflags.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -uprN nccl-5949d96f36d050e59d05872f8bbffd2549318e95/makefiles/common.mk nccl-patched/makefiles/common.mk ---- nccl-5949d96f36d050e59d05872f8bbffd2549318e95/makefiles/common.mk 2020-06-09 00:31:44.000000000 +0800 -+++ nccl-patched/makefiles/common.mk 2020-08-06 21:25:57.784279738 +0800 -@@ -54,7 +54,7 @@ CXXFLAGS := -DCUDA_MAJOR=$(CUDA_MAJOR) - # Maxrregcount needs to be set accordingly to NCCL_MAX_NTHREADS (otherwise it will cause kernel launch errors) - # 512 : 120, 640 : 96, 768 : 80, 1024 : 60 - # We would not have to set this if we used __launch_bounds__, but this only works on kernels, not on functions. --NVCUFLAGS := -ccbin $(CXX) $(NVCC_GENCODE) -std=c++11 -Xptxas -maxrregcount=96 -Xfatbin -compress-all -+NVCUFLAGS := $(NVCCFLAGS) $(NVCC_GENCODE) -std=c++11 -Xptxas -maxrregcount=96 -Xfatbin -compress-all - # Use addprefix so that we can specify more than one path - NVLDFLAGS := -L${CUDA_LIB} -lcudart -lrt - -@@ -68,14 +68,6 @@ NVLDFLAGS += ${GCOV_FLAGS:%=-Xcompiler - # $(warning GCOV_FLAGS=${GCOV_FLAGS}) - ########## GCOV ########## - --ifeq ($(DEBUG), 0) --NVCUFLAGS += -O3 --CXXFLAGS += -O3 -g --else --NVCUFLAGS += -O0 -G -g --CXXFLAGS += -O0 -g -ggdb3 --endif -- - ifneq ($(VERBOSE), 0) - NVCUFLAGS += -Xptxas -v -Xcompiler -Wall,-Wextra,-Wno-unused-parameter - CXXFLAGS += -Wall -Wextra diff --git a/sci-libs/pytorch/files/pytorch-1.6.0-setup.patch b/sci-libs/pytorch/files/pytorch-1.6.0-setup.patch deleted file mode 100644 index 6a197a907..000000000 --- a/sci-libs/pytorch/files/pytorch-1.6.0-setup.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: pytorch-1.4.0_p0/setup.py -=================================================================== ---- pytorch-1.4.0_p0.orig/setup.py -+++ pytorch-1.4.0_p0/setup.py -@@ -288,9 +288,7 @@ def build_deps(): - sys.exit(1) - - check_file(os.path.join(third_party_path, "gloo", "CMakeLists.txt")) -- check_file(os.path.join(third_party_path, "pybind11", "CMakeLists.txt")) - check_file(os.path.join(third_party_path, 'cpuinfo', 'CMakeLists.txt')) -- check_file(os.path.join(third_party_path, 'tbb', 'Makefile')) - check_file(os.path.join(third_party_path, 'onnx', 'CMakeLists.txt')) - check_file(os.path.join(third_party_path, 'foxi', 'CMakeLists.txt')) - check_file(os.path.join(third_party_path, 'QNNPACK', 'CMakeLists.txt')) diff --git a/sci-libs/pytorch/files/pytorch-1.6.0-skip-tests.patch b/sci-libs/pytorch/files/pytorch-1.6.0-skip-tests.patch deleted file mode 100644 index 3ef2c533f..000000000 --- a/sci-libs/pytorch/files/pytorch-1.6.0-skip-tests.patch +++ /dev/null @@ -1,14 +0,0 @@ -Disable expected test failures. - -Reference: https://github.com/pytorch/pytorch/issues/13746 -Reference: https://github.com/pytorch/pytorch/issues/21873 - -Index: pytorch-1.4.0_p0/caffe2/share/contrib/depthwise/CMakeLists.txt -=================================================================== ---- pytorch-1.4.0_p0.orig/caffe2/share/contrib/depthwise/CMakeLists.txt -+++ pytorch-1.4.0_p0/caffe2/share/contrib/depthwise/CMakeLists.txt -@@ -6,4 +6,3 @@ set(Caffe2_CONTRIB_DEPTHWISE3x3_TEST_CPU - ) - - set(Caffe2_CPU_SRCS ${Caffe2_CPU_SRCS} ${Caffe2_CONTRIB_DEPTHWISE3x3_CPU_SRC} PARENT_SCOPE) --set(Caffe2_CPU_TEST_SRCS ${Caffe2_CPU_TEST_SRCS} ${Caffe2_CONTRIB_DEPTHWISE3x3_TEST_CPU_SRC} PARENT_SCOPE) diff --git a/sci-libs/pytorch/files/pytorch-1.6.0-tensorpipe-unbundle-libuv.patch b/sci-libs/pytorch/files/pytorch-1.6.0-tensorpipe-unbundle-libuv.patch deleted file mode 100644 index a4ba38322..000000000 --- a/sci-libs/pytorch/files/pytorch-1.6.0-tensorpipe-unbundle-libuv.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: tensorpipe/cmake/pytorch.cmake -=================================================================== ---- tensorpipe.orig/cmake/pytorch.cmake -+++ tensorpipe/cmake/pytorch.cmake -@@ -138,7 +138,7 @@ endif() - - add_library(tensorpipe ${TENSORPIPE_SRC}) - --set(TP_BUILD_LIBUV ON) -+set(TP_BUILD_LIBUV OFF) - find_package(uv REQUIRED) - target_link_libraries(tensorpipe PRIVATE uv::uv) - diff --git a/sci-libs/pytorch/files/pytorch-1.7.1-no-rpath.patch b/sci-libs/pytorch/files/pytorch-1.7.1-no-rpath.patch deleted file mode 100644 index eabda092e..000000000 --- a/sci-libs/pytorch/files/pytorch-1.7.1-no-rpath.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake -index b3a892cf88..2c8622870c 100644 ---- a/cmake/Dependencies.cmake -+++ b/cmake/Dependencies.cmake -@@ -4,7 +4,6 @@ if(APPLE) - set(CMAKE_MACOSX_RPATH ON) - set(_rpath_portable_origin "@loader_path") - else() -- set(_rpath_portable_origin $ORIGIN) - endif(APPLE) - # Use separate rpaths during build and install phases - set(CMAKE_SKIP_BUILD_RPATH FALSE) diff --git a/sci-libs/pytorch/files/pytorch-1.7.1-setup.patch b/sci-libs/pytorch/files/pytorch-1.7.1-setup.patch deleted file mode 100644 index 28db5692c..000000000 --- a/sci-libs/pytorch/files/pytorch-1.7.1-setup.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/setup.py b/setup.py -index 2db381644c..01a2e57aea 100644 ---- a/setup.py -+++ b/setup.py -@@ -294,7 +294,6 @@ def build_deps(): - - check_file(os.path.join(third_party_path, "gloo", "CMakeLists.txt")) - check_file(os.path.join(third_party_path, 'cpuinfo', 'CMakeLists.txt')) -- check_file(os.path.join(third_party_path, 'tbb', 'Makefile')) - check_file(os.path.join(third_party_path, 'onnx', 'CMakeLists.txt')) - check_file(os.path.join(third_party_path, 'foxi', 'CMakeLists.txt')) - check_file(os.path.join(third_party_path, 'QNNPACK', 'CMakeLists.txt')) diff --git a/sci-libs/pytorch/files/pytorch-1.7.1-tensorpipe-unbundle-libuv.patch b/sci-libs/pytorch/files/pytorch-1.7.1-tensorpipe-unbundle-libuv.patch deleted file mode 100644 index 960ae3618..000000000 --- a/sci-libs/pytorch/files/pytorch-1.7.1-tensorpipe-unbundle-libuv.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake -index d1e4bdaed6..85821a78df 100644 ---- a/cmake/Dependencies.cmake -+++ b/cmake/Dependencies.cmake -@@ -1308,7 +1308,6 @@ if(USE_DISTRIBUTED AND USE_TENSORPIPE) - if(MSVC) - message(WARNING "Tensorpipe cannot be used on Windows.") - else() -- set(TP_BUILD_LIBUV ON CACHE BOOL "" FORCE) - set(TP_ENABLE_SHM OFF CACHE BOOL "" FORCE) - set(TP_ENABLE_CMA OFF CACHE BOOL "" FORCE) - set(TP_STATIC_OR_SHARED STATIC CACHE STRING "" FORCE) diff --git a/sci-libs/pytorch/files/pytorch-1.7.1-torch_shm_manager.patch b/sci-libs/pytorch/files/pytorch-1.7.1-torch_shm_manager.patch deleted file mode 100644 index 44b27cac3..000000000 --- a/sci-libs/pytorch/files/pytorch-1.7.1-torch_shm_manager.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/torch/__init__.py b/torch/__init__.py -index 03f6eca622..297fb169a4 100644 ---- a/torch/__init__.py -+++ b/torch/__init__.py -@@ -412,7 +412,7 @@ def manager_path(): - - - # Shared memory manager needs to know the exact location of manager executable --_C._initExtension(manager_path()) -+_C._initExtension(b"@GENTOO_PORTAGE_EPREFIX@/usr/bin/torch_shm_manager") - del manager_path - - # Appease the type checker: it can't deal with direct setting of globals(). diff --git a/sci-libs/pytorch/files/pytorch-1.9.0-Change-library-directory-according-to-CMake-build.patch b/sci-libs/pytorch/files/pytorch-1.9.0-Change-library-directory-according-to-CMake-build.patch deleted file mode 100644 index 214267487..000000000 --- a/sci-libs/pytorch/files/pytorch-1.9.0-Change-library-directory-according-to-CMake-build.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 52019a3f395e5fa97b26d424152d91f73b400f8e Mon Sep 17 00:00:00 2001 -From: Alexey Chernov <4ernov@gmail.com> -Date: Wed, 13 Nov 2019 23:44:12 +0300 -Subject: [PATCH 5/5] Change library directory according to CMake build -Modified: Tue, 03 Aug 2021, fit for pytorch-1.9.0 - -Change `lib_path` in favour of out-of-tree CMake build -directory, so that all the C++ libraries be found. ---- - setup.py | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/setup.py b/setup.py -index 60502b6add..cbced52192 100644 ---- a/setup.py -+++ b/setup.py -@@ -268,9 +268,10 @@ else: - - # Constant known variables used throughout this file - cwd = os.path.dirname(os.path.abspath(__file__)) --lib_path = os.path.join(cwd, "torch", "lib") -+cmake_build_dir = os.environ.get("CMAKE_BUILD_DIR", os.path.join(cwd, "build")) -+lib_path = os.path.join(cmake_build_dir, "lib") - third_party_path = os.path.join(cwd, "third_party") --caffe2_build_dir = os.path.join(cwd, "build") -+caffe2_build_dir = cmake_build_dir - - # CMAKE: full path to python library - if IS_WINDOWS: --- -2.23.0 - diff --git a/sci-libs/pytorch/files/pytorch-1.9.1-fix-wrong-hipify.patch b/sci-libs/pytorch/files/pytorch-1.9.1-fix-wrong-hipify.patch deleted file mode 100644 index 4e37acd3f..000000000 --- a/sci-libs/pytorch/files/pytorch-1.9.1-fix-wrong-hipify.patch +++ /dev/null @@ -1,13 +0,0 @@ -The hipify misadd a ) and causes compilation error - ---- orig/aten/src/ATen/native/sparse/hip/SparseHIPTensor.hip -+++ pytorch-1.9.1/aten/src/ATen/native/sparse/hip/SparseHIPTensor.hip -@@ -282,7 +282,7 @@ Tensor sparse_mask_helper_cuda( - mask_indices_ti, - t_indices_pos_ti, - t_values_ti, -- r_values_ti); -+ r_values_ti; - C10_HIP_KERNEL_LAUNCH_CHECK(); - }); - } diff --git a/sci-libs/pytorch/metadata.xml b/sci-libs/pytorch/metadata.xml deleted file mode 100644 index df07ea4be..000000000 --- a/sci-libs/pytorch/metadata.xml +++ /dev/null @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>4ernov@gmail.com</email> - <name>Alexey Chernov</name> - </maintainer> - <maintainer type="person"> - <email>heroxbd@gentoo.org</email> - <name>Benda Xu</name> - </maintainer> - <use> - <flag name="asan">Build with address sanitizer (ASAN)</flag> - <flag name="cuda">Enable support for nVidia CUDA</flag> - <flag name="fbgemm">Enable FBGEMM (Facebook GEneral Matrix Multiplication) support</flag> - <flag name="gflags">Build with gflags</flag> - <flag name="glog">Build with glog support</flag> - <flag name="gloo">Build gloo distributed communication backend support</flag> - <flag name="leveldb">Enable support for LevelDB</flag> - <flag name="lmdb">Enable support for LMDB</flag> - <flag name="mkldnn">Build with Intel MKL-DNN support</flag> - <flag name="namedtensor">Enable support for named tensors</flag> - <flag name="nnpack">Enable NNPACK support</flag> - <flag name="numa">Enable support for NUMA</flag> - <flag name="observers">Build observers</flag> - <flag name="opencv">Enable support for OpenCV</flag> - <flag name="opencl">Enable support for OpenCL</flag> - <flag name="qnnpack">Enable QNNPACK support</flag> - <flag name="redis">Enable support for Redis</flag> - <flag name="rocm">Enable AMD ROCm</flag> - <flag name="tools">Build binary tools</flag> - <flag name="zeromq">Enable support for ZeroMQ</flag> - </use> -</pkgmetadata> diff --git a/sci-libs/pytorch/pytorch-1.10.2.ebuild b/sci-libs/pytorch/pytorch-1.10.2.ebuild deleted file mode 100644 index 8ba76f1bd..000000000 --- a/sci-libs/pytorch/pytorch-1.10.2.ebuild +++ /dev/null @@ -1,339 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_SETUPTOOLS=manual -DISTUTILS_SINGLE_IMPL=1 -PYTHON_COMPAT=( python3_{8..10} ) - -inherit cmake cuda distutils-r1 prefix - -DESCRIPTION="Tensors and Dynamic neural networks in Python with strong GPU acceleration" -HOMEPAGE="https://pytorch.org/" -SRC_URI="https://github.com/pytorch/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz -https://github.com/google/benchmark/archive/e991355c02b93fe17713efe04cbc2e278e00fdbd.tar.gz -> benchmark-e991355c02b93fe17713efe04cbc2e278e00fdbd.tar.gz -https://github.com/pytorch/cpuinfo/archive/63b25457.tar.gz -> cpuinfo-63b25457.tar.gz -https://github.com/NVlabs/cub/archive/d106ddb991a56c3df1b6d51b2409e36ba8181ce4.tar.gz -> cub-d106ddb991a56c3df1b6d51b2409e36ba8181ce4.tar.gz -https://github.com/pytorch/fbgemm/archive/7588d9d804826b428fc0e4fd418e9cc3f7a72e52.tar.gz -> fbgemm-7588d9d804826b428fc0e4fd418e9cc3f7a72e52.tar.gz -https://github.com/asmjit/asmjit/archive/d0d14ac774977d0060a351f66e35cb57ba0bf59c.tar.gz -> asmjit-d0d14ac774977d0060a351f66e35cb57ba0bf59c.tar.gz -https://github.com/pytorch/cpuinfo/archive/5916273f79a21551890fd3d56fc5375a78d1598d.tar.gz -> cpuinfo-5916273f79a21551890fd3d56fc5375a78d1598d.tar.gz -https://github.com/google/googletest/archive/0fc5466d.tar.gz -> googletest-0fc5466d.tar.gz -https://github.com/fmtlib/fmt/archive/cd4af11efc9c622896a3e4cb599fa28668ca3d05.tar.gz -> fmt-cd4af11efc9c622896a3e4cb599fa28668ca3d05.tar.gz -https://github.com/houseroad/foxi/archive/c278588e34e535f0bb8f00df3880d26928038cad.tar.gz -> foxi-c278588e34e535f0bb8f00df3880d26928038cad.tar.gz -https://github.com/Maratyszcza/FP16/archive/4dfe081cf6bcd15db339cf2680b9281b8451eeb3.tar.gz -> FP16-4dfe081cf6bcd15db339cf2680b9281b8451eeb3.tar.gz -https://github.com/Maratyszcza/FXdiv/archive/b408327ac2a15ec3e43352421954f5b1967701d1.tar.gz -> FXdiv-b408327ac2a15ec3e43352421954f5b1967701d1.tar.gz -https://github.com/google/gemmlowp/archive/3fb5c176.tar.gz -> gemmlowp-3fb5c176.tar.gz -https://github.com/facebookincubator/gloo/archive/c22a5cfba94edf8ea4f53a174d38aa0c629d070f.tar.gz -> gloo-c22a5cfba94edf8ea4f53a174d38aa0c629d070f.tar.gz -https://github.com/google/googletest/archive/e2239ee6043f73722e7aa812a459f54a28552929.tar.gz -> googletest-e2239ee6043f73722e7aa812a459f54a28552929.tar.gz -https://github.com/intel/ideep/archive/9ca27bbfd88fa1469cbf0467bd6f14cd1738fa40.tar.gz -> ideep-9ca27bbfd88fa1469cbf0467bd6f14cd1738fa40.tar.gz -https://github.com/intel/mkl-dnn/archive/5ef631a0.tar.gz -> mkl-dnn-5ef631a0.tar.gz -cuda? ( https://github.com/NVIDIA/nccl/archive/c5790b36722d5b41ee2a9b2bad69e364180ffd22.tar.gz -> nccl-c5790b36722d5b41ee2a9b2bad69e364180ffd22.tar.gz ) -https://github.com/Maratyszcza/NNPACK/archive/c07e3a0400713d546e0dea2d5466dd22ea389c73.tar.gz -> NNPACK-c07e3a0400713d546e0dea2d5466dd22ea389c73.tar.gz -https://github.com/onnx/onnx/archive/a82c6a70.tar.gz -> onnx-a82c6a70.tar.gz -https://github.com/onnx/onnx-tensorrt/archive/c153211418a7c57ce071d9ce2a41f8d1c85a878f.tar.gz -> onnx-tensorrt-c153211418a7c57ce071d9ce2a41f8d1c85a878f.tar.gz -https://github.com/onnx/onnx/archive/29e7aa7048809784465d06e897f043a4600642b2.tar.gz -> onnx-29e7aa7048809784465d06e897f043a4600642b2.tar.gz -https://github.com/google/benchmark/archive/e776aa02.tar.gz -> benchmark-e776aa02.tar.gz -https://github.com/google/benchmark/archive/5b7683f4.tar.gz -> benchmark-5b7683f4.tar.gz -https://github.com/google/googletest/archive/5ec7f0c4.tar.gz -> googletest-5ec7f0c4.tar.gz -https://github.com/Maratyszcza/psimd/archive/072586a71b55b7f8c584153d223e95687148a90.tar.gz -> psimd-072586a71b55b7f8c584153d223e95687148a90.tar.gz -https://github.com/Maratyszcza/pthreadpool/archive/a134dd5d4cee80cce15db81a72e7f929d71dd413.tar.gz -> pthreadpool-a134dd5d4cee80cce15db81a72e7f929d71dd413.tar.gz -https://github.com/Maratyszcza/PeachPy/archive/07d8fde8ac45d7705129475c0f94ed8925b93473.tar.gz -> PeachPy-07d8fde8ac45d7705129475c0f94ed8925b93473.tar.gz -https://github.com/pytorch/QNNPACK/archive/7d2a4e9931a82adc3814275b6219a03e24e36b4c.tar.gz -> QNNPACK-7d2a4e9931a82adc3814275b6219a03e24e36b4c.tar.gz -https://github.com/shibatch/sleef/archive/e0a003ee838b75d11763aa9c3ef17bf71a725bff.tar.gz -> sleef-e0a003ee838b75d11763aa9c3ef17bf71a725bff.tar.gz -https://github.com/pytorch/tensorpipe/archive/d2aa3485e8229c98891dfd604b514a39d45a5c99.tar.gz -> tensorpipe-d2aa3485e8229c98891dfd604b514a39d45a5c99.tar.gz -https://github.com/google/googletest/archive/2fe3bd99.tar.gz -> googletest-2fe3bd99.tar.gz -https://github.com/google/libnop/archive/aa95422e.tar.gz -> libnop-aa95422e.tar.gz -https://github.com/libuv/libuv/archive/48e04275332f5753427d21a52f17ec6206451f2c.tar.gz -> libuv-48e04275332f5753427d21a52f17ec6206451f2c.tar.gz -https://github.com/google/XNNPACK/archive/79cd5f9e18ad0925ac9a050b00ea5a36230072db.tar.gz -> XNNPACK-79cd5f9e18ad0925ac9a050b00ea5a36230072db.tar.gz -https://github.com/pytorch/kineto/archive/879a203d9bf554e95541679ddad6e0326f272dc1.tar.gz -> kineto-879a203d9bf554e95541679ddad6e0326f272dc1.tar.gz -https://github.com/driazati/breakpad/archive/edbb99f95c75be27d038fffb1d969cdacf705db2.tar.gz -> breakpad-edbb99f95c75be27d038fffb1d969cdacf705db2.tar.gz -https://github.com/mikey/linux-syscall-support/archive/e1e7b0ad8ee99a875b272c8e33e308472e897660.tar.gz -> lss-e1e7b0ad8ee99a875b272c8e33e308472e897660.tar.gz -" - -# git clone git@github.com:pytorch/pytorch.git && cd pytorch -# git submodules update --init --recursive -# ${FILESDIR}/get_third_paries -# cat SRC_URI src_prepare - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64" - -IUSE="asan blas cuda +fbgemm ffmpeg gflags glog +gloo leveldb lmdb mkldnn mpi namedtensor +nnpack numa +observers opencl opencv +openmp +python +qnnpack redis rocm static tools zeromq" -REQUIRED_USE=" ?? ( cuda rocm )" - -RDEPEND=" - $(python_gen_cond_dep ' - dev-python/pyyaml[${PYTHON_USEDEP}] - ') - blas? ( virtual/blas ) - cuda? ( dev-libs/cudnn - dev-cpp/eigen[cuda] ) - rocm? ( >=dev-util/hip-4.3 - >=dev-libs/rccl-4.3 - >=sci-libs/rocThrust-4.3 - >=sci-libs/hipCUB-4.3 - >=sci-libs/rocPRIM-4.3 - >=sci-libs/miopen-4.3 - >=sci-libs/rocBLAS-4.3 - >=sci-libs/rocRAND-4.3 - >=sci-libs/hipSPARSE-4.3 - >=sci-libs/rocFFT-4.3 - >=dev-util/roctracer-4.3 ) - ffmpeg? ( media-video/ffmpeg ) - gflags? ( dev-cpp/gflags ) - glog? ( dev-cpp/glog[gflags] ) - leveldb? ( dev-libs/leveldb ) - lmdb? ( dev-db/lmdb ) - mpi? ( virtual/mpi ) - opencl? ( dev-libs/clhpp ) - opencv? ( media-libs/opencv ) - python? ( ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/setuptools[${PYTHON_USEDEP}] - dev-python/pybind11[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/protobuf-python:=[${PYTHON_USEDEP}] - ') - ) - redis? ( dev-db/redis ) - zeromq? ( net-libs/zeromq ) - dev-cpp/eigen - dev-libs/protobuf:= - dev-libs/libuv -" - -#ATen code generation -BDEPEND="dev-python/pyyaml" - -DEPEND="${RDEPEND} - dev-cpp/tbb - app-arch/zstd - $(python_gen_cond_dep ' - dev-python/pybind11[${PYTHON_USEDEP}] - dev-python/typing-extensions[${PYTHON_USEDEP}] - ') - sys-cluster/rdma-core - sys-process/numactl -" - -PATCHES=( - "${FILESDIR}"/${PN}-1.9.0-Change-library-directory-according-to-CMake-build.patch - "${FILESDIR}"/${PN}-1.6.0-global-dlopen.patch - "${FILESDIR}"/0002-Don-t-build-libtorch-again-for-PyTorch-1.7.1.patch - "${FILESDIR}"/${PN}-1.7.1-no-rpath.patch - "${FILESDIR}"/${PN}-1.7.1-torch_shm_manager.patch - "${FILESDIR}"/${PN}-1.10.0-nonull.patch - "${FILESDIR}"/${PN}-1.10.0-fix-distutils.patch - "${FILESDIR}"/${PN}-1.10.0-clhpp2.patch -) - -distutils_enable_tests --install pytest - -src_prepare() { - cmake_src_prepare - eprefixify torch/__init__.py - - rmdir third_party/benchmark || die - ln -sv "${WORKDIR}"/benchmark-e991355c02b93fe17713efe04cbc2e278e00fdbd third_party/benchmark || die - rmdir third_party/cpuinfo || die - ln -sv "${WORKDIR}"/cpuinfo-5916273f79a21551890fd3d56fc5375a78d1598d third_party/cpuinfo || die - rmdir third_party/cub || die - ln -sv "${WORKDIR}"/cub-d106ddb991a56c3df1b6d51b2409e36ba8181ce4 third_party/cub || die - rmdir third_party/fbgemm || die - ln -sv "${WORKDIR}"/FBGEMM-7588d9d804826b428fc0e4fd418e9cc3f7a72e52 third_party/fbgemm || die - rmdir third_party/fbgemm/third_party/asmjit || die - ln -sv "${WORKDIR}"/asmjit-d0d14ac774977d0060a351f66e35cb57ba0bf59c third_party/fbgemm/third_party/asmjit || die - rmdir third_party/fbgemm/third_party/cpuinfo || die - ln -sv "${WORKDIR}"/cpuinfo-d5e37adf1406cf899d7d9ec1d317c47506ccb970 third_party/fbgemm/third_party/cpuinfo || die - rmdir third_party/fbgemm/third_party/googletest || die - ln -sv "${WORKDIR}"/googletest-0fc5466dbb9e623029b1ada539717d10bd45e99e third_party/fbgemm/third_party/googletest || die - rmdir third_party/fmt || die - ln -sv "${WORKDIR}"/fmt-cd4af11efc9c622896a3e4cb599fa28668ca3d05 third_party/fmt || die - rmdir third_party/foxi || die - ln -sv "${WORKDIR}"/foxi-c278588e34e535f0bb8f00df3880d26928038cad third_party/foxi || die - rmdir third_party/FP16 || die - ln -sv "${WORKDIR}"/FP16-4dfe081cf6bcd15db339cf2680b9281b8451eeb3 third_party/FP16 || die - rmdir third_party/FXdiv - ln -sv "${WORKDIR}"/FXdiv-b408327ac2a15ec3e43352421954f5b1967701d1 third_party/FXdiv || die - rmdir third_party/gemmlowp/gemmlowp || die - ln -sv "${WORKDIR}"/gemmlowp-3fb5c176c17c765a3492cd2f0321b0dab712f350 third_party/gemmlowp/gemmlowp || die - rmdir third_party/gloo || die - ln -sv "${WORKDIR}"/gloo-c22a5cfba94edf8ea4f53a174d38aa0c629d070f third_party/gloo || die - rmdir third_party/googletest || die - ln -sv "${WORKDIR}"/googletest-e2239ee6043f73722e7aa812a459f54a28552929 third_party/googletest || die - rmdir third_party/ideep || die - ln -sv "${WORKDIR}"/ideep-9ca27bbfd88fa1469cbf0467bd6f14cd1738fa40 third_party/ideep || die - rmdir third_party/ideep/mkl-dnn || die - ln -sv "${WORKDIR}"/mkl-dnn-5ef631a030a6f73131c77892041042805a06064f third_party/ideep/mkl-dnn || die - rmdir third_party/nccl/nccl || die - ln -sv "${WORKDIR}"/nccl-c5790b36722d5b41ee2a9b2bad69e364180ffd22 third_party/nccl/nccl || die - rmdir third_party/NNPACK || die - ln -sv "${WORKDIR}"/NNPACK-c07e3a0400713d546e0dea2d5466dd22ea389c73 third_party/NNPACK || die - rmdir third_party/onnx || die - ln -sv "${WORKDIR}"/onnx-29e7aa7048809784465d06e897f043a4600642b2 third_party/onnx || die - rmdir third_party/onnx-tensorrt || die - ln -sv "${WORKDIR}"/onnx-tensorrt-c153211418a7c57ce071d9ce2a41f8d1c85a878f third_party/onnx-tensorrt || die - rmdir third_party/onnx-tensorrt/third_party/onnx || die - ln -sv "${WORKDIR}"/onnx-765f5ee823a67a866f4bd28a9860e81f3c811ce8 third_party/onnx-tensorrt/third_party/onnx || die - rmdir third_party/onnx/third_party/benchmark || die - ln -sv "${WORKDIR}"/benchmark-e776aa0275e293707b6a0901e0e8d8a8a3679508 third_party/onnx/third_party/benchmark || die - rmdir third_party/psimd || die - ln -sv "${WORKDIR}"/psimd-072586a71b55b7f8c584153d223e95687148a900 third_party/psimd || die - rmdir third_party/pthreadpool || die - ln -sv "${WORKDIR}"/pthreadpool-a134dd5d4cee80cce15db81a72e7f929d71dd413 third_party/pthreadpool || die - rmdir third_party/python-peachpy || die - ln -sv "${WORKDIR}"/PeachPy-07d8fde8ac45d7705129475c0f94ed8925b93473 third_party/python-peachpy || die - rmdir third_party/QNNPACK || die - ln -sv "${WORKDIR}"/QNNPACK-7d2a4e9931a82adc3814275b6219a03e24e36b4c third_party/QNNPACK || die - rmdir third_party/sleef || die - ln -sv "${WORKDIR}"/sleef-e0a003ee838b75d11763aa9c3ef17bf71a725bff third_party/sleef || die - rmdir third_party/tensorpipe || die - ln -sv "${WORKDIR}"/tensorpipe-d2aa3485e8229c98891dfd604b514a39d45a5c99 third_party/tensorpipe || die - rmdir third_party/tensorpipe/third_party/googletest || die - ln -sv "${WORKDIR}"/googletest-2fe3bd994b3189899d93f1d5a881e725e046fdc2 third_party/tensorpipe/third_party/googletest || die - rmdir third_party/tensorpipe/third_party/libnop || die - ln -sv "${WORKDIR}"/libnop-aa95422ea8c409e3f078d2ee7708a5f59a8b9fa2 third_party/tensorpipe/third_party/libnop || die - rmdir third_party/tensorpipe/third_party/libuv || die - ln -sv "${WORKDIR}"/libuv-48e04275332f5753427d21a52f17ec6206451f2c third_party/tensorpipe/third_party/libuv || die - rmdir third_party/XNNPACK || die - ln -sv "${WORKDIR}"/XNNPACK-79cd5f9e18ad0925ac9a050b00ea5a36230072db third_party/XNNPACK || die - rmdir third_party/kineto || die - ln -sv "${WORKDIR}"/kineto-879a203d9bf554e95541679ddad6e0326f272dc1 third_party/kineto || die - rmdir third_party/breakpad || die - ln -sv "${WORKDIR}"/breakpad-edbb99f95c75be27d038fffb1d969cdacf705db2 third_party/breakpad || die - rmdir third_party/breakpad/src/third_party/lss || die - ln -sv "${WORKDIR}"/linux-syscall-support-e1e7b0ad8ee99a875b272c8e33e308472e897660 third_party/breakpad/src/third_party/lss || die - - if use cuda; then - cd third_party/nccl/nccl || die - eapply "${FILESDIR}"/${PN}-1.10.1-nccl-nvccflags.patch - cuda_src_prepare - export CUDAHOSTCXX=$(cuda_gccdir)/g++ - cd "${S}" - fi - - if use rocm; then - #Allow escaping sandbox - addread /dev/kfd - addread /dev/dri - addpredict /dev/kfd - addpredict /dev/dri - - ebegin "HIPifying cuda sources" - ${EPYTHON} tools/amd_build/build_amd.py || die - eapply "${FILESDIR}"/${PN}-1.9.1-fix-wrong-hipify.patch - eend $? - - local ROCM_VERSION="$(hipconfig -v)-" - export PYTORCH_ROCM_ARCH="${AMDGPU_TARGETS}" - sed -e "/set(roctracer_INCLUDE_DIRS/s,\${ROCTRACER_PATH}/include,${EPREFIX}/usr/include/roctracer," \ - -e "/PYTORCH_HIP_HCC_LIBRARIES/s,\${HIP_PATH}/lib,${EPREFIX}/usr/lib/hip/lib," \ - -e "/set(roctracer_INCLUDE_DIRS/a\ set(thrust_INCLUDE_DIRS ${EPREFIX}/usr/include/rocthrust)" \ - -e "s,\${ROCTRACER_PATH}/lib,${EPREFIX}/usr/lib64/roctracer," \ - -e "/READ.*\.info\/version-dev/c\ set(ROCM_VERSION_DEV_RAW ${ROCM_VERSION})" \ - -i cmake/public/LoadHIP.cmake || die - sed -r -e '/^if\(USE_ROCM/{:a;N;/\nendif/!ba; s,\{([^\{]*)_PATH\}(/include)?,\{\L\1_\UINCLUDE_DIRS\},g}' -i cmake/Dependencies.cmake || die - fi - - # Set build dir for pytorch's setup - sed -e "/BUILD_DIR/s,build,${BUILD_DIR}," -i tools/setup_helpers/env.py || die -} - -src_configure() { - local mycmakeargs=( - -DWERROR=OFF - -DTORCH_BUILD_VERSION=${PV} - -DTORCH_INSTALL_LIB_DIR=$(get_libdir) - -DBUILD_BINARY=$(usex tools ON OFF) - -DBUILD_CUSTOM_PROTOBUF=OFF - -DBUILD_PYTHON=$(usex python ON OFF) - -DBUILD_SHARED_LIBS=$(usex static OFF ON) - -DBUILD_TEST=$(usex test ON OFF) - -DUSE_ASAN=$(usex asan ON OFF) - -DUSE_CUDA=$(usex cuda ON OFF) - -DUSE_NCCL=$(usex cuda ON OFF) - -DUSE_SYSTEM_NCCL=OFF - -DUSE_ROCM=$(usex rocm ON OFF) - -DUSE_FBGEMM=$(usex fbgemm ON OFF) - -DUSE_FFMPEG=$(usex ffmpeg ON OFF) - -DUSE_GFLAGS=$(usex gflags ON OFF) - -DUSE_GLOG=$(usex glog ON OFF) - -DUSE_LEVELDB=$(usex leveldb ON OFF) - -DUSE_LITE_PROTO=OFF - -DUSE_LMDB=$(usex lmdb ON OFF) - -DUSE_MKLDNN=$(usex mkldnn ON OFF) - -DUSE_MKLDNN_CBLAS=OFF - -DUSE_NNPACK=$(usex nnpack ON OFF) - -DUSE_NUMPY=$(usex python ON OFF) - -DUSE_NUMA=$(usex numa ON OFF) - -DUSE_OBSERVERS=$(usex observers ON OFF) - -DUSE_OPENCL=$(usex opencl ON OFF) - -DUSE_OPENCV=$(usex opencv ON OFF) - -DUSE_OPENMP=$(usex openmp ON OFF) - -DUSE_TBB=OFF - -DUSE_PROF=OFF - -DUSE_QNNPACK=$(usex qnnpack ON OFF) - -DUSE_REDIS=$(usex redis ON OFF) - -DUSE_ROCKSDB=OFF - -DUSE_ZMQ=$(usex zeromq ON OFF) - -DUSE_MPI=$(usex mpi ON OFF) - -DUSE_GLOO=$(usex gloo ON OFF) - -DUSE_SYSTEM_EIGEN_INSTALL=ON - -DUSE_SYSTEM_PYBIND11=ON - -DBLAS=$(usex blas Generic Eigen) - -DTP_BUILD_LIBUV=OFF - -Wno-dev - ) - - HIP_PATH="${EPREFIX}/usr/lib/hip" cmake_src_configure - - if use python; then - CMAKE_BUILD_DIR="${BUILD_DIR}" distutils-r1_src_configure - fi - - # do not rerun cmake and the build process in src_install - sed '/RERUN/,+1d' -i "${BUILD_DIR}"/build.ninja || die -} - -src_compile() { - cmake_src_compile - - if use python; then - USE_SYSTEM_LIBS=ON CMAKE_BUILD_DIR=${BUILD_DIR} distutils-r1_src_compile - fi -} - -src_install() { - cmake_src_install - - local LIB=$(get_libdir) - if [[ ${LIB} != lib ]]; then - mv -fv "${ED}"/usr/lib/*.so "${ED}"/usr/${LIB}/ || die - fi - - rm -r "${ED}/usr/lib" || die - - rm -r "${ED}/usr/include/asmjit" || die - rm -r "${ED}/usr/include/c10d" || die - rm -r "${ED}/usr/include/fbgemm" || die - rm -r "${ED}/usr/include/fp16" || die - rm -r "${ED}/usr/include/gloo" || die - - if use python; then - scanelf -r --fix "${BUILD_DIR}/caffe2/python" || die - USE_SYSTEM_LIBS=ON CMAKE_BUILD_DIR=${BUILD_DIR} distutils-r1_src_install - - python_optimize - fi - - find "${ED}/usr/${LIB}" -name "*.a" -exec rm -fv {} \; || die - - if use test; then - rm -r "${ED}/usr/test" "${ED}"/usr/bin/test_{api,jit} || die - fi - - # Remove the empty directories by CMake Python: - find "${ED}" -type d -empty -delete || die -} |