From ead7697a01fd631b56240b2d58aedd98ba7f92d3 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 27 Nov 2024 02:00:01 +0000 Subject: gentoo auto-resync : 27:11:2024 - 02:00:00 --- sci-libs/Manifest.gz | Bin 43133 -> 43136 bytes sci-libs/cartopy/Manifest | 5 +- sci-libs/cartopy/cartopy-0.23.0.ebuild | 87 --------------------- sci-libs/cartopy/cartopy-0.24.1.ebuild | 84 ++++++++++++++++++++ .../files/cartopy-0.23.0-backport-test-fixes.patch | 13 --- sci-libs/ideep/Manifest | 1 - sci-libs/ideep/files/ideep-3.1.1-20230825.patch | 36 --------- sci-libs/pytorch/Manifest | 1 - .../files/pytorch-2.5.1-torch_shm_manager.patch | 11 --- 9 files changed, 86 insertions(+), 152 deletions(-) delete mode 100644 sci-libs/cartopy/cartopy-0.23.0.ebuild create mode 100644 sci-libs/cartopy/cartopy-0.24.1.ebuild delete mode 100644 sci-libs/cartopy/files/cartopy-0.23.0-backport-test-fixes.patch delete mode 100644 sci-libs/ideep/files/ideep-3.1.1-20230825.patch delete mode 100644 sci-libs/pytorch/files/pytorch-2.5.1-torch_shm_manager.patch (limited to 'sci-libs') diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz index 10413643476f..869fa8c224ce 100644 Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ diff --git a/sci-libs/cartopy/Manifest b/sci-libs/cartopy/Manifest index cf37a3111c31..8eb16d683785 100644 --- a/sci-libs/cartopy/Manifest +++ b/sci-libs/cartopy/Manifest @@ -1,6 +1,5 @@ -AUX cartopy-0.23.0-backport-test-fixes.patch 520 BLAKE2B 57edd4f30665f243a7e710f3341fae647c897aab5066adf2749fd3c084adc67a730203d29dc3c5d19b8b963ecde2c41cbfd8a5da2c82e8775161d2ee4621a1ef SHA512 701b61807388962d2be57da2b7d32a0cd0b84584119cd0772d8b2a1da15e9cf233a048c2bd3ac08bd353732f7c2ae36bf500983569c1c42fec093752a9c570bd -DIST cartopy-0.23.0.gh.tar.gz 10645484 BLAKE2B aa9306e9f5bd85ae28be4802aac1a36d67df5812e9d188ad20d27103eaff1856b7d48e256459519b4e647bdf17fc207e8473ec6ead7413db113311fe821faba6 SHA512 8f357faad592db03c564d2c87f6d1600d2a04a68b71b250925c222cea418b8588f2eb48f64d3ec7210650a34372777ef8416c8f129af7911661615759d2c60b5 DIST cartopy-0.24.0.gh.tar.gz 10701591 BLAKE2B 93b555e43031561f4927952839ddb7f95bef3801cbdaa5c20d98612b5a6d0383b83f4c41cf965b9ef2c64aea68c0507b34a3959bebb71b00bd86fc25d2de412a SHA512 eb0349dc3c1358b18f8c8ae71166f1947c3024337d7bf27fe28a2dea30593e7c6fcf1aa4a540537dd02d95f66051469ca679f3a5b8b3c2cf09d2f25736e03a9b -EBUILD cartopy-0.23.0.ebuild 2193 BLAKE2B 82d5147690bbe2081793db394666cbd1ad41c68a8f18a55f7f6e555d7551273f617db996b4298a062f7436635b0b00f085b9cf3773267705082af22562e63fe7 SHA512 4afffbef0971f207444de7013d948993fac1bac211310fd5f10fa2c2f92e338638bb19023a99b49819b88329563510bfc28e11ba67c477e19855dc7dfa1f15ca +DIST cartopy-0.24.1.gh.tar.gz 10701425 BLAKE2B b1c6980e4e2b03e6ca2f55eec949b7dc4f58577af3795f71af81bd25f0d6e6a2ef3aca1d09b73dbf9c8e9a611f697843189e60bd821516f80bdbc2af2a4f93af SHA512 de5a4c191e3917941b0bab4e9c92fb60a91ef0263f7066753fd64286c347304ae8b7529b08fa901669173e8630c2b396775daf98161e8cadc62346641555c01a EBUILD cartopy-0.24.0.ebuild 2135 BLAKE2B 6adcea70334d7599ea992c8a62979b48c92247618558b0e975dc4d7819321bf59817209460189774d29964503a2dbd60191a5d0ca7c057dadb2c280d7033578a SHA512 5aa3e739e7b0e4f27cc7faf65b2c5b51161b52268687d77eec8a84ddca2fd809b604ea51b401d51e5a27349fe6d8dc779317666884b403b5eb416690bfe6b28c +EBUILD cartopy-0.24.1.ebuild 2135 BLAKE2B 6adcea70334d7599ea992c8a62979b48c92247618558b0e975dc4d7819321bf59817209460189774d29964503a2dbd60191a5d0ca7c057dadb2c280d7033578a SHA512 5aa3e739e7b0e4f27cc7faf65b2c5b51161b52268687d77eec8a84ddca2fd809b604ea51b401d51e5a27349fe6d8dc779317666884b403b5eb416690bfe6b28c MISC metadata.xml 729 BLAKE2B 38605f8140ccae8c9edf2b5eb7bf394e9c99fd089fa998c98422967cc12d3b808d3b7901d3746da25558c9211e47deec01a3d5856176cda8a868c0151a03fed8 SHA512 f3fb714f50475c2e0f4150d20423195fffb39243aefd313e9a9d0fa834364a928a712006d6e1e1def77b902f8c349a4045d3081fe38697054e744441e622a591 diff --git a/sci-libs/cartopy/cartopy-0.23.0.ebuild b/sci-libs/cartopy/cartopy-0.23.0.ebuild deleted file mode 100644 index 024cbd93e090..000000000000 --- a/sci-libs/cartopy/cartopy-0.23.0.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_SINGLE_IMPL=1 -DISTUTILS_EXT=1 -PYTHON_COMPAT=( python3_{9..12} ) - -DISTUTILS_USE_PEP517=setuptools -inherit distutils-r1 multiprocessing virtualx - -MY_PV=${PV/_beta/b} -MY_P=${PN}-${MY_PV} - -DESCRIPTION="Python package for geospatial data processing and analysis" -HOMEPAGE="https://scitools.org.uk/cartopy" -SRC_URI="https://github.com/SciTools/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz" -S="${WORKDIR}"/${MY_P} - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=" - ${PYTHON_DEPS} - sci-libs/gdal[python,${PYTHON_SINGLE_USEDEP}] - $(python_gen_cond_dep ' - >=dev-python/numpy-1.19[${PYTHON_USEDEP}] - dev-python/shapely[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - dev-python/matplotlib[${PYTHON_USEDEP}] - dev-python/scipy[${PYTHON_USEDEP}] - dev-python/pillow[jpeg,${PYTHON_USEDEP}] - dev-python/pyproj[${PYTHON_USEDEP}] - sci-libs/pyshp[${PYTHON_USEDEP}] - ') -" -DEPEND="${RDEPEND}" -BDEPEND=" - $(python_gen_cond_dep ' - dev-python/setuptools-scm[${PYTHON_USEDEP}] - dev-python/cython[${PYTHON_USEDEP}] - ') - test? ( - $(python_gen_cond_dep ' - dev-python/filelock[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] - dev-python/flufl-lock[${PYTHON_USEDEP}] - dev-python/pytest-mpl[${PYTHON_USEDEP}] - dev-python/pytest-xdist[${PYTHON_USEDEP}] - ') - ) -" -PATCHES=( - "${FILESDIR}"/${P}-backport-test-fixes.patch -) - -EPYTEST_IGNORE=( - # Require network access, not covered by markers - lib/cartopy/tests/mpl/test_crs.py - lib/cartopy/tests/mpl/test_gridliner.py -) - -distutils_enable_tests pytest - -python_prepare_all() { - export SETUPTOOLS_SCM_PRETEND_VERSION=${PV} - - # Prepare matplotlib backend for test suite - export MPLCONFIGDIR="${T}" - echo "backend : Agg" > "${MPLCONFIGDIR}"/matplotlibrc || die - - sed -i -e "s/exclude =/#exclude =/" pyproject.toml || die - - distutils-r1_python_prepare_all -} - -python_test() { - cd "${BUILD_DIR}" || die - - # Drop all tests needing network access - virtx epytest -n "$(makeopts_jobs)" -m "not network and not natural_earth" || die "test failed" -} diff --git a/sci-libs/cartopy/cartopy-0.24.1.ebuild b/sci-libs/cartopy/cartopy-0.24.1.ebuild new file mode 100644 index 000000000000..3c21d69d0004 --- /dev/null +++ b/sci-libs/cartopy/cartopy-0.24.1.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_SINGLE_IMPL=1 +DISTUTILS_EXT=1 +PYTHON_COMPAT=( python3_{9..12} ) + +DISTUTILS_USE_PEP517=setuptools +inherit distutils-r1 multiprocessing virtualx + +MY_PV=${PV/_beta/b} +MY_P=${PN}-${MY_PV} + +DESCRIPTION="Python package for geospatial data processing and analysis" +HOMEPAGE="https://scitools.org.uk/cartopy" +SRC_URI="https://github.com/SciTools/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz" +S="${WORKDIR}"/${MY_P} + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" +RESTRICT="!test? ( test )" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND=" + ${PYTHON_DEPS} + sci-libs/gdal[python,${PYTHON_SINGLE_USEDEP}] + $(python_gen_cond_dep ' + >=dev-python/numpy-1.19[${PYTHON_USEDEP}] + dev-python/shapely[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] + dev-python/matplotlib[${PYTHON_USEDEP}] + dev-python/scipy[${PYTHON_USEDEP}] + dev-python/pillow[jpeg,${PYTHON_USEDEP}] + dev-python/pyproj[${PYTHON_USEDEP}] + sci-libs/pyshp[${PYTHON_USEDEP}] + ') +" +DEPEND="${RDEPEND}" +BDEPEND=" + $(python_gen_cond_dep ' + dev-python/setuptools-scm[${PYTHON_USEDEP}] + dev-python/cython[${PYTHON_USEDEP}] + ') + test? ( + $(python_gen_cond_dep ' + dev-python/filelock[${PYTHON_USEDEP}] + dev-python/mock[${PYTHON_USEDEP}] + dev-python/flufl-lock[${PYTHON_USEDEP}] + dev-python/pytest-mpl[${PYTHON_USEDEP}] + dev-python/pytest-xdist[${PYTHON_USEDEP}] + ') + ) +" + +EPYTEST_IGNORE=( + # Require network access, not covered by markers + lib/cartopy/tests/mpl/test_crs.py + lib/cartopy/tests/mpl/test_gridliner.py +) + +distutils_enable_tests pytest + +python_prepare_all() { + export SETUPTOOLS_SCM_PRETEND_VERSION=${PV} + + # Prepare matplotlib backend for test suite + export MPLCONFIGDIR="${T}" + echo "backend : Agg" > "${MPLCONFIGDIR}"/matplotlibrc || die + + sed -i -e "s/exclude =/#exclude =/" pyproject.toml || die + + distutils-r1_python_prepare_all +} + +python_test() { + cd "${BUILD_DIR}" || die + + # Drop all tests needing network access + virtx epytest -n "$(makeopts_jobs)" -m "not network and not natural_earth" || die "test failed" +} diff --git a/sci-libs/cartopy/files/cartopy-0.23.0-backport-test-fixes.patch b/sci-libs/cartopy/files/cartopy-0.23.0-backport-test-fixes.patch deleted file mode 100644 index b88d4110dd6f..000000000000 --- a/sci-libs/cartopy/files/cartopy-0.23.0-backport-test-fixes.patch +++ /dev/null @@ -1,13 +0,0 @@ -# backport last test fix just after v0.23 release -diff --git a/lib/cartopy/tests/mpl/test_gridliner.py b/lib/cartopy/tests/mpl/test_gridliner.py -index 7d82178..d07573e 100644 ---- a/lib/cartopy/tests/mpl/test_gridliner.py -+++ b/lib/cartopy/tests/mpl/test_gridliner.py -@@ -496,6 +496,7 @@ def test_gridliner_count_draws(): - mocked.assert_called_once() - - -+@pytest.mark.natural_earth - @pytest.mark.mpl_image_compare( - baseline_dir='baseline_images/mpl/test_mpl_integration', - filename='simple_global.png') diff --git a/sci-libs/ideep/Manifest b/sci-libs/ideep/Manifest index 78f638180ae2..a42d13b4f07e 100644 --- a/sci-libs/ideep/Manifest +++ b/sci-libs/ideep/Manifest @@ -1,4 +1,3 @@ -AUX ideep-3.1.1-20230825.patch 1390 BLAKE2B 2787650021a21073aff0e200d8cdd6e47768b863d2b32275b5108f41d1d97f6caf40b40c4b2ebc18d92dbe2136684891f88e19365984aa1a91f5074633ee4279 SHA512 f2608fc21d64b6aaf59daf3af8003fad529decf5011601190bead62e0fe8e19d353b7e2522b9b7dba0ac3ce8ca2322b9bea1f2735f0144a747296b84566ac6b1 DIST ideep-3.3.2.tar.gz 57631 BLAKE2B 57ec733a3bf9e6e8ebdebdeb63000adcef8e9ecda00118c88bca24a80fd71602b5dc3d46892410d0231d2ecf2111d5a08c3a4e95bb785964cfc4c5d6c81537f0 SHA512 e0a9ca99f25b488e38b8887099c015ed0e67cc5c350c922b85f746e25c88e07a3291f8f5d71aef5f37c72814f32e00d81ec16853a425e0fe735c71c5fccc6a41 DIST ideep-3.5.3_p2.tar.gz 63267 BLAKE2B 8797b5ff222824ef135496c39cdeb41c646ae2d7538a75688d554933529de1fa5126fa19e95d0d0199e6cef348c6ede49ccb7a10235d9f434c4f108991c1b299 SHA512 033ec14e50b50fde7f213656c784cc81a12b4ff0a67b019e8efc00e0703bdff5b5aed44bad5cab75e50d014ea9db5a2ec5490f62ff7208824d08a5df451cc64a EBUILD ideep-3.3.2.ebuild 423 BLAKE2B c100045c7f17e2cdb2f8e8e01ced4ec8513cd1c02425488ae94020ae9d3d0d71eb8d6b762f868e8f171aaf5c5511cc98c4f65c0375ce8f103d87af6063afaea8 SHA512 e064358c5264aa2eeaaf13b5904a20c126b317cc13351569d099ead1ff544af249647850b0ab61f0a6a543aa854d12f93926f73bcb3a060ecf998b3c297e0fcd diff --git a/sci-libs/ideep/files/ideep-3.1.1-20230825.patch b/sci-libs/ideep/files/ideep-3.1.1-20230825.patch deleted file mode 100644 index a8625e758b00..000000000000 --- a/sci-libs/ideep/files/ideep-3.1.1-20230825.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 6f4d653802bd43bc4eda515460df9f90353dbebe Mon Sep 17 00:00:00 2001 -From: leslie-fang-intel -Date: Fri, 25 Aug 2023 13:37:20 +0800 -Subject: [PATCH] reland remove conv weight scale reciprocal (#226) - ---- - include/ideep.hpp | 2 +- - include/ideep/operators/conv.hpp | 3 --- - 2 files changed, 1 insertion(+), 4 deletions(-) - -diff --git a/include/ideep.hpp b/include/ideep.hpp -index 7e02c366..a11c3553 100644 ---- a/include/ideep.hpp -+++ b/include/ideep.hpp -@@ -48,6 +48,6 @@ - #define IDEEP_VERSION_MAJOR DNNL_VERSION_MAJOR - #define IDEEP_VERSION_MINOR DNNL_VERSION_MINOR - #define IDEEP_VERSION_PATCH DNNL_VERSION_PATCH --#define IDEEP_VERSION_REVISION 0 -+#define IDEEP_VERSION_REVISION 1 - - #endif -diff --git a/include/ideep/operators/conv.hpp b/include/ideep/operators/conv.hpp -index 49677ff6..27ee84b6 100644 ---- a/include/ideep/operators/conv.hpp -+++ b/include/ideep/operators/conv.hpp -@@ -161,9 +161,6 @@ struct conv_deconv_utils { - weights_scales_in.size(), oc_per_group, groups, is_deconv); - auto wei_scales = weights_scales_in; - if (!std::all_of(wei_scales.begin(), wei_scales.end(), [](float i){ return i == 1.0f; })) { -- for (auto& s : wei_scales) { -- s = 1.0 / s; -- } - op_attr.set_scales(DNNL_ARG_WEIGHTS, wei_scale_mask, wei_scales); - } - if (dst_scales_in[0] != 1.0f) { diff --git a/sci-libs/pytorch/Manifest b/sci-libs/pytorch/Manifest index a1a2d545213b..607481bf5d5b 100644 --- a/sci-libs/pytorch/Manifest +++ b/sci-libs/pytorch/Manifest @@ -6,7 +6,6 @@ AUX pytorch-2.4.0-global-dlopen.patch 887 BLAKE2B 044e7708619070f93b1157a0c4e560 AUX pytorch-2.4.0-torch_shm_manager.patch 367 BLAKE2B f03c002cbd50fb959dfc3ccf89cb8aa9fe6e001ff2cb47bee45cde28cac262e20df1d06f396776ce069f0a9e92cd370c96788db0aa5d1b9d9f3bc1832701502a SHA512 94f095908385b3058863d05a78a0e243f8614bbde406d457e50bdba574a8e1911b77790a0806f705644dc0c0ae235888314ea4a31aed7c0eb8ddfb29ff42636e AUX pytorch-2.5.1-dontbuildagain.patch 420 BLAKE2B 42935902e5cb98d5d013fd4e409107c7fa95b91a09ee34723b67dbee37eed4575bb008de0aaab4d00b36bb19d87b4d6855829498fe5b7de95e47b4d536edc71c SHA512 e78b572110ff62d7d90ecd8dfb3f9f6a72c05e5190991ee8084107bbe11f0fe4f85d6fa440b2b4d3ce5e2611685e6e6f35d4fb026eef43131e3e4e60dba53bcf AUX pytorch-2.5.1-setup.patch 437 BLAKE2B 4107ad2dfde10b25e7422f65c7f87833bb662958eb3fca3ac0c1a5c2e203f7186c31142ac6cdf2a10009a95408e45caaa09fd85a5cc35ee6c9106f8c630a8beb SHA512 a51b3840763f960c1c63df0181c2d35747697a57e11bb08681acf21af06b64d2fca45f6bb3647034d20860e497cab53cec9bd2b5719c5c5aab7bf01080da9103 -AUX pytorch-2.5.1-torch_shm_manager.patch 216 BLAKE2B bd7c51437bf9203bd9ade0c17ee10c860d5aec810435a378f7dc67a401a438050c32e4bec54b9062cebdae4c93db20b3f94bf2bea45332650b848478771bd499 SHA512 e7ea54149bda50d7da6a849d5bf2053da7654ba3f4a83c157d996721a575ccb9060c59055709606c8a455eaffa1ef9e73bda2ffbba7e724a25a8a5d177072082 DIST pytorch-2.4.0.tar.gz 115031093 BLAKE2B d206477963977011627df284efa01482fbf57e9fcb5f58f51d679c742b8e5dde6aa6affd8745ab817fcd09477d129a81e74e07be576b5d3585eaca1c735b8e01 SHA512 804d25944035f33de6591fd942fbda44d3de037717a4397d38a97474b01775d30eaf93d16dd708a832c0119050d24d73b90990fd3e3773be79d26ada25244d22 DIST pytorch-2.4.1.tar.gz 115029469 BLAKE2B c2909ff27d527bc57cba56b780d3b8cd07a043ab045caa6c6b27857a16f9ad10aaab2116b26226b1e46ee08ffb44007965d914464418e4ae14ca48c3f3f383bb SHA512 7e9b4485e242eaf0d648765c6621d73d95e7107b766646a098175436d1ab2e2b864badd0757a3bab6b7c318233f2120bad9ac07b39bb9e357897919580c87631 DIST pytorch-2.5.1.tar.gz 116091366 BLAKE2B 7838b17562b94ffc7d798031348689db607dd5eae2a3c35be365972e2b52a2c1b12067068d5aca5ab00cf0977d9c2c3c9ae5337d69534c864c732e6256cbeef6 SHA512 a913a466324a65fa3d79c5e9ad4d605fc7976f0134fda2f81aaa3cea29d56926604999b8a238759646d211e63b47bbb446cdffa86ca8defd8159f11e30301289 diff --git a/sci-libs/pytorch/files/pytorch-2.5.1-torch_shm_manager.patch b/sci-libs/pytorch/files/pytorch-2.5.1-torch_shm_manager.patch deleted file mode 100644 index 5d7902b9bef7..000000000000 --- a/sci-libs/pytorch/files/pytorch-2.5.1-torch_shm_manager.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/torch/__init__.py -+++ b/torch/__init__.py -@@ -1951,7 +1951,7 @@ - return path.encode("utf-8") - - --_C._initExtension(_manager_path()) -+_C._initExtension(b"/usr/bin/torch_shm_manager") - - del _manager_path - -- cgit v1.2.3