From aebea1e3847f7c6c585f7c51a36ad0da4d164313 Mon Sep 17 00:00:00 2001 From: loong0 Date: Wed, 6 Jul 2022 14:34:50 -0700 Subject: [PATCH] remove old version --- dev-lisp/asdf/Manifest | 2 +- ...sdf-3.3.5.3.ebuild => asdf-3.3.5.9.ebuild} | 0 dev-lisp/sbcl/Manifest | 14 + .../sbcl/files/bsd-sockets-test-2.0.5.patch | 385 ++++++++++++++++++ .../sbcl/files/concurrency-test-2.0.1.patch | 12 + dev-lisp/sbcl/files/etags-2.1.0.patch | 10 + .../sbcl/files/sb-posix-test-1.2.15.patch | 40 ++ dev-lisp/sbcl/files/verbose-build-2.0.3.patch | 29 ++ dev-lisp/sbcl/sbcl-2.2.6.ebuild | 240 +++++++++++ dev-lisp/uiop/Manifest | 2 +- ...iop-3.3.5.3.ebuild => uiop-3.3.5.9.ebuild} | 0 dev-util/re2c/Manifest | 1 + dev-util/re2c/files/re2c-2.1.1-sh.patch | 48 +++ dev-util/re2c/re2c-3.0.ebuild | 40 ++ sci-libs/pytorch/Manifest | 40 -- ...ild-libtorch-again-for-PyTorch-1.4.0.patch | 30 -- ...ild-libtorch-again-for-PyTorch-1.7.1.patch | 18 - ...to-caffe2-build-dir-made-by-libtorch.patch | 46 --- ...-of-Caffe2-library-for-system-wide-i.patch | 104 ----- ...y-directory-according-to-CMake-build.patch | 31 -- ...rsion-ambiguity-in-ternary-operators.patch | 38 -- .../pytorch/files/pytorch-1.2.0-setup.patch | 24 -- .../files/pytorch-1.4.0-nccl-nvccflags.patch | 28 -- .../files/pytorch-1.4.0-skip-tests.patch | 28 -- .../pytorch/files/pytorch-1.4.0-sleef.patch | 15 - .../files/pytorch-1.6.0-global-dlopen.patch | 15 - .../files/pytorch-1.6.0-skip-tests.patch | 14 - .../files/pytorch-1.7.1-no-rpath.patch | 12 - .../pytorch/files/pytorch-1.7.1-setup.patch | 12 - ...orch-1.7.1-tensorpipe-unbundle-libuv.patch | 12 - .../pytorch-1.7.1-torch_shm_manager.patch | 13 - .../files/pytorch-1.9.0-global-dlopen.patch | 15 - sci-libs/pytorch/pytorch-1.11.0.ebuild | 333 --------------- 33 files changed, 821 insertions(+), 830 deletions(-) rename dev-lisp/asdf/{asdf-3.3.5.3.ebuild => asdf-3.3.5.9.ebuild} (100%) create mode 100644 dev-lisp/sbcl/Manifest create mode 100644 dev-lisp/sbcl/files/bsd-sockets-test-2.0.5.patch create mode 100644 dev-lisp/sbcl/files/concurrency-test-2.0.1.patch create mode 100644 dev-lisp/sbcl/files/etags-2.1.0.patch create mode 100644 dev-lisp/sbcl/files/sb-posix-test-1.2.15.patch create mode 100644 dev-lisp/sbcl/files/verbose-build-2.0.3.patch create mode 100644 dev-lisp/sbcl/sbcl-2.2.6.ebuild rename dev-lisp/uiop/{uiop-3.3.5.3.ebuild => uiop-3.3.5.9.ebuild} (100%) create mode 100644 dev-util/re2c/Manifest create mode 100644 dev-util/re2c/files/re2c-2.1.1-sh.patch create mode 100644 dev-util/re2c/re2c-3.0.ebuild delete mode 100644 sci-libs/pytorch/Manifest delete mode 100644 sci-libs/pytorch/files/0002-Don-t-build-libtorch-again-for-PyTorch-1.4.0.patch delete mode 100644 sci-libs/pytorch/files/0002-Don-t-build-libtorch-again-for-PyTorch-1.7.1.patch delete mode 100644 sci-libs/pytorch/files/0003-Change-path-to-caffe2-build-dir-made-by-libtorch.patch delete mode 100644 sci-libs/pytorch/files/0004-Don-t-fill-rpath-of-Caffe2-library-for-system-wide-i.patch delete mode 100644 sci-libs/pytorch/files/0005-Change-library-directory-according-to-CMake-build.patch delete mode 100644 sci-libs/pytorch/files/0010-Remove-conversion-ambiguity-in-ternary-operators.patch delete mode 100644 sci-libs/pytorch/files/pytorch-1.2.0-setup.patch delete mode 100644 sci-libs/pytorch/files/pytorch-1.4.0-nccl-nvccflags.patch delete mode 100644 sci-libs/pytorch/files/pytorch-1.4.0-skip-tests.patch delete mode 100644 sci-libs/pytorch/files/pytorch-1.4.0-sleef.patch delete mode 100644 sci-libs/pytorch/files/pytorch-1.6.0-global-dlopen.patch delete mode 100644 sci-libs/pytorch/files/pytorch-1.6.0-skip-tests.patch delete mode 100644 sci-libs/pytorch/files/pytorch-1.7.1-no-rpath.patch delete mode 100644 sci-libs/pytorch/files/pytorch-1.7.1-setup.patch delete mode 100644 sci-libs/pytorch/files/pytorch-1.7.1-tensorpipe-unbundle-libuv.patch delete mode 100644 sci-libs/pytorch/files/pytorch-1.7.1-torch_shm_manager.patch delete mode 100644 sci-libs/pytorch/files/pytorch-1.9.0-global-dlopen.patch delete mode 100644 sci-libs/pytorch/pytorch-1.11.0.ebuild diff --git a/dev-lisp/asdf/Manifest b/dev-lisp/asdf/Manifest index ecbc9c2ccc..aebb9d447c 100644 --- a/dev-lisp/asdf/Manifest +++ b/dev-lisp/asdf/Manifest @@ -1 +1 @@ -DIST asdf-3.3.5.3.tar.gz 521876 BLAKE2B ccd0fd5796160090c394bd856f817fb5b73cbff60c589d2961b8f132a747ece2892f7cbbf22e26eda1f88402cc0dc0620b2164d81fc34a65f04f7c3862331df9 SHA512 34430ba3c7424e1d5e34f231d27c1a983555f237c83a07a6ddcf13d512c1a5346448db3fc982e7692fb273a6e51c2631acb39d3933afb5025bcf543dd0f8cd62 +DIST asdf-3.3.5.9.tar.gz 525933 BLAKE2B 8181e91644564919aa401c1ab9f48b2bb60a210e56e6f43b692b34023974d9bc446553db0b3b3d8a34252910f87c01283d546d27a4799c3efe2069ccec5726b2 SHA512 e1eed89a8f82b2dbe84648a8b4bc8f754c438cce007a61c1e8f2c1e5b8a59bad5788d65f0ecf89c7221e784ac81178247d60c66e7cf9c22ca3943bad6db9dc5e diff --git a/dev-lisp/asdf/asdf-3.3.5.3.ebuild b/dev-lisp/asdf/asdf-3.3.5.9.ebuild similarity index 100% rename from dev-lisp/asdf/asdf-3.3.5.3.ebuild rename to dev-lisp/asdf/asdf-3.3.5.9.ebuild diff --git a/dev-lisp/sbcl/Manifest b/dev-lisp/sbcl/Manifest new file mode 100644 index 0000000000..a6eefcaedf --- /dev/null +++ b/dev-lisp/sbcl/Manifest @@ -0,0 +1,14 @@ +DIST sbcl-1.0.23-sparc-solaris-binary.tar.bz2 7907803 BLAKE2B 4be6831c196cfef505b411fa9ae0b9586f93309ce97fcd2b964abfb4175f00f7437da7859334973f2441592fc1a13cc5557044737659f5ef13998b593d623cda SHA512 d641d7859f0d60ce7dd684a0f21e62282a5a658ed6bb4d67d6b141b3ce22d9e27261efe7e5d0f752c30e467cf90d7c8a03ad2a04b3c60042f0ef0a4808a9c74a +DIST sbcl-1.0.28-alpha-linux-binary.tar.bz2 7573824 BLAKE2B ab8e139adb4fbc0ac7b34457c3361b044d04d8d9dedba2008cb19220915900e2d1bf540b617c738145923d74fa28ab7d979fd0d1bf4b9d17c445dfb080731263 SHA512 85ceb4d3bf971777f5444a63cbabd88ccfaf16ed3b3c86cc5ea6cb3fd3189c4cd5a5ebbf785c97366afb7026604ffc34a1129936291deede5993056e158125ab +DIST sbcl-1.0.28-sparc-linux-binary.tar.bz2 8032042 BLAKE2B ca4213ef00447d66406d1c752a1653fd628deba0e112f55a5625dad61da30c0be7c60fe4e84e8dcc9d9946db553ad544dc39b28d62124d8e3d6197943efc944a SHA512 cea1ba06f85169fca9fe3026813c6e7e8e8209b874e048b7bd63cb3a1c5bd7c829e8dbb2c486977e190a0390d28e4845938a9e84378f4f2f16f72bf0b6f45c80 +DIST sbcl-1.0.47-powerpc-darwin-binary.tar.bz2 8217590 BLAKE2B 68da614df7d27ecf08a21603d4f172344c86e650176d238fe73d7756a626b694e2165b9157e53732730861d085902e5cc893b967073168fe3845cd2621668b87 SHA512 8118de56e448bce7a72b832e661eb4e2687eed675f88f766f7043c843a432e35121d9e6f9da8d22ac690c54bda0d55ecb07728748ce2cdd57320f49b4b812b86 +DIST sbcl-1.2.11-x86-64-darwin-binary.tar.bz2 10038928 BLAKE2B b434f65e9e42341645ac91c8f35ffeb6d2d7f043544ca9af7c519a46df15cee6d2fe4d0a56c10643c6f263e8deb75bcfb00cc399d1f32c10d53c20a9842c45db SHA512 c271796f854fe884e0d8aa6504bbe2e6c078de1555fc9a823463640cfd8c793dbddcb3f32932788d84a41e2b8a085b95c97c13a15c43fc909dcaad18ce25f215 +DIST sbcl-1.2.7-powerpc-linux-binary.tar.bz2 9884585 BLAKE2B 1870da882fc5e466eaf5e96ed46aed600660bdfe836eabe145cf9ea4713e537a7d45dd76538d899801d0e3ea944c4ccfff1c9688fc695890bb4cac69135ef046 SHA512 7b9fef12d3d6397adec6a0c26d1431a18b8d91b5bf009034eb2501de9fd60dc04dd2e3cd2d9feb9204d4631360aea88ba07a9ad75dad0767b5dcc5e62e84e790 +DIST sbcl-1.2.7-x86-64-solaris-binary.tar.bz2 10438955 BLAKE2B ca9cd3a55873c648940793ae9fb92dde5e4569b7392932771b31dc71da380267556b3ceb8b099f62576b76d77395123735232c43c0ed1f934d1e004a6194d0fa SHA512 9566cebf8fc29ead1f919309e3f98aeb618e97b34c80f53d1f739f1a3f4ef4cbaebd1c67f0b32172a0cdf14dc405eb75d0e916dedf3b8a758cdec2368d25f5c1 +DIST sbcl-1.2.7-x86-solaris-binary.tar.bz2 10351529 BLAKE2B 9b7324c8177856c6024220ce71070a1a51b93fa9352fe692c3fd5afa9b6cdcbb361c54e354ab1cc1153e6bf15cb0c5fc267c3da03addd5d35fbec840f72a7c06 SHA512 b30d40f0095bb43719ba2e1a619f53fe5f0bccaa08a35481bc5feeb0dd5b540018a9ec9f61799de89991a85750577922cb4e56db4d7dab8f07e18bbc643bdad1 +DIST sbcl-1.4.11-armhf-linux-binary.tar.bz2 9767589 BLAKE2B 2949338bc19973e0ca38f435caaa4c991a6c86d70dc092a4f1b6ec3eefa47af76f2a0c3fd8a4f8004127f4b8b3666a5cf4260b6ab56802308880067e4eaf8568 SHA512 297edddc36e9b9de080f9e25faa323e23877af234104b4b7e0fe2b74f0dd117d9cf0caa87b79718a8b071bcb5e97c8118f1d11af0e4aba2a961beb40c4dc99cb +DIST sbcl-1.4.2-arm64-linux-binary.tar.bz2 10578821 BLAKE2B 1cd25c548be0f1b7ec01edc3bee7fe6c2aaf07b7bd1fc55d408dee7ac95e8f3761a194bf9e8efb734179a7eff04cdae2fe5ba4a9ba5ab06f7322ac1550d142cc SHA512 39bbd735b242aa0bbac05c6f4dbe28cb45e01684db7e5b4f1e51f995a9f9d5b484f63cc4243f472f72b3b1e6c4cd2268a7e812b15426eca5cf9a1fede10f44bb +DIST sbcl-1.4.3-x86-linux-binary.tar.bz2 10227185 BLAKE2B 6d77c4f4177cbdb72fb9bab0da5bd91e0aa8deafffd238818a2551332f0ab246715d9489b5c1156f3481aa7fb79d161a988404620fc09fe86ff927543a1ee678 SHA512 41cd63d61dd7c46370341dce39a362287a23b528bfebe8e5571614aeefdea03d318207d25562e995db9ccedb6c1f50ea4d66627721f0fd9486e99440126e6a38 +DIST sbcl-1.5.8-ppc64le-linux-binary.tar.bz2 10025597 BLAKE2B aac079e3585ebe9d5b610cf096e958edfd4410361b0d96b2fa88a285cbdce4133d89e1ddf0cf6729d43d6c3057365d07a3d73362f906fd8798b76c993210a8e5 SHA512 443ab604caa768c756f3322d7c599142a50227914bcd6be12434432daf1e3d5af0740d1ebdb166b856cc77ddf02451e29fcef9e29099f7bc4fb49ad61db17674 +DIST sbcl-2.2.5-x86-64-linux-binary.tar.bz2 10706829 BLAKE2B 0cabe57fcfa80f07abb0a55b1e928111cbc4296dc57b45e8fc714b7f0d8e656736aa0c7bc000fe0ec8d4c2acf9c54c872f3369155aa9c36b55ee035b66a21f6f SHA512 7e4a4c2c825f906b5c90fe3f0129115361056c57d524ff0f5a9fbae611f98b1b6488711269eee3c6eeb22793c5c35087a02ce925e3ca8d84445d061e56f5e6fc +DIST sbcl-2.2.6-source.tar.bz2 7128448 BLAKE2B 7b7c996c175e9a06ca3b1cc40834d8d97925d3d6aa431fff4278ebe2b23e2ce8888824f71b1b5b47211b6acd006996a40391cb12004c92fbf3fb08d6fbb5b28f SHA512 d8460cfb0044b02b3989ff2266355c067035eab5cde2afb8d170870e4bf54112ec878e7d5f809adaaabcfef3df1cd9ef2d94517b772ba376ca53b9ee78893baf diff --git a/dev-lisp/sbcl/files/bsd-sockets-test-2.0.5.patch b/dev-lisp/sbcl/files/bsd-sockets-test-2.0.5.patch new file mode 100644 index 0000000000..3226e7539d --- /dev/null +++ b/dev-lisp/sbcl/files/bsd-sockets-test-2.0.5.patch @@ -0,0 +1,385 @@ +diff -U3 -r sbcl-2.0.5.orig/contrib/sb-bsd-sockets/tests.lisp sbcl-2.0.5/contrib/sb-bsd-sockets/tests.lisp +--- sbcl-2.0.5.orig/contrib/sb-bsd-sockets/tests.lisp 2020-05-31 20:16:48.000000000 +0700 ++++ sbcl-2.0.5/contrib/sb-bsd-sockets/tests.lisp 2020-06-08 18:15:59.750860802 +0700 +@@ -18,16 +18,16 @@ + (equalp (make-inet-address "242.1.211.3") #(242 1 211 3)) + t) + +-(deftest make-inet6-address.1 +- (equalp (make-inet6-address "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff") +- #(255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255)) +- t) +- +-(deftest unparse-inet6-address +- (string= (sb-bsd-sockets::unparse-inet6-address +- (make-inet6-address "fe80::abcd:1234")) +- "fe80::abcd:1234") +- t) ++;(deftest make-inet6-address.1 ++; (equalp (make-inet6-address "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff") ++; #(255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255)) ++; t) ++ ++;(deftest unparse-inet6-address ++; (string= (sb-bsd-sockets::unparse-inet6-address ++; (make-inet6-address "fe80::abcd:1234")) ++; "fe80::abcd:1234") ++; t) + + (deftest get-protocol-by-name/tcp + (integerp (get-protocol-by-name "tcp")) +@@ -40,15 +40,15 @@ + ;;; See https://bugs.launchpad.net/sbcl/+bug/659857 + ;;; Apparently getprotobyname_r on FreeBSD says -1 and EINTR + ;;; for unknown protocols... +-#-(and freebsd sb-thread) +-#-(and dragonfly sb-thread) +-(deftest get-protocol-by-name/error +- (handler-case (get-protocol-by-name "nonexistent-protocol") +- (unknown-protocol () +- t) +- (:no-error () +- nil)) +- t) ++;#-(and freebsd sb-thread) ++;#-(and dragonfly sb-thread) ++;(deftest get-protocol-by-name/error ++; (handler-case (get-protocol-by-name "nonexistent-protocol") ++; (unknown-protocol () ++; t) ++; (:no-error () ++; nil)) ++; t) + + (eval-when (:compile-toplevel :execute) + (when (handler-case (make-instance 'inet-socket +@@ -108,19 +108,19 @@ + (:no-error nil)) + t) + +-(deftest make-inet6-socket.smoke +- (handler-case +- (let ((s (make-instance 'inet6-socket :type :stream :protocol (get-protocol-by-name "tcp")))) +- (> (socket-file-descriptor s) 1)) +- ((or address-family-not-supported protocol-not-supported-error) () t)) +- t) +- +-(deftest make-inet6-socket.keyword +- (handler-case +- (let ((s (make-instance 'inet6-socket :type :stream :protocol :tcp))) +- (> (socket-file-descriptor s) 1)) +- ((or address-family-not-supported protocol-not-supported-error) () t)) +- t) ++;(deftest make-inet6-socket.smoke ++; (handler-case ++; (let ((s (make-instance 'inet6-socket :type :stream :protocol (get-protocol-by-name "tcp")))) ++; (> (socket-file-descriptor s) 1)) ++; ((or address-family-not-supported protocol-not-supported-error) () t)) ++; t) ++ ++;(deftest make-inet6-socket.keyword ++; (handler-case ++; (let ((s (make-instance 'inet6-socket :type :stream :protocol :tcp))) ++; (> (socket-file-descriptor s) 1)) ++; ((or address-family-not-supported protocol-not-supported-error) () t)) ++; t) + + #+ipv4-support + (deftest* (non-block-socket) +@@ -129,54 +129,54 @@ + (non-blocking-mode s)) + t) + +-#+ipv4-support +-(deftest inet-socket-bind +- (let* ((tcp (get-protocol-by-name "tcp")) +- (address (make-inet-address "127.0.0.1")) +- (s1 (make-instance 'inet-socket :type :stream :protocol tcp)) +- (s2 (make-instance 'inet-socket :type :stream :protocol tcp))) +- (unwind-protect +- ;; Given the functions we've got so far, if you can think of a +- ;; better way to make sure the bind succeeded than trying it +- ;; twice, let me know +- (progn +- (socket-bind s1 address 0) +- (handler-case +- (let ((port (nth-value 1 (socket-name s1)))) +- (socket-bind s2 address port) +- nil) +- (address-in-use-error () t))) +- (socket-close s1) +- (socket-close s2))) +- t) +- +-(deftest inet6-socket-bind +- (handler-case +- (let* ((tcp (get-protocol-by-name "tcp")) +- (address (make-inet6-address "::1")) +- (s1 (make-instance 'inet6-socket :type :stream :protocol tcp)) +- (s2 (make-instance 'inet6-socket :type :stream :protocol tcp))) +- (unwind-protect +- ;; Given the functions we've got so far, if you can think of a +- ;; better way to make sure the bind succeeded than trying it +- ;; twice, let me know +- (handler-case +- (socket-bind s1 address 0) +- (socket-error () +- ;; This may mean no IPv6 support, can't fail a test +- ;; because of that (address-family-not-supported doesn't catch that) +- t) +- (:no-error (x) +- (declare (ignore x)) +- (handler-case +- (let ((port (nth-value 1 (socket-name s1)))) +- (socket-bind s2 address port) +- nil) +- (address-in-use-error () t)))) +- (socket-close s1) +- (socket-close s2))) +- ((or address-family-not-supported protocol-not-supported-error) () t)) +- t) ++;#+ipv4-support ++;(deftest inet-socket-bind ++; (let* ((tcp (get-protocol-by-name "tcp")) ++; (address (make-inet-address "127.0.0.1")) ++; (s1 (make-instance 'inet-socket :type :stream :protocol tcp)) ++; (s2 (make-instance 'inet-socket :type :stream :protocol tcp))) ++; (unwind-protect ++; ;; Given the functions we've got so far, if you can think of a ++; ;; better way to make sure the bind succeeded than trying it ++; ;; twice, let me know ++; (progn ++; (socket-bind s1 address 0) ++; (handler-case ++; (let ((port (nth-value 1 (socket-name s1)))) ++; (socket-bind s2 address port) ++; nil) ++; (address-in-use-error () t))) ++; (socket-close s1) ++; (socket-close s2))) ++; t) ++ ++;(deftest inet6-socket-bind ++; (handler-case ++; (let* ((tcp (get-protocol-by-name "tcp")) ++; (address (make-inet6-address "::1")) ++; (s1 (make-instance 'inet6-socket :type :stream :protocol tcp)) ++; (s2 (make-instance 'inet6-socket :type :stream :protocol tcp))) ++; (unwind-protect ++; ;; Given the functions we've got so far, if you can think of a ++; ;; better way to make sure the bind succeeded than trying it ++; ;; twice, let me know ++; (handler-case ++; (socket-bind s1 address 0) ++; (socket-error () ++; ;; This may mean no IPv6 support, can't fail a test ++; ;; because of that (address-family-not-supported doesn't catch that) ++; t) ++; (:no-error (x) ++; (declare (ignore x)) ++; (handler-case ++; (let ((port (nth-value 1 (socket-name s1)))) ++; (socket-bind s2 address port) ++; nil) ++; (address-in-use-error () t)))) ++; (socket-close s1) ++; (socket-close s2))) ++; ((or address-family-not-supported protocol-not-supported-error) () t)) ++; t) + + #+ipv4-support + (deftest* (simple-sockopt-test) +@@ -244,37 +244,37 @@ + ;;; to look at /etc/syslog.conf or local equivalent to find out where + ;;; the message ended up + +-#-win32 +-(deftest simple-local-client +- (progn +- ;; SunOS (Solaris) and Darwin systems don't have a socket at +- ;; /dev/log. We might also be building in a chroot or +- ;; something, so don't fail this test just because the file is +- ;; unavailable, or if it's a symlink to some weird character +- ;; device. +- (when (block nil +- (handler-bind ((sb-posix:syscall-error +- (lambda (e) +- (declare (ignore e)) +- (return nil)))) +- (sb-posix:s-issock +- (sb-posix::stat-mode (sb-posix:stat "/dev/log"))))) +- (let ((s (make-instance 'local-socket :type :datagram))) +- (format t "Connecting ~A... " s) +- (finish-output) +- (handler-case +- (socket-connect s "/dev/log") +- (sb-bsd-sockets::socket-error () +- (setq s (make-instance 'local-socket :type :stream)) +- (format t "failed~%Retrying with ~A... " s) +- (finish-output) +- (socket-connect s "/dev/log"))) +- (format t "ok.~%") +- (let ((stream (socket-make-stream s :input t :output t :buffering :none))) +- (format stream +- "<7>bsd-sockets: Don't panic. We're testing local-domain client code; this message can safely be ignored")))) +- t) +- t) ++;#-win32 ++;(deftest simple-local-client ++; (progn ++; ;; SunOS (Solaris) and Darwin systems don't have a socket at ++; ;; /dev/log. We might also be building in a chroot or ++; ;; something, so don't fail this test just because the file is ++; ;; unavailable, or if it's a symlink to some weird character ++; ;; device. ++; (when (block nil ++; (handler-bind ((sb-posix:syscall-error ++; (lambda (e) ++; (declare (ignore e)) ++; (return nil)))) ++; (sb-posix:s-issock ++; (sb-posix::stat-mode (sb-posix:stat "/dev/log"))))) ++; (let ((s (make-instance 'local-socket :type :datagram))) ++; (format t "Connecting ~A... " s) ++; (finish-output) ++; (handler-case ++; (socket-connect s "/dev/log") ++; (sb-bsd-sockets::socket-error () ++; (setq s (make-instance 'local-socket :type :stream)) ++; (format t "failed~%Retrying with ~A... " s) ++; (finish-output) ++; (socket-connect s "/dev/log"))) ++; (format t "ok.~%") ++; (let ((stream (socket-make-stream s :input t :output t :buffering :none))) ++; (format stream ++; "<7>bsd-sockets: Don't panic. We're testing local-domain client code; this message can safely be ignored")))) ++; t) ++; t) + + ;;; these require that the internet (or bits of it, at least) is available + +@@ -390,59 +390,59 @@ + (format t "Received ~A bytes from ~A:~A - ~A ~%" + len address port (subseq buf 0 (min 10 len))))))) + +-#+(and ipv4-support sb-thread) +-(deftest interrupt-io +- (let (result +- (sem (sb-thread:make-semaphore))) +- (labels +- ((client (port) +- (setf result +- (let ((s (make-instance 'inet-socket +- :type :stream +- :protocol :tcp))) +- (socket-connect s #(127 0 0 1) port) +- (let ((stream (socket-make-stream s +- :input t +- :output t +- :buffering :none))) +- (handler-case +- (prog1 +- (catch 'stop +- (sb-thread:signal-semaphore sem) +- (read-char stream)) +- (close stream)) +- (error (c) +- c)))))) +- (server () +- (let ((s (make-instance 'inet-socket +- :type :stream +- :protocol :tcp))) +- (setf (sockopt-reuse-address s) t) +- (socket-bind s (make-inet-address "127.0.0.1") 0) +- (socket-listen s 5) +- (multiple-value-bind (* port) +- (socket-name s) +- (let* ((client (sb-thread:make-thread +- (lambda () (client port)))) +- (r (socket-accept s)) +- (stream (socket-make-stream r +- :input t +- :output t +- :buffering :none))) +- (socket-close s) +- (sb-thread:wait-on-semaphore sem) +- (sleep 0.1) +- (sb-thread:interrupt-thread client +- (lambda () (throw 'stop :ok))) +- (unless (sb-ext:wait-for (null (sb-thread::thread-interruptions client)) :timeout 5) +- (setf result :timeout)) +- (write-char #\x stream) +- (close stream) +- (socket-close r) +- (sb-thread:join-thread client :timeout 5)))))) +- (server)) +- result) +- :ok) ++;#+(and ipv4-support sb-thread) ++;(deftest interrupt-io ++; (let (result ++; (sem (sb-thread:make-semaphore))) ++; (labels ++; ((client (port) ++; (setf result ++; (let ((s (make-instance 'inet-socket ++; :type :stream ++; :protocol :tcp))) ++; (socket-connect s #(127 0 0 1) port) ++; (let ((stream (socket-make-stream s ++; :input t ++; :output t ++; :buffering :none))) ++; (handler-case ++; (prog1 ++; (catch 'stop ++; (sb-thread:signal-semaphore sem) ++; (read-char stream)) ++; (close stream)) ++; (error (c) ++; c)))))) ++; (server () ++; (let ((s (make-instance 'inet-socket ++; :type :stream ++; :protocol :tcp))) ++; (setf (sockopt-reuse-address s) t) ++; (socket-bind s (make-inet-address "127.0.0.1") 0) ++; (socket-listen s 5) ++; (multiple-value-bind (* port) ++; (socket-name s) ++; (let* ((client (sb-thread:make-thread ++; (lambda () (client port)))) ++; (r (socket-accept s)) ++; (stream (socket-make-stream r ++; :input t ++; :output t ++; :buffering :none))) ++; (socket-close s) ++; (sb-thread:wait-on-semaphore sem) ++; (sleep 0.1) ++; (sb-thread:interrupt-thread client ++; (lambda () (throw 'stop :ok))) ++; (unless (sb-ext:wait-for (null (sb-thread::thread-interruptions client)) :timeout 5) ++; (setf result :timeout)) ++; (write-char #\x stream) ++; (close stream) ++; (socket-close r) ++; (sb-thread:join-thread client :timeout 5)))))) ++; (server)) ++; result) ++; :ok) + + (defmacro with-client-and-server (((socket-class &rest common-initargs) + (listen-socket-var &rest listen-address) +@@ -505,8 +505,9 @@ + (define-shutdown-test ,(make-name 'shutdown.client.ub8) + client server (unsigned-byte 8) ,direction))))) + +- (define-shutdown-tests :output) +- (define-shutdown-tests :io)) ++; (define-shutdown-tests :output) ++; (define-shutdown-tests :io) ++) + + (defun poor-persons-random-address () + (let ((base (expt 36 8))) diff --git a/dev-lisp/sbcl/files/concurrency-test-2.0.1.patch b/dev-lisp/sbcl/files/concurrency-test-2.0.1.patch new file mode 100644 index 0000000000..e0a36a8b3a --- /dev/null +++ b/dev-lisp/sbcl/files/concurrency-test-2.0.1.patch @@ -0,0 +1,12 @@ +diff -r -U3 sbcl-2.0.1.orig/contrib/sb-concurrency/tests/test-frlock.lisp sbcl-2.0.1/contrib/sb-concurrency/tests/test-frlock.lisp +--- sbcl-2.0.1.orig/contrib/sb-concurrency/tests/test-frlock.lisp 2020-01-27 04:26:30.000000000 +0700 ++++ sbcl-2.0.1/contrib/sb-concurrency/tests/test-frlock.lisp 2020-01-30 21:53:57.750913923 +0700 +@@ -88,7 +88,7 @@ + #+sb-thread + (deftest* (frlock.1) + (handler-case +- (sb-ext:with-timeout 40 ++ (sb-ext:with-timeout 240 + (test-frlocks #+win32 :outer-write-pause #+win32 t )) + (sb-ext:timeout (c) + (error "~A" c))) diff --git a/dev-lisp/sbcl/files/etags-2.1.0.patch b/dev-lisp/sbcl/files/etags-2.1.0.patch new file mode 100644 index 0000000000..8f14e50386 --- /dev/null +++ b/dev-lisp/sbcl/files/etags-2.1.0.patch @@ -0,0 +1,10 @@ +diff -r -U2 sbcl-2.1.0.orig/src/runtime/GNUmakefile sbcl-2.1.0/src/runtime/GNUmakefile +--- sbcl-2.1.0.orig/src/runtime/GNUmakefile 2020-12-29 17:05:25.000000000 +0700 ++++ sbcl-2.1.0/src/runtime/GNUmakefile 2021-01-28 18:02:57.682523052 +0700 +@@ -12,5 +12,5 @@ + .PHONY: all clean TAGS tags targets + +-all: targets tags ++all: targets + TARGET=sbcl + diff --git a/dev-lisp/sbcl/files/sb-posix-test-1.2.15.patch b/dev-lisp/sbcl/files/sb-posix-test-1.2.15.patch new file mode 100644 index 0000000000..517208a791 --- /dev/null +++ b/dev-lisp/sbcl/files/sb-posix-test-1.2.15.patch @@ -0,0 +1,40 @@ +diff -r -U1 sbcl-1.2.15.orig/contrib/sb-posix/posix-tests.lisp sbcl-1.2.15/contrib/sb-posix/posix-tests.lisp +--- sbcl-1.2.15.orig/contrib/sb-posix/posix-tests.lisp 2015-08-31 00:59:03.000000000 +0600 ++++ sbcl-1.2.15/contrib/sb-posix/posix-tests.lisp 2015-09-22 10:19:20.000000000 +0600 +@@ -169,19 +169,19 @@ + +-(deftest rmdir.error.3 +- (handler-case +- (sb-posix:rmdir #-win32 "/" #+win32 (sb-ext:posix-getenv "windir")) +- (sb-posix:syscall-error (c) +- (typep +- (sb-posix:syscall-errno c) +- '(member +- #+(or darwin openbsd) +- #.sb-posix:eisdir +- #+win32 +- #.sb-posix::eacces +- #+win32 +- #.sb-posix::enotempty +- #+sunos +- #.sb-posix::einval +- #-(or darwin openbsd win32 sunos) +- #.sb-posix::ebusy)))) t) ++;(deftest rmdir.error.3 ++; (handler-case ++; (sb-posix:rmdir #-win32 "/" #+win32 (sb-ext:posix-getenv "windir")) ++; (sb-posix:syscall-error (c) ++; (typep ++; (sb-posix:syscall-errno c) ++; '(member ++; #+(or darwin openbsd) ++; #.sb-posix:eisdir ++; #+win32 ++; #.sb-posix::eacces ++; #+win32 ++; #.sb-posix::enotempty ++; #+sunos ++; #.sb-posix::einval ++; #-(or darwin openbsd win32 sunos) ++; #.sb-posix::ebusy)))) t) + diff --git a/dev-lisp/sbcl/files/verbose-build-2.0.3.patch b/dev-lisp/sbcl/files/verbose-build-2.0.3.patch new file mode 100644 index 0000000000..263436ab5e --- /dev/null +++ b/dev-lisp/sbcl/files/verbose-build-2.0.3.patch @@ -0,0 +1,29 @@ +diff -U3 -r sbcl-2.0.3.orig/make.sh sbcl-2.0.3/make.sh +--- sbcl-2.0.3.orig/make.sh 2020-03-29 03:58:29.000000000 +0700 ++++ sbcl-2.0.3/make.sh 2020-04-04 19:56:16.510279232 +0700 +@@ -24,7 +24,7 @@ + # thing" when run on the target machine, with the minor caveat that + # any --xc-host parameter should be suitable for the host machine + # instead of the target. +-sh make-config.sh "$@" --check-host-lisp || exit $? ++sh -x make-config.sh "$@" --check-host-lisp || exit $? + + . output/prefix.def + . output/build-config +@@ -76,11 +76,11 @@ + $@ + fi + } +-maybetime sh make-host-1.sh +-maybetime sh make-target-1.sh +-maybetime sh make-host-2.sh +-maybetime sh make-target-2.sh +-maybetime sh make-target-contrib.sh ++maybetime sh -x make-host-1.sh ++maybetime sh -x make-target-1.sh ++maybetime sh -x make-host-2.sh ++maybetime sh -x make-target-2.sh ++maybetime sh -x make-target-contrib.sh + + # contrib/Makefile shouldn't be counted in NCONTRIBS. + # "find contrib/* -name Makefile" would still find contrib/./Makefile. diff --git a/dev-lisp/sbcl/sbcl-2.2.6.ebuild b/dev-lisp/sbcl/sbcl-2.2.6.ebuild new file mode 100644 index 0000000000..eacbcd1cc6 --- /dev/null +++ b/dev-lisp/sbcl/sbcl-2.2.6.ebuild @@ -0,0 +1,240 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit multilib flag-o-matic pax-utils toolchain-funcs + +#same order as http://www.sbcl.org/platform-table.html +BV_X86=1.4.3 +BV_AMD64=2.2.5 +BV_PPC=1.2.7 +BV_PPC64LE=1.5.8 +BV_SPARC=1.0.28 +BV_ALPHA=1.0.28 +BV_ARM=1.4.11 +BV_ARM64=1.4.2 +BV_X64_MACOS=1.2.11 +BV_PPC_MACOS=1.0.47 +BV_X86_SOLARIS=1.2.7 +BV_X64_SOLARIS=1.2.7 +BV_SPARC_SOLARIS=1.0.23 + +DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp" +HOMEPAGE="http://sbcl.sourceforge.net/" +SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2 + x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 ) + amd64? ( mirror://sourceforge/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 ) + ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2 ) + ppc64? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC64LE}-ppc64le-linux-binary.tar.bz2 ) + sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 ) + alpha? ( mirror://sourceforge/sbcl/${PN}-${BV_ALPHA}-alpha-linux-binary.tar.bz2 ) + arm? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM}-armhf-linux-binary.tar.bz2 ) + arm64? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM64}-arm64-linux-binary.tar.bz2 ) + x64-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_MACOS}-x86-64-darwin-binary.tar.bz2 ) + ppc-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC_MACOS}-powerpc-darwin-binary.tar.bz2 ) + x86-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_SOLARIS}-x86-solaris-binary.tar.bz2 ) + x64-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_SOLARIS}-x86-64-solaris-binary.tar.bz2 ) + sparc-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC_SOLARIS}-sparc-solaris-binary.tar.bz2 )" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris" +IUSE="debug doc source +threads +unicode zlib" + +CDEPEND=">=dev-lisp/asdf-3.3:=" +BDEPEND="${CDEPEND} + doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )" +RDEPEND="${CDEPEND} + !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )" + +# Disable warnings about executable stacks, as this won't be fixed soon by upstream +QA_EXECSTACK="usr/bin/sbcl" + +CONFIG="${S}/customize-target-features.lisp" +ENVD="${T}/50sbcl" + +# Prevent ASDF from using the system libraries +CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" +ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" + +usep() { + use ${1} && echo "true" || echo "false" +} + +sbcl_feature() { + echo "$( [[ ${1} == "true" ]] && echo "(enable ${2})" || echo "(disable ${2})")" >> "${CONFIG}" +} + +sbcl_apply_features() { + sed 's/^X//' > "${CONFIG}" <<-'EOF' + (lambda (list) + X (flet ((enable (x) (pushnew x list)) + X (disable (x) (setf list (remove x list)))) + EOF + if use x86 || use amd64; then + sbcl_feature "$(usep threads)" ":sb-thread" + fi + sbcl_feature "true" ":sb-ldb" + sbcl_feature "false" ":sb-test" + sbcl_feature "$(usep unicode)" ":sb-unicode" + sbcl_feature "$(usep zlib)" ":sb-core-compression" + sbcl_feature "$(usep debug)" ":sb-xref-for-internals" + sed 's/^X//' >> "${CONFIG}" <<-'EOF' + X ) + X list) + EOF + cat "${CONFIG}" +} + +src_unpack() { + unpack ${A} + mv sbcl-*-* sbcl-binary || die + cd "${S}" +} + +src_prepare() { + # bug #468482 + eapply "${FILESDIR}"/concurrency-test-2.0.1.patch + # bugs #486552, #527666, #517004 + eapply "${FILESDIR}"/bsd-sockets-test-2.0.5.patch + # bugs #560276, #561018 + eapply "${FILESDIR}"/sb-posix-test-1.2.15.patch + # bug #767742 + eapply "${FILESDIR}"/etags-2.1.0.patch + + eapply "${FILESDIR}"/verbose-build-2.0.3.patch + + eapply_user + + # Make sure the *FLAGS variables are sane. + # sbcl needs symbols in resulting binaries, so building with the -s linker flag will fail. + strip-unsupported-flags + filter-flags -fomit-frame-pointer -Wl,-s + filter-ldflags -s + + # original bugs #526194, #620532 + # this broke no-pie default builds, c.f. bug #632670 + # Pass CFLAGS down by appending our value, to let users override + # the default values. + # Keep passing LDFLAGS down via the LINKFLAGS variable. + sed -e "s@\(CFLAGS += -g .*\)\$@\1 ${CFLAGS}@" \ + -e "s@LINKFLAGS += -g\$@LINKFLAGS += ${LDFLAGS}@" \ + -i src/runtime/GNUmakefile || die + + sed -e "s@SBCL_PREFIX=\"/usr/local\"@SBCL_PREFIX=\"${EPREFIX}/usr\"@" \ + -i make-config.sh || die + + # Use installed ASDF version + cp "${EPREFIX}"/usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die + # Avoid installation of ASDF info page. See bug #605752 + sed '/INFOFILES/s/asdf.info//' -i doc/manual/Makefile || die + + use source && sed 's%"$(BUILD_ROOT)%$(MODULE).lisp "$(BUILD_ROOT)%' -i contrib/vanilla-module.mk + + # Some shells(such as dash) don't have "time" as builtin + # and we don't want to DEPEND on sys-process/time + sed "s,^time ,," -i make.sh || die + sed "s,/lib,/$(get_libdir),g" -i install.sh || die + # #define SBCL_HOME ... + sed "s,/usr/local/lib,${EPREFIX}/usr/$(get_libdir),g" -i src/runtime/runtime.c || die + # change location of /etc/sbclrc ... + sed "s,/etc/sbclrc,${EPREFIX}/etc/sbclrc,g" -i src/code/toplevel.lisp || die + + find . -type f -name .cvsignore -delete +} + +src_configure() { + # customizing SBCL version as per + # http://sbcl.cvs.sourceforge.net/sbcl/sbcl/doc/PACKAGING-SBCL.txt?view=markup + echo -e ";;; Auto-generated by Gentoo\n\"gentoo-${PR}\"" > branch-version.lisp-expr + + # applying customizations + sbcl_apply_features +} + +src_compile() { + local bindir="${WORKDIR}"/sbcl-binary + + # clear the environment to get rid of non-ASCII strings, see bug #174702 + # set HOME for paludis + env - HOME="${T}" PATH="${PATH}" \ + CC="$(tc-getCC)" AS="$(tc-getAS)" LD="$(tc-getLD)" \ + CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" ASFLAGS="${ASFLAGS}" LDFLAGS="${LDFLAGS}" \ + GNUMAKE=make ./make.sh \ + "sh ${bindir}/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger" \ + || die "make failed" + + # need to set HOME because libpango(used by graphviz) complains about it + if use doc; then + env - HOME="${T}" PATH="${PATH}" \ + CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \ + ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \ + make -C doc/manual info html || die "Cannot build manual" + env - HOME="${T}" PATH="${PATH}" \ + CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \ + ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \ + make -C doc/internals info html || die "Cannot build internal docs" + fi +} + +src_test() { + ewarn "Unfortunately, it is known that some tests fail eg." + ewarn "run-program.impure.lisp. This is an issue of the upstream's" + ewarn "development and not of Gentoo's side. Please, before filing" + ewarn "any bug(s) search for older submissions. Thank you." + time ( cd tests && sh run-tests.sh ) +} + +src_install() { + # install system-wide initfile + dodir /etc/ + sed 's/^X//' > "${ED}"/etc/sbclrc <<-EOF + ;;; The following is required if you want source location functions to + ;;; work in SLIME, for example. + X + (setf (logical-pathname-translations "SYS") + X '(("SYS:SRC;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/src/**/*.*") + X ("SYS:CONTRIB;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/**/*.*"))) + X + ;;; Setup ASDF2 + (load "${EPREFIX}/etc/common-lisp/gentoo-init.lisp") + EOF + + # Install documentation + unset SBCL_HOME + INSTALL_ROOT="${ED}/usr" LIB_DIR="${EPREFIX}/usr/$(get_libdir)" DOC_DIR="${ED}/usr/share/doc/${PF}" \ + sh install.sh || die "install.sh failed" + + # bug #517008 + pax-mark -mr "${D}"/usr/bin/sbcl + + # rm empty directories lest paludis complain about this + find "${ED}" -empty -type d -exec rmdir -v {} + + + if use doc; then + dodoc -r doc/internals/sbcl-internals + + doinfo doc/manual/*.info* + doinfo doc/internals/sbcl-internals.info + + docinto internals-notes + dodoc doc/internals-notes/* + else + rm -Rv "${ED}/usr/share/doc/${PF}" || die + fi + + # install the SBCL source + if use source; then + ./clean.sh + cp -av src "${ED}/usr/$(get_libdir)/sbcl/" || die + for d in contrib/*/; do + cp -av "$d" "${ED}/usr/$(get_libdir)/sbcl/" || die + done + fi + + # necessary for running newly-saved images + echo "SBCL_HOME=${EPREFIX}/usr/$(get_libdir)/${PN}" > "${ENVD}" + echo "SBCL_SOURCE_ROOT=${EPREFIX}/usr/$(get_libdir)/${PN}/src" >> "${ENVD}" + doenvd "${ENVD}" +} diff --git a/dev-lisp/uiop/Manifest b/dev-lisp/uiop/Manifest index ecbc9c2ccc..aebb9d447c 100644 --- a/dev-lisp/uiop/Manifest +++ b/dev-lisp/uiop/Manifest @@ -1 +1 @@ -DIST asdf-3.3.5.3.tar.gz 521876 BLAKE2B ccd0fd5796160090c394bd856f817fb5b73cbff60c589d2961b8f132a747ece2892f7cbbf22e26eda1f88402cc0dc0620b2164d81fc34a65f04f7c3862331df9 SHA512 34430ba3c7424e1d5e34f231d27c1a983555f237c83a07a6ddcf13d512c1a5346448db3fc982e7692fb273a6e51c2631acb39d3933afb5025bcf543dd0f8cd62 +DIST asdf-3.3.5.9.tar.gz 525933 BLAKE2B 8181e91644564919aa401c1ab9f48b2bb60a210e56e6f43b692b34023974d9bc446553db0b3b3d8a34252910f87c01283d546d27a4799c3efe2069ccec5726b2 SHA512 e1eed89a8f82b2dbe84648a8b4bc8f754c438cce007a61c1e8f2c1e5b8a59bad5788d65f0ecf89c7221e784ac81178247d60c66e7cf9c22ca3943bad6db9dc5e diff --git a/dev-lisp/uiop/uiop-3.3.5.3.ebuild b/dev-lisp/uiop/uiop-3.3.5.9.ebuild similarity index 100% rename from dev-lisp/uiop/uiop-3.3.5.3.ebuild rename to dev-lisp/uiop/uiop-3.3.5.9.ebuild diff --git a/dev-util/re2c/Manifest b/dev-util/re2c/Manifest new file mode 100644 index 0000000000..bd35923c63 --- /dev/null +++ b/dev-util/re2c/Manifest @@ -0,0 +1 @@ +DIST re2c-3.0.tar.xz 1441456 BLAKE2B d554eaf068e906555ec631d27d4a42521ff9f4ea49b896402d9f1b9233cbe4fea22f89816cebe0c9492326107b604e481512836b308dbfe430836e5d0831d7c4 SHA512 147f5d2be36cbfe014cd0089297b4994ee95ed3179dec3c84222555636d937e2bdd22373a648efe59decf6810ce1d9d89d96908761a19aed848fa4185a3ca4cb diff --git a/dev-util/re2c/files/re2c-2.1.1-sh.patch b/dev-util/re2c/files/re2c-2.1.1-sh.patch new file mode 100644 index 0000000000..7caa5d7d1a --- /dev/null +++ b/dev-util/re2c/files/re2c-2.1.1-sh.patch @@ -0,0 +1,48 @@ +Matt noticed errors when running ./configure on dash: + ./configure: 5339: test: x: unexpected operator + ./configure: 5386: test: x: unexpected operator + +The change is to use POSIX '=' comparison instead of bash-specific ==. + +Patch-by: Matt Whitlock +https://bugs.gentoo.org/779187 +--- a/configure.ac 2021-03-27 18:25:24.000000000 +0000 ++++ b/configure.ac 2021-03-30 01:34:01.993467424 +0000 +@@ -65,7 +65,7 @@ + # --enable-benchmarks + AC_ARG_ENABLE([benchmarks], [AS_HELP_STRING([--enable-benchmarks], + [build benchmarks])]) +-AM_CONDITIONAL([WITH_BENCHMARKS], [test "x$enable_benchmarks" == "xyes"]) ++AM_CONDITIONAL([WITH_BENCHMARKS], [test "x$enable_benchmarks" = "xyes"]) + AM_COND_IF([WITH_BENCHMARKS], [ + AC_LANG_PUSH([C++]) + AC_CHECK_HEADERS([benchmark/benchmark.h], [], +@@ -79,7 +79,7 @@ + [AS_HELP_STRING([--enable-benchmarks-regenerate], + [regenerate C code for benchmarks])]) + AM_CONDITIONAL([REGEN_BENCHMARKS], +- [test "x$enable_benchmarks_regenerate" == "xyes"]) ++ [test "x$enable_benchmarks_regenerate" = "xyes"]) + + + # checks for programs +--- a/configure ++++ b/configure +@@ -5336,7 +5336,7 @@ if test "${enable_benchmarks+set}" = set; then : + enableval=$enable_benchmarks; + fi + +- if test "x$enable_benchmarks" == "xyes"; then ++ if test "x$enable_benchmarks" = "xyes"; then + WITH_BENCHMARKS_TRUE= + WITH_BENCHMARKS_FALSE='#' + else +@@ -5383,7 +5383,7 @@ if test "${enable_benchmarks_regenerate+set}" = set; then : + enableval=$enable_benchmarks_regenerate; + fi + +- if test "x$enable_benchmarks_regenerate" == "xyes"; then ++ if test "x$enable_benchmarks_regenerate" = "xyes"; then + REGEN_BENCHMARKS_TRUE= + REGEN_BENCHMARKS_FALSE='#' + else diff --git a/dev-util/re2c/re2c-3.0.ebuild b/dev-util/re2c/re2c-3.0.ebuild new file mode 100644 index 0000000000..077c3ee997 --- /dev/null +++ b/dev-util/re2c/re2c-3.0.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8,9,10} ) + +inherit python-any-r1 + +DESCRIPTION="Tool for generating C-based recognizers from regular expressions" +HOMEPAGE="https://re2c.org/" +SRC_URI="https://github.com/skvadrik/re2c/releases/download/${PV}/${P}.tar.xz" + +LICENSE="public-domain" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="debug test" + +RESTRICT="!test? ( test )" + +# python is used only as a test driver +BDEPEND="test? ( ${PYTHON_DEPS} )" + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_configure() { + econf \ + --enable-golang \ + ac_cv_path_BISON="no" \ + $(use_enable debug) +} + +src_install() { + default + + docompress -x /usr/share/doc/${PF}/examples + dodoc -r README.md CHANGELOG examples +} diff --git a/sci-libs/pytorch/Manifest b/sci-libs/pytorch/Manifest deleted file mode 100644 index 7eab7e817b..0000000000 --- a/sci-libs/pytorch/Manifest +++ /dev/null @@ -1,40 +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-8b35b4cf.tar.gz 715504 BLAKE2B be2f95ef647f2261303ad3a67c08ae2fa933865ad4becc06b290042dd05e77cdb6552af51a2fd9d8b2bd1719964609847852d53598f07284a51e8d46d158f3ec SHA512 e8bb14d7317b28d4d154011ec389ca39eec2b40f63be3506e2040406d2331048e849ed7180e3716b5396545a8ce9587917e832aec2f881e431c878e12341107f -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-ed8b86a2.tar.gz 3495621 BLAKE2B 09fdfa4722ed34f43142980dbd67db80f0b09bebc850a2553fd94607183c613b25eafc5fc1004f86494117970f609777b36e0b903ee217be805303f0b6051fe5 SHA512 d0d45ecd22da21b2d176d4ff4200f7598296c64555812c26439f8610038dcd791458978de885e41deb7a88076789ae2bd5ade09ed81162eff9e9fb37fa313ed3 -DIST cub-d106ddb991a56c3df1b6d51b2409e36ba8181ce4.tar.gz 398104 BLAKE2B 287f020189be877c7a9e667bdfb591da14046199b7336074040c3301d69110c8408d89a72cdcd74d8519deb200ec61823a6d2160d4ecbd00002338651dbf312e SHA512 8d65c0407448125378495190ee2a2c0e3b27a3577efbd6bb5aa8ad76f5bf2bf17becdc6ef931672a4d16b033fd7c0a199bb60e62b0b2b311e5f59c4136f55835 -DIST fbgemm-1280f817bf89153ed51642ff47b22955228f0050.tar.gz 535146 BLAKE2B 8e2c6f24582ecab4b121acaa6d7d1bb7ae16a00406113f49ee4abe728710562ab8fffd3ef4b47c77981ef8bd3fd87ce36535559d03279434a3fda19d70490d32 SHA512 d9bacc6400c5fafb008d930c1cbe53500c4ed57a34b9efd51901052fd4bed2d8c86ea8183ebeb3503a7d1bfc70176ce391b0d4b5a81cd5bdad3a44818dd65fce -DIST flatbuffers-d0cede9c90c5257537c293517a21376408b549fa.tar.gz 1673666 BLAKE2B 3f3d77bf33fafed44d6afc48e24de8e6d7c97944f4ff4342abf3d988762160e0278dbef3a61c180871227ca4ab2539ce47ad3e851d12d84c962e3e82a539901b SHA512 d575d2881532eb43c766195082cd2614cff4d3a5f9fbb628da013cf672d654eb55ca2d807e4ba690a6ee0ddf9ee922f797c3871568eba75dadb6d7a2cae4662b -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-2fe3bd99.tar.gz 993527 BLAKE2B fa631eadc310607dbe19cec6d66d8fb1c5e99e2dfc5031fff26f8c12c951d7798ad2062edf21589020cafc821bfe4b5e89310ee4e85f45d7d7fcd435ddd5eef9 SHA512 130182d2c1067bcd263fb27999c164d240f5d06d837475e71e7cadbf65c7211de00154dc1e15deae0b6ec2963799e55c0c21ee971e1c588064c5063e69a2bf1e -DIST googletest-5ec7f0c4.tar.gz 961649 BLAKE2B 2c518a4006e7a9decff3d4b81c30a910c01f6bf2a71593da25f6e74d5117cbf56de486078a3caf6be255df473fc1c2a04de5317cf882396114be0625d67d041b SHA512 623b077b3334958fafcbc34aa85891883277994af33be530efd903f47738a3e3562001cbf3b6da1a5e7d03803c5bd51bcc1fab81490db85d5a4f2b15e7de1495 -DIST googletest-cbf019de.tar.gz 906551 BLAKE2B 2ebadb05660c57a80aba9df2ec1149c18ee0c208503bc59b0e49d3ad3251a8effed3b61a0ca1984d4da235f59d93caa0dcd7101393bd16feee813238b6a2de24 SHA512 d5fd0c4500b33bd67186aa4353fc2ab955971c4115e4604621f6cfbaa79c75d28c1281e800d3a870ee5484d7f8e87ab71cd2235d3f28a1aaf66b6502740103cc -DIST googletest-e2239ee6043f73722e7aa812a459f54a28552929.tar.gz 887296 BLAKE2B 8f29b7028a6dd8190a113cd93398705b23b61d88bee38beaf9dcc0dfc8a463aed7fcd3719f6f1b131d4363aa57231629aaeffa108f6558efb58416cfface6d6e SHA512 cf9e7f3fd3e31ce6677eac355fb8bfe19c5b56a8ec3af8b9417d0904cdf5da92f99f7411a08131cc9fa4fc7d38e6a71fcfac993648e47b269a74a27de7607f7a -DIST ideep-4a56ab2c3f61c44e0f8ea241beeb732b7d70dc5b.tar.gz 36564 BLAKE2B 32154ce515d1250967e98103927856108c1498165c23b0ab0983f6af8fcc2e360e667f231e886a8578133ed7a6953b05e8467a82756bc420b02abde283572065 SHA512 3e99f865357e67c61a9932a95c5c89e4edb944f9646915949d84b36d353f69d7c7ad0b732cb051339df5a610c16ec53f24f89c17999bfbf28d4d8239e57cff0e -DIST kineto-b5bb62d25be75c381dbbd975276602f021982ef2.tar.gz 7483779 BLAKE2B 574feeeb62dd02f75322f90b1f99d0998b3f6dfea5353951e39c02ebf00919ad0ab039effb398fda38b89d139a51fc08d9ec21f9f5c0d78f96b07a75e2191e70 SHA512 298c3024f540ec97e06f1c666a50d66271f70093559dceb35deaf1f7149fa69aeae1417f3e05de2f3cc8b6af9f0d0acf82dd9b3fbf80cd01f3061f5f726bb063 -DIST libnop-aa95422e.tar.gz 124202 BLAKE2B 5a74ecbf473dba09db1a11172a4aa432d81b14adb3826bef9aa8bae1bf1e2d0d5a7bf775fd4343fa9d7b235b17cafe949e47c903e92fd5eae9cc0717a552ea45 SHA512 62b21be874d2117294925c2497394d166da43d534776764c9c124699b5799d99790a2c6420804f8e143e1a18a536106852082f3a9d0052a726abc624fc19f937 -DIST libuv-1dff88e5.tar.gz 1281433 BLAKE2B 98be4aae15df24187c3a3eb9e09260d0c94a92a5c875d49728045cd873755f08703f6b893dfdb19609c7c7889bf9083516d04cf9966f871d989233a14b824372 SHA512 c98b1c0b79ab87fcb49b9b7e69274d2f88318f58ec6403a75126ebda048a1f5c8bb28ed382996a0fd79f38a2f4b726e1bf6bc76a59339b5e80f2d32d9e42dc53 -DIST linux-syscall-support-e1e7b0ad.tar.gz 38399 BLAKE2B 6646858cde85b62664d157c9af9697f41c432fc97e4492b8159718c15c00de2b6441341648c5925d6d1a987cc6dee942382abaeebbae3b850a683dd42b5d648e SHA512 79b0deb923d69b34cbb239bfda9c36635b27f67eca0e2112967fa72a4d8235e0232dae3782eebf8a61e109503eac50e962bcbdd10b32e8ad8ddaf87ea953f66b -DIST mkl-dnn-5ef631a0.tar.gz 5799312 BLAKE2B ea2aafcf45adadb0546781b00b44a0e9712c28e4937ef4daeef8b910e76bbb152e5434e45bec2aae0f6cb86fd7b5098e61842d7e99258db6fa846a79996d2e23 SHA512 66df9ea574010616df46d85ef25d23bd9ed31f9719cdbec4c727de58728fe095cd412d7663c2d456dba2f26848e45c1d67e34bffe4e25beeef9c1d40f187e8d6 -DIST nccl-033d7995.tar.gz 146624 BLAKE2B b6f15d5d4690a5cbcf882c10826def400a14c58ff5f5af276b5b9a615a567de36ca907120cc681cdf2f2eb207f22bc87ee87d145a365097a64fb3d9de82432fb SHA512 3b3e087cb729b10e3251dfef52196bddd33e3e777df289c5fc537e99473e78f8720255fbd3e14ae2d2a6126d1e9d59aa6d57d7c7958d919e65834fef92c1c835 -DIST onnx-765f5ee8.tar.gz 2379139 BLAKE2B 3e3299e2f3c1184937820b137d5fb492abe216ae3a054f4a17c6cb037168f4a77d8c90db0ba657ba9c9f7af2099f71ae0b8658a573c9f2f6d29fbc9d5f0f1b8a SHA512 7e10717546d1ed0bab780768e907f957294bfda47748b4c7576b75a761f5e006fdd21f0b014ce6d761a0ac6ae59dd8bc71592785b67167a6b3692d1a56dbbda9 -DIST onnx-85546f8c44e627f8ff1181725d03cc49f675e44f.tar.gz 9438727 BLAKE2B d7d2d3299eebf9aeeb6c531cbf7143e35db953573a471ccff9a9937c58407fee5545d3051014edd1ca41d6dcc8a2bfc832c0c550b6c417c3470149fd0d25642d SHA512 4fc237ffd3e225c07796031db79f151d3e9326465880b29b29090863a57805a4b658fac9f6ff5f5fa9627dad75590be26da7cba51f12345d783c174fc250ef01 -DIST onnx-tensorrt-c153211418a7c57ce071d9ce2a41f8d1c85a878f.tar.gz 72464 BLAKE2B 45301706ca5c91c39e24db84e1dc4e968a8540b760d7b16df08f3a76c407dfceb38962520d822b84618be088fc3d69431f738a8bc7b0f578c84f35234061e99a SHA512 9e814b5dfc3a65ddba229bbddada4c686afab233463329a02cea176b6b1994643f9835ce44a84a9ac1a49e12a7fe2325fd6cd9d2d99a422284089df0202a69a5 -DIST pocketfft-ea778e37710c07723435b1be58235996d1d43a5a.tar.gz 26697 BLAKE2B eea8461cbcdc4bb55ccddca524e0b3f1a58ec4faea93b2f1f3595dae53d84bf4c0c3aa2997d2ee54a10dd2567fee7034304ae39e6686d2677709e36e0a1b4078 SHA512 0c745dfbe98be3a8d4a6585e63fab2742f36761057dfa6c2e996fffdeeb55ca6544f7b36f357eda23ea818e26aba4555a7b4ff7d55d78b5395e6c8c06a50c145 -DIST psimd-072586a71b55b7f8c584153d223e95687148a90.tar.gz 6825 BLAKE2B db255d2a62ffa320b1e190a7a9ac923d812e918a72ce8ecfeeb926709ece92d05497430196b0fc833d910b9d24bf0140d20bcce1de695e1c39211158440608db SHA512 a18faea093423dd9fe19ece8b228e011dccce0a2a22222f777ea19b023a13173966d4a8aea01147e8fc58de5d39cffcedeb2221a1572ae52bd5aba1295f86a94 -DIST pthreadpool-a134dd5d4cee80cce15db81a72e7f929d71dd413.tar.gz 49011 BLAKE2B 7bfbca81321243e64aa53c668dfe380ce4f7b88477a1c794a4dea9062c9b0969ca745dbfe0abbb95fffbf44080763506609c387ed085d89f6c612be6804b5cc2 SHA512 5f5a1275bbcef13cea88e381010bf2654c9646d30c5fb061f1d6e9e9a0ae6398e137c5e4f7da69f7d8d8b58fb5a7e79f7a4c0c1c3bbaad8f3d0c896d21bc7691 -DIST pytorch-1.11.0.tar.gz 20719323 BLAKE2B 24e7aaa2c26821d36f8092542de9d8d5ac85a619fb9fffb5131987958842afb1cad395780662d15f3411a7cc6ff83a445871960eca1e469fcbf0b9895d83d6e0 SHA512 2342eb7a1a241f5855a7cf12e11f62bc4baaa78d1d0864e53bfc946e783eb4addd05ca154a814d2376cd602098b5547e61c158d6eddb7cad5a9f3b0c1357adca -DIST sleef-e0a003ee838b75d11763aa9c3ef17bf71a725bff.tar.gz 1642070 BLAKE2B 366fa96e35f429199e8462c63bc9cfbd1888aa65170d3203a5b0391fb855c29241eb225f847e416650e6ed5544f17a745c5a43a622a2847416ad7bd207572840 SHA512 13ea28745e796f8b77a40c99f679e0955e213128fb05d17b61cdcef102b7a758cbda04def3544767a81ddf170b7800f168d25fb1b55093614c7126456765cbea -DIST tensorpipe-52791a2fd214b2a9dc5759d36725909c1daa7f2e.tar.gz 259691 BLAKE2B 9fe9436ba8c76be874f21da4c63942b61ae41e2103d49631cd675cbb03902843042fc236be9c95c33ee0d04f07f0b01696b84221a7bbda683166267bccf60913 SHA512 1e5faf17a7236c5506c08cb28be16069b11bb929bbca64ed9745ce4277d46739186ab7d6597da7437d90ed2d166d4c37ef2f3bceabe8083ef3adbb0e8e5f227e 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 de9fe9a0df..0000000000 --- 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 16d2c1f2e7..0000000000 --- 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 f71ba17bc1..0000000000 --- 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 c8f57d9e69..0000000000 --- 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 $ 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 $ 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 324b8f6829..0000000000 --- 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 49835d2013..0000000000 --- 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(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( - 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/pytorch-1.2.0-setup.patch b/sci-libs/pytorch/files/pytorch-1.2.0-setup.patch deleted file mode 100644 index 85e796a60d..0000000000 --- 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 165e79dd4e..0000000000 --- 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 3682469d7e..0000000000 --- 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 222a0f73e9..0000000000 --- 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 $) -+ target_include_directories(${test_name} PRIVATE $) - target_include_directories(${test_name} PRIVATE ${Caffe2_CPU_INCLUDE}) - add_test(NAME ${test_name} COMMAND $) - 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 1e9388ff17..0000000000 --- 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-skip-tests.patch b/sci-libs/pytorch/files/pytorch-1.6.0-skip-tests.patch deleted file mode 100644 index 3ef2c533f2..0000000000 --- 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.7.1-no-rpath.patch b/sci-libs/pytorch/files/pytorch-1.7.1-no-rpath.patch deleted file mode 100644 index eabda092ec..0000000000 --- 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 28db5692c9..0000000000 --- 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 960ae3618c..0000000000 --- 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 44b27cac31..0000000000 --- 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-global-dlopen.patch b/sci-libs/pytorch/files/pytorch-1.9.0-global-dlopen.patch deleted file mode 100644 index 0525c9392b..0000000000 --- a/sci-libs/pytorch/files/pytorch-1.9.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.9.0/torch/__init__.py -=================================================================== ---- pytorch-1.9.0.orig/torch/__init__.py -+++ pytorch-1.9.0/torch/__init__.py -@@ -146,7 +146,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/pytorch-1.11.0.ebuild b/sci-libs/pytorch/pytorch-1.11.0.ebuild deleted file mode 100644 index 5e0774a9cd..0000000000 --- a/sci-libs/pytorch/pytorch-1.11.0.ebuild +++ /dev/null @@ -1,333 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) - -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/driazati/breakpad/archive/edbb99f95c75be27d038fffb1d969cdacf705db2.tar.gz -> breakpad-edbb99f95c75be27d038fffb1d969cdacf705db2.tar.gz -https://github.com/pytorch/cpuinfo/archive/ed8b86a2.tar.gz -> cpuinfo-ed8b86a2.tar.gz -https://github.com/NVlabs/cub/archive/d106ddb991a56c3df1b6d51b2409e36ba8181ce4.tar.gz -> cub-d106ddb991a56c3df1b6d51b2409e36ba8181ce4.tar.gz -https://github.com/pytorch/fbgemm/archive/1280f817bf89153ed51642ff47b22955228f0050.tar.gz -> fbgemm-1280f817bf89153ed51642ff47b22955228f0050.tar.gz -https://github.com/google/flatbuffers/archive/d0cede9c90c5257537c293517a21376408b549fa.tar.gz -> flatbuffers-d0cede9c90c5257537c293517a21376408b549fa.tar.gz -https://github.com/asmjit/asmjit/archive/8b35b4cf.tar.gz -> asmjit-8b35b4cf.tar.gz -https://github.com/pytorch/cpuinfo/archive/5916273f79a21551890fd3d56fc5375a78d1598d.tar.gz -> cpuinfo-5916273f79a21551890fd3d56fc5375a78d1598d.tar.gz -https://github.com/google/googletest/archive/cbf019de.tar.gz -> googletest-cbf019de.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/4a56ab2c3f61c44e0f8ea241beeb732b7d70dc5b.tar.gz -> ideep-4a56ab2c3f61c44e0f8ea241beeb732b7d70dc5b.tar.gz -https://github.com/intel/mkl-dnn/archive/5ef631a0.tar.gz -> mkl-dnn-5ef631a0.tar.gz -cuda? ( https://github.com/NVIDIA/nccl/archive/033d7995.tar.gz -> nccl-033d7995.tar.gz ) -https://github.com/kaiostech/linux-syscall-support/archive/e1e7b0ad.tar.gz -> linux-syscall-support-e1e7b0ad.tar.gz -https://github.com/Maratyszcza/NNPACK/archive/c07e3a0400713d546e0dea2d5466dd22ea389c73.tar.gz -> NNPACK-c07e3a0400713d546e0dea2d5466dd22ea389c73.tar.gz -https://github.com/onnx/onnx/archive/765f5ee8.tar.gz -> onnx-765f5ee8.tar.gz -https://github.com/onnx/onnx-tensorrt/archive/c153211418a7c57ce071d9ce2a41f8d1c85a878f.tar.gz -> onnx-tensorrt-c153211418a7c57ce071d9ce2a41f8d1c85a878f.tar.gz -https://github.com/mreineck/pocketfft/archive/ea778e37710c07723435b1be58235996d1d43a5a.tar.gz -> pocketfft-ea778e37710c07723435b1be58235996d1d43a5a.tar.gz -https://github.com/onnx/onnx/archive/85546f8c44e627f8ff1181725d03cc49f675e44f.tar.gz -> onnx-85546f8c44e627f8ff1181725d03cc49f675e44f.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/52791a2fd214b2a9dc5759d36725909c1daa7f2e.tar.gz -> tensorpipe-52791a2fd214b2a9dc5759d36725909c1daa7f2e.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/1dff88e5.tar.gz -> libuv-1dff88e5.tar.gz -https://github.com/google/XNNPACK/archive/79cd5f9e18ad0925ac9a050b00ea5a36230072db.tar.gz -> XNNPACK-79cd5f9e18ad0925ac9a050b00ea5a36230072db.tar.gz -https://github.com/pytorch/kineto/archive/b5bb62d25be75c381dbbd975276602f021982ef2.tar.gz -> kineto-b5bb62d25be75c381dbbd975276602f021982ef2.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 test tools zeromq" -RESTRICT="!test? ( test )" -REQUIRED_USE=" - ?? ( cuda rocm ) -" - -RDEPEND=" - dev-python/pyyaml[${PYTHON_USEDEP}] - blas? ( virtual/blas ) - cuda? ( dev-libs/cudnn - dev-cpp/eigen[cuda] ) - rocm? ( >=dev-util/hip-4.0.0-r1 - >=dev-libs/rccl-4 - >=sci-libs/rocThrust-4 - >=sci-libs/hipCUB-4 - >=sci-libs/rocPRIM-4 - >=sci-libs/miopen-4 - >=sci-libs/rocBLAS-4 - >=sci-libs/rocRAND-4 - >=sci-libs/hipSPARSE-4 - >=sci-libs/rocFFT-4 - >=dev-util/roctracer-4 ) - ffmpeg? ( media-video/ffmpeg ) - gflags? ( dev-cpp/gflags ) - glog? ( dev-cpp/glog ) - leveldb? ( dev-libs/leveldb ) - lmdb? ( dev-db/lmdb ) - mpi? ( virtual/mpi ) - opencl? ( dev-libs/clhpp virtual/opencl ) - opencv? ( media-libs/opencv ) - python? ( ${PYTHON_DEPS} - dev-python/pybind11[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/protobuf-python - ) - 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} - test? ( dev-python/pytest[${PYTHON_USEDEP}] ) - dev-cpp/tbb - app-arch/zstd - dev-python/pybind11[${PYTHON_USEDEP}] - dev-python/typing-extensions[${PYTHON_USEDEP}] - sys-process/numactl -" - -PATCHES=( - "${FILESDIR}"/${PN}-1.6.0-skip-tests.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 -) - -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/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 - 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-1280f817bf89153ed51642ff47b22955228f0050 third_party/fbgemm || die - rmdir third_party/flatbuffers || die - ln -sv "${WORKDIR}"/flatbuffers-d0cede9c90c5257537c293517a21376408b549fa third_party/flatbuffers || die - rmdir third_party/fbgemm/third_party/asmjit || die - ln -sv "${WORKDIR}"/asmjit-8b35b4cffb62ecb58a903bf91cb7537d7a672211 third_party/fbgemm/third_party/asmjit || die - rmdir third_party/fbgemm/third_party/cpuinfo || die - ln -sv "${WORKDIR}"/cpuinfo-ed8b86a253800bafdb7b25c5c399f91bff9cb1f3 third_party/fbgemm/third_party/cpuinfo || die - rmdir third_party/fbgemm/third_party/googletest || die - ln -sv "${WORKDIR}"/googletest-cbf019de22c8dd37b2108da35b2748fd702d1796 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-4a56ab2c3f61c44e0f8ea241beeb732b7d70dc5b 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-033d799524fb97629af5ac2f609de367472b2696 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-85546f8c44e627f8ff1181725d03cc49f675e44f third_party/onnx || die - rmdir third_party/onnx-tensorrt || die - ln -sv "${WORKDIR}"/onnx-tensorrt-c153211418a7c57ce071d9ce2a41f8d1c85a878f third_party/onnx-tensorrt || die - rmdir third_party/pocketfft || die - ln -sv "${WORKDIR}"/pocketfft-ea778e37710c07723435b1be58235996d1d43a5a third_party/pocketfft || 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-52791a2fd214b2a9dc5759d36725909c1daa7f2e 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-1dff88e5161cba5c59276d2070d2e304e4dcb242 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-b5bb62d25be75c381dbbd975276602f021982ef2 third_party/kineto || die - - if use cuda; then - cd third_party/nccl/nccl || die - eapply "${FILESDIR}"/${PN}-1.6.0-nccl-nvccflags.patch - -# addpredict /dev/nvidiactl - cuda_src_prepare - export CUDAHOSTCXX=$(cuda_gccdir)/g++ - fi - - if use rocm; then - #Allow escaping sandbox - addread /dev/kfd - addread /dev/dri - addwrite /dev/kfd - addwrite /dev/dri - - ebegin "HIPifying cuda sources" - tools/amd_build/build_amd.py - eend $? - - export PYTORCH_ROCM_ARCH=$(rocminfo | egrep -o "gfx[0-9]+" | uniq | awk -vORS=';' "{print $1}" | sed 's/;$/\n/') || die - sed -e "/set(roctracer_INCLUDE_DIRS/s,\${ROCTRACER_PATH}/include,${EPREFIX}/usr/include/roctracer," \ - -i cmake/public/LoadHIP.cmake || die - fi -} - -src_configure() { - local mycmakeargs=( - -DTORCH_BUILD_VERSION=${PV} - -DTORCH_INSTALL_LIB_DIR=$(get_libdir) - -DBUILD_BINARY=$(usex tools ON OFF) - -DBUILD_CAFFE2=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 - -DBUILD_NAMEDTENSOR=$(usex namedtensor ON OFF) - -DBLAS=$(usex blas Generic Eigen) - -DTP_BUILD_LIBUV=OFF - -Wno-dev - ) - - 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 - 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 -rfv "${ED}/torch" - rm -rfv "${ED}/var" - rm -rfv "${ED}/usr/lib" - - rm -fv "${ED}/usr/include/*.{h,hpp}" - rm -rfv "${ED}/usr/include/asmjit" - rm -rfv "${ED}/usr/include/c10d" - rm -rfv "${ED}/usr/include/fbgemm" - rm -rfv "${ED}/usr/include/fp16" - rm -rfv "${ED}/usr/include/gloo" - rm -rfv "${ED}/usr/include/include" - rm -rfv "${ED}/usr/include/var" - - cp -rv "${WORKDIR}/${P}/third_party/pybind11/include/pybind11" "${ED}/usr/include/" - - rm -fv "${ED}/usr/${LIB}/libtbb.so" - rm -rfv "${ED}/usr/${LIB}/cmake" - - if use python; then - scanelf -r --fix "${BUILD_DIR}/caffe2/python" - CMAKE_BUILD_DIR=${BUILD_DIR} distutils-r1_src_install - - python_foreach_impl python_optimize - fi - - find "${ED}/usr/${LIB}" -name "*.a" -exec rm -fv {} \; - - use test && rm -rfv "${ED}/usr/test" "${ED}"/usr/bin/test_{api,jit} - - # Remove the empty directories by CMake Python: - find "${ED}" -type d -empty -delete || die -}