diff options
Diffstat (limited to 'sci-libs/caffe2')
| -rw-r--r-- | sci-libs/caffe2/Manifest | 3 | ||||
| -rw-r--r-- | sci-libs/caffe2/caffe2-1.12.0.ebuild | 3 | ||||
| -rw-r--r-- | sci-libs/caffe2/files/caffe2-1.12.0-glog-0.6.0.patch | 29 |
3 files changed, 33 insertions, 2 deletions
diff --git a/sci-libs/caffe2/Manifest b/sci-libs/caffe2/Manifest index 67845501bc2e..018dbc0b25a0 100644 --- a/sci-libs/caffe2/Manifest +++ b/sci-libs/caffe2/Manifest @@ -1,7 +1,8 @@ AUX caffe2-1.11.0-gentoo.patch 4842 BLAKE2B aab88c5abb64aad74d5c6119dbf6a1e72c3221d9b05e6b8e164f816c2798590f001b6cb3155b5e3bccc03a6a68c4ec9be0dd235de08127959b9adbbc7590a1b5 SHA512 b9498623aead8d5a3096e42adf896f0533903544cde4a1bb9fbb41c83a7921ff25c6c7ef458a280a506bc1555c0519b530a844cd4e537dcf778a2fe50bff50e6 +AUX caffe2-1.12.0-glog-0.6.0.patch 957 BLAKE2B f795e75fd889b888f48e3c7187ba96afb34c6c1bdad3a1726b538b04642e836afef5c0906ba606b6c1966d3c8ab1efc11ff093457b91e403b0b53c91dc962c0f SHA512 7189e27cff8a472a55599a7d26b5bdb64e58b07faa03e9a729c8fa643e4d5a45d43bc8b3b38bd230205c56a3c7c56d8e2d509fa10efc8377615d0d358d00b263 AUX caffe2-1.12.0-install-dirs.patch 7214 BLAKE2B 16571277e481d71ed63e71793b0aa3179de1ab9fe86483f5af3f6b13cb1eef188925b92579a84989429315edffc9189b25603fb478e505b76bf2923f7aa00566 SHA512 3c247897d0c2471d7c79b0ba05a8786807ff466f3e9c3388175df29c49b5498b0a0e6f3aefea68a8dd36b3fdec3e561799f5d664f8125b6846d00e5f05ced16d DIST pytorch-1.11.0.tar.gz 20719323 BLAKE2B 24e7aaa2c26821d36f8092542de9d8d5ac85a619fb9fffb5131987958842afb1cad395780662d15f3411a7cc6ff83a445871960eca1e469fcbf0b9895d83d6e0 SHA512 2342eb7a1a241f5855a7cf12e11f62bc4baaa78d1d0864e53bfc946e783eb4addd05ca154a814d2376cd602098b5547e61c158d6eddb7cad5a9f3b0c1357adca DIST pytorch-1.12.0.tar.gz 106286765 BLAKE2B ff9bafedb35f859f7dccb9b606299cf9c345bdaa0deb87ecfe0c0c30c3c828414d989e1d9a243d9b7cd3f376d56a2f81c241ca2e3c9a8a2b30cddcdeddd3a5c7 SHA512 c9c748a2e0047daaaf199a1ba3198d2d1aee47f664170a9b34ccacd3deeb95f2070e4035eeb900012ef48dc62cf6fb6806f1a1dfe22de8c94892963076e593b7 EBUILD caffe2-1.11.0-r2.ebuild 4129 BLAKE2B c6c24a81a6ac13e4d0b3601bcdb15656ca4f522fedb9f2c04d2e00fc0639043dc84c7a60a336bf3929e75fb2844e0a6fe632e67d70507ac622b32381b3b3a5dc SHA512 3fa1271831a3d8207e2bb2c1bea79bd16a5590981c0e9d81cee4ce8cb09dbe7bbdf21cc3b88030a04df3025a7de5b6413af81043b888c8b2511d396b0f484e7d -EBUILD caffe2-1.12.0.ebuild 4138 BLAKE2B adfcd1f830c28990784e56bfc45212cb9dabb0ef56f6c614ace9e2a4de480fe1abacee7a9d295b52f2d8c1ab55e07f1a137f630be0ba050507783c3228291329 SHA512 23d0c33dc58780639f547d31ca5a56bc587a4b95d26e871c8ba77c7690a5e9ede76f43ad203b05094b6a5a658e1b233e9597a9e329b01df6dc013b14addf86b7 +EBUILD caffe2-1.12.0.ebuild 4176 BLAKE2B e898cd93b5b034497d67458ce12238d7bb3192958ba21c1d1a95e76ce4f1c3a5278b355b094ea7d791666f681bd110bb67d08fc55cfae033cdd226f84d95b6b2 SHA512 ec7da2fd7b86f375c14d6ed27b770e0cb2c3e53c5e17fef846d01833344a0216b79d027badb02429488bb8c126df428588d3bb1cb192b769b885529c3c59394d MISC metadata.xml 961 BLAKE2B 7e0924bce6c952cf8b5e997a50e11aad18d572060087ab877d9600399712a6e46f7bee9938aef6b7af142de21046c1cbe541302a68a20072d1040e7b084b202c SHA512 9ff387a4d11eb83799665e38690f0c668ea6147ab92cc8fd68d4fb60590e51863d4530b885f71bd660429c6d38e573a2a7d8fca5e0139b82111ab05cb61b67d9 diff --git a/sci-libs/caffe2/caffe2-1.12.0.ebuild b/sci-libs/caffe2/caffe2-1.12.0.ebuild index 08e81ce1c8ab..0a44b6824c3c 100644 --- a/sci-libs/caffe2/caffe2-1.12.0.ebuild +++ b/sci-libs/caffe2/caffe2-1.12.0.ebuild @@ -27,7 +27,7 @@ REQUIRED_USE=" RDEPEND=" ${PYTHON_DEPS} dev-cpp/gflags:= - <dev-cpp/glog-0.5.0 + >=dev-cpp/glog-0.5.0 dev-libs/cpuinfo dev-libs/libfmt dev-libs/protobuf @@ -66,6 +66,7 @@ S="${WORKDIR}"/${MYP} PATCHES=( "${FILESDIR}"/${PN}-1.11.0-gentoo.patch "${FILESDIR}"/${PN}-1.12.0-install-dirs.patch + "${FILESDIR}"/${P}-glog-0.6.0.patch ) src_prepare() { diff --git a/sci-libs/caffe2/files/caffe2-1.12.0-glog-0.6.0.patch b/sci-libs/caffe2/files/caffe2-1.12.0-glog-0.6.0.patch new file mode 100644 index 000000000000..a821ebedf7b7 --- /dev/null +++ b/sci-libs/caffe2/files/caffe2-1.12.0-glog-0.6.0.patch @@ -0,0 +1,29 @@ +https://github.com/pytorch/pytorch/issues/58054 + +--- /c10/util/Logging.cpp ++++ /c10/util/Logging.cpp +@@ -192,23 +192,13 @@ + google::GLOG_WARNING, + "The minimum log level that caffe2 will output."); + +-// Google glog's api does not have an external function that allows one to check +-// if glog is initialized or not. It does have an internal function - so we are +-// declaring it here. This is a hack but has been used by a bunch of others too +-// (e.g. Torch). +-namespace google { +-namespace glog_internal_namespace_ { +-bool IsGoogleLoggingInitialized(); +-} // namespace glog_internal_namespace_ +-} // namespace google +- + namespace c10 { + namespace { + + void initGoogleLogging(char const* name) { + #if !defined(_MSC_VER) + // This trick can only be used on UNIX platforms +- if (!::google::glog_internal_namespace_::IsGoogleLoggingInitialized()) ++ if (!::google::IsGoogleLoggingInitialized()) + #endif + { + ::google::InitGoogleLogging(name); |