diff options
Diffstat (limited to 'dev-python/aesara')
-rw-r--r-- | dev-python/aesara/Manifest | 13 | ||||
-rw-r--r-- | dev-python/aesara/aesara-2.5.3.ebuild | 3 | ||||
-rw-r--r-- | dev-python/aesara/aesara-2.6.3.ebuild (renamed from dev-python/aesara/aesara-2.4.0.ebuild) | 20 | ||||
-rw-r--r-- | dev-python/aesara/aesara-2.6.4.ebuild | 80 | ||||
-rw-r--r-- | dev-python/aesara/aesara-2.6.5.ebuild | 91 | ||||
-rw-r--r-- | dev-python/aesara/aesara-2.6.6.ebuild | 91 | ||||
-rw-r--r-- | dev-python/aesara/files/aesara-2.6.5-compiledir-tid.patch | 46 |
7 files changed, 335 insertions, 9 deletions
diff --git a/dev-python/aesara/Manifest b/dev-python/aesara/Manifest index 64964545a9c9..043dbb30cc57 100644 --- a/dev-python/aesara/Manifest +++ b/dev-python/aesara/Manifest @@ -1,5 +1,12 @@ -DIST aesara-rel-2.4.0.tar.gz 8189236 BLAKE2B 05fd50ddd64ec063b3ea226706d232648e0fc314b754342db9537f1d55abd71a65afee3b3934b41e182fe12c224c8e10e8235ac58ba91c4c9f28d3ad8df1b7ac SHA512 b58e881145e051f97d5065fd46716209e280de46bd49ce6d1294880137aefc550741c6f96a47c8e2dbb54717d7c9f161a92f2cb5d3535687fbb6115641cc714c +AUX aesara-2.6.5-compiledir-tid.patch 1707 BLAKE2B 77f8fa3618f930dddad8e864dee3e73fc0b965018d508be5877d5bcae4430024c4e4f90e905ac912da22a4d4934d6fc71acf4ebd49b7e8efb12c90dfaa072ed2 SHA512 9b6bbd8bc56f61c89dfd85cb18251ff8d73d717d91178efa9309e6b897dbda28937dea84f1d7d1a917c285219d51c0adcee1233112f2dcdb9f8c7b714a6c6c12 DIST aesara-rel-2.5.3.tar.gz 8191431 BLAKE2B 698bc3b6f7e84288be3318796989d13d7de92f72c66abfa83b14c08f6310f974f7381d729e712c2bd5e76f398d74a3c5dc03d7515a22254261312e586e3fd461 SHA512 5c1ad9d6ad1fb58be1477713d863f2b1371544ea8293d8e9e1a690860a0483b83c9558827856a2546498bab26360f141a5ee97d4c7f3f2aad773e84f9766a59b -EBUILD aesara-2.4.0.ebuild 2155 BLAKE2B 31ad0a8e66017dee04711ce5a5a7f02d0a128cc00f3479b15bd1c7b13008b65871f6bff7524bca8c950dec8597f67daea2d77c01fb407addc5a4ad1ff3598b40 SHA512 909a18234cf673f5877524babdc50bc13edafb02821bc6b8d0cb91e96c109bc4be5c8f9c1ab03d23629c835ecee976a33474ccafc7b1486231056f6f69c542b9 -EBUILD aesara-2.5.3.ebuild 2202 BLAKE2B 8e894a9567ea1b21bcb70c6b6db4e8e271124b025316a0974af41b1d21529956e869188261f24713adb0011361e1c273f6edd2b9eb755a65f3939d80bebdc481 SHA512 1e8114cb8e9a94fcdde245312e5475c19a521a7b4e52e1588f0748ce72435793cd02a48233d30511cbcd290f3b0edd8bf259c83e8e315615176efbf18cf5dd3b +DIST aesara-rel-2.6.3.tar.gz 7845423 BLAKE2B 66b84a10337efc01e37d82793da56b61b1825829d982e24e0f93ebb67cd3c22e5bb2e37c71ab8bd9648b039efaf4c667dc53df2a9613ba9370c2138eb74ca400 SHA512 e0a804c0c3c1cd24753a237c386df9600d2b01cf4991aeca3d794df4068f584a9ab5341b72fa5695ccb9d06f1e4954f450436e3a7ebe4c2efc1354a5c2e5979d +DIST aesara-rel-2.6.4.tar.gz 7845688 BLAKE2B bfd0222c2a8d8e22abb56b785b73a121032832417562046445b8e0b2f6461326ba760d1839fd1acac2215a1547ed48d613998cb4915a07521f4d976a32a811b9 SHA512 a9f47bb4718fab974a35d7eab1b2a5ab8ea7d911dd9d92a791763a659f96b52b9832532e5e13aad10ac8e2f0927d2cc3e97c09e84046fee125925b3ac2898893 +DIST aesara-rel-2.6.5.tar.gz 7849097 BLAKE2B 85bc1579cd22ccc35f727ede3b337d1bdb613924f7568ac403ca1d2da42e442006afdd80e8eaeed14e0c2bd7a550127b9474b9424ffe800426203e1e31e65256 SHA512 cb5ff0f8c5a475ab733000df9d96ea3410c5760f263bb8a8f1de093f47fca3d7428d37253ae114d61d925777e98ab0c8f698f7864615ea32fe20efe6fc5042a4 +DIST aesara-rel-2.6.6.tar.gz 7847814 BLAKE2B e4edd575d49f548fab0ef971dbab88beeb43859ec7b80612145ed490b31d6e7dc6b6818653396938124a22fa2f54f8d151c5039cc2e9c9070c88cce9cb1c5596 SHA512 028a208fc7e5921ce1df34dd23a42cf90d419e06f0192d9a006ebfb8c5f36e35e347214e53f53e688a1144063c7f4853a8cd44eef6fc205225147116839008de +EBUILD aesara-2.5.3.ebuild 2220 BLAKE2B c63f083ffcfec83fe5e4be3376f8c802e14ec75971273bf08dfc9b557d4ae3e880ad9061e060fbd4d50c798aff10e8bc70035fa4897113e6f716285310c7dadd SHA512 316b85a504558d62b630be739ef8571848d11cd676ecff988bbd84cd18f2577c67b47d8fc2f6c25d4095a095d9323580e6daa86d40bf6091727a017708d02679 +EBUILD aesara-2.6.3.ebuild 2265 BLAKE2B 2e92bf9c2579393d0a6bea1fae4b2a738d14d8bbf54db36b1b419dbd9fdfa48ac6066eaee5b8d6e514a7d1c68473648871c0fbacf50bdc2f1459e66ba80d7b6d SHA512 5d030018f7e1aec0cfed2d3f0427a562b84e2eee314a2fa26e48f119c0fd240bf3ca761003d546e460d8d3add904ccec1aa9bc7bf61bc32d1d98b152c259219b +EBUILD aesara-2.6.4.ebuild 2265 BLAKE2B 2e92bf9c2579393d0a6bea1fae4b2a738d14d8bbf54db36b1b419dbd9fdfa48ac6066eaee5b8d6e514a7d1c68473648871c0fbacf50bdc2f1459e66ba80d7b6d SHA512 5d030018f7e1aec0cfed2d3f0427a562b84e2eee314a2fa26e48f119c0fd240bf3ca761003d546e460d8d3add904ccec1aa9bc7bf61bc32d1d98b152c259219b +EBUILD aesara-2.6.5.ebuild 2598 BLAKE2B ec2c9a5359c530f8a4a8a274c0439d65cb10c8d73bb55e364296a6b6268bee5077846a5ccbec83ae3bb65e9842c29a81882ce8ea8004961613666768e6fb3c9c SHA512 6405bb798d228e1b6d41a6739d8f0a596337596225ea0094fb54f0383bd9a4cd130d7d2e5041b80a77ccf337cc4912bb795faefad3f447ac892113112ed6ab16 +EBUILD aesara-2.6.6.ebuild 2598 BLAKE2B ec2c9a5359c530f8a4a8a274c0439d65cb10c8d73bb55e364296a6b6268bee5077846a5ccbec83ae3bb65e9842c29a81882ce8ea8004961613666768e6fb3c9c SHA512 6405bb798d228e1b6d41a6739d8f0a596337596225ea0094fb54f0383bd9a4cd130d7d2e5041b80a77ccf337cc4912bb795faefad3f447ac892113112ed6ab16 MISC metadata.xml 506 BLAKE2B be65b6be62282fa47152985d79892fd04105a47e00a427ee8341d27aeff21b144bee7e7d0f16b2f4b617c941bdf5ebd9de37a42c39d117cdfd579c3035d35a74 SHA512 a207ec3db85a8e6f03feabd14da588f0b9ca9a88ab2495ade0f40b516b3bbd20fe78b14698d28da7ceed238737a9f4d63f587156ef609e846b485132d598c6bb diff --git a/dev-python/aesara/aesara-2.5.3.ebuild b/dev-python/aesara/aesara-2.5.3.ebuild index b3d43246b246..22962f0d5f3e 100644 --- a/dev-python/aesara/aesara-2.5.3.ebuild +++ b/dev-python/aesara/aesara-2.5.3.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~riscv x86" RDEPEND=" dev-python/cons[${PYTHON_USEDEP}] @@ -63,6 +63,7 @@ python_test() { } python_compile() { + esetup.py build_py distutils-r1_python_compile rm "${BUILD_DIR}/install$(python_get_sitedir)/bin/__init__.py" || die } diff --git a/dev-python/aesara/aesara-2.4.0.ebuild b/dev-python/aesara/aesara-2.6.3.ebuild index 5bb935351e07..5bcb330fb0af 100644 --- a/dev-python/aesara/aesara-2.4.0.ebuild +++ b/dev-python/aesara/aesara-2.6.3.ebuild @@ -10,13 +10,19 @@ inherit distutils-r1 multiprocessing optfeature MY_P=aesara-rel-${PV} DESCRIPTION="Library for operating on mathematical expressions with multi-dimensional arrays" -HOMEPAGE="https://github.com/aesara-devs/aesara" -SRC_URI="https://github.com/aesara-devs/aesara/archive/rel-${PV}.tar.gz -> ${MY_P}.tar.gz" +HOMEPAGE=" + https://github.com/aesara-devs/aesara/ + https://pypi.org/project/aesara/ +" +SRC_URI=" + https://github.com/aesara-devs/aesara/archive/rel-${PV}.tar.gz + -> ${MY_P}.tar.gz +" S="${WORKDIR}/${MY_P}" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~riscv x86" +KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" RDEPEND=" dev-python/cons[${PYTHON_USEDEP}] @@ -26,11 +32,14 @@ RDEPEND=" dev-python/filelock[${PYTHON_USEDEP}] >=dev-python/numpy-1.17.0[${PYTHON_USEDEP}] dev-python/six[${PYTHON_USEDEP}] - <dev-python/scipy-1.8[${PYTHON_USEDEP}]" + dev-python/scipy[${PYTHON_USEDEP}] + dev-python/typing-extensions[${PYTHON_USEDEP}] +" BDEPEND=" test? ( dev-python/pytest-xdist[${PYTHON_USEDEP}] - )" + ) +" distutils_enable_sphinx doc 'dev-python/sphinx_rtd_theme' distutils_enable_tests pytest @@ -60,6 +69,7 @@ python_test() { } python_compile() { + esetup.py build_py distutils-r1_python_compile rm "${BUILD_DIR}/install$(python_get_sitedir)/bin/__init__.py" || die } diff --git a/dev-python/aesara/aesara-2.6.4.ebuild b/dev-python/aesara/aesara-2.6.4.ebuild new file mode 100644 index 000000000000..5bcb330fb0af --- /dev/null +++ b/dev-python/aesara/aesara-2.6.4.ebuild @@ -0,0 +1,80 @@ +# Copyright 2021-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{8..10} ) + +inherit distutils-r1 multiprocessing optfeature + +MY_P=aesara-rel-${PV} +DESCRIPTION="Library for operating on mathematical expressions with multi-dimensional arrays" +HOMEPAGE=" + https://github.com/aesara-devs/aesara/ + https://pypi.org/project/aesara/ +" +SRC_URI=" + https://github.com/aesara-devs/aesara/archive/rel-${PV}.tar.gz + -> ${MY_P}.tar.gz +" +S="${WORKDIR}/${MY_P}" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" + +RDEPEND=" + dev-python/cons[${PYTHON_USEDEP}] + dev-python/etuples[${PYTHON_USEDEP}] + dev-python/logical-unification[${PYTHON_USEDEP}] + dev-python/minikanren[${PYTHON_USEDEP}] + dev-python/filelock[${PYTHON_USEDEP}] + >=dev-python/numpy-1.17.0[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] + dev-python/scipy[${PYTHON_USEDEP}] + dev-python/typing-extensions[${PYTHON_USEDEP}] +" +BDEPEND=" + test? ( + dev-python/pytest-xdist[${PYTHON_USEDEP}] + ) +" + +distutils_enable_sphinx doc 'dev-python/sphinx_rtd_theme' +distutils_enable_tests pytest + +python_test() { + local EPYTEST_DESELECT=( + # speed tests are unreliable + tests/scan/test_basic.py::test_speed + tests/scan/test_basic.py::test_speed_rnn + tests/scan/test_basic.py::test_speed_batchrnn + tests/link/test_vm.py::test_speed + tests/link/test_vm.py::test_speed_lazy + tests/tensor/test_gc.py::test_merge_opt_runtime + + # rounding problem? + # https://github.com/aesara-devs/aesara/issues/477 + tests/tensor/test_math_scipy.py::TestGammaUBroadcast::test_good + tests/tensor/test_math_scipy.py::TestGammaUInplaceBroadcast::test_good + ) + local EPYTEST_IGNORE=( + # we do not package numba + tests/link/test_numba.py + tests/link/test_numba_performance.py + ) + + epytest -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" +} + +python_compile() { + esetup.py build_py + distutils-r1_python_compile + rm "${BUILD_DIR}/install$(python_get_sitedir)/bin/__init__.py" || die +} + +pkg_postinst() { + optfeature "GPU code generation/execution on NVIDIA gpus" dev-util/nvidia-cuda-toolkit dev-util/nvidia-cuda-sdk + optfeature "GPU/CPU code generation on CUDA and OpenCL devices" dev-libs/libgpuarray dev-python/pycuda +} diff --git a/dev-python/aesara/aesara-2.6.5.ebuild b/dev-python/aesara/aesara-2.6.5.ebuild new file mode 100644 index 000000000000..5010ebf96928 --- /dev/null +++ b/dev-python/aesara/aesara-2.6.5.ebuild @@ -0,0 +1,91 @@ +# Copyright 2021-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{8..10} ) + +inherit distutils-r1 multiprocessing optfeature + +MY_P=aesara-rel-${PV} +DESCRIPTION="Library for operating on mathematical expressions with multi-dimensional arrays" +HOMEPAGE=" + https://github.com/aesara-devs/aesara/ + https://pypi.org/project/aesara/ +" +SRC_URI=" + https://github.com/aesara-devs/aesara/archive/rel-${PV}.tar.gz + -> ${MY_P}.tar.gz +" +S=${WORKDIR}/${MY_P} + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" + +RDEPEND=" + dev-python/cons[${PYTHON_USEDEP}] + dev-python/etuples[${PYTHON_USEDEP}] + dev-python/logical-unification[${PYTHON_USEDEP}] + dev-python/minikanren[${PYTHON_USEDEP}] + dev-python/filelock[${PYTHON_USEDEP}] + >=dev-python/numpy-1.17.0[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] + dev-python/scipy[${PYTHON_USEDEP}] + dev-python/typing-extensions[${PYTHON_USEDEP}] +" +BDEPEND=" + test? ( + dev-python/pytest-xdist[${PYTHON_USEDEP}] + ) +" + +PATCHES=( + "${FILESDIR}"/aesara-2.6.5-compiledir-tid.patch +) + +distutils_enable_sphinx doc 'dev-python/sphinx_rtd_theme' +distutils_enable_tests pytest + +python_test() { + local EPYTEST_DESELECT=( + # speed tests are unreliable + tests/scan/test_basic.py::test_speed + tests/scan/test_basic.py::test_speed_rnn + tests/scan/test_basic.py::test_speed_batchrnn + tests/link/test_vm.py::test_speed + tests/link/test_vm.py::test_speed_lazy + tests/tensor/test_gc.py::test_merge_opt_runtime + + # rounding problem? + # https://github.com/aesara-devs/aesara/issues/477 + tests/tensor/test_math_scipy.py::TestGammaUBroadcast::test_good + tests/tensor/test_math_scipy.py::TestGammaUInplaceBroadcast::test_good + ) + local EPYTEST_IGNORE=( + # we do not package numba + tests/link/test_numba.py + tests/link/test_numba_performance.py + ) + + local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 + local -x AESARA_FLAGS="cxx=${CXX}" + AESARA_FLAGS+=",config.gcc__cxxflags=\"${CXXFLAGS}\"" + AESARA_FLAGS+=',compiledir_format="compiledir_%(thread_id)s"' + + epytest -p xdist.plugin -n "$(makeopts_jobs)" + # clean up the compiledir, as it can grow pretty large + rm -r "${HOME}"/.aesara || die +} + +python_compile() { + esetup.py build_py + distutils-r1_python_compile + rm "${BUILD_DIR}/install$(python_get_sitedir)/bin/__init__.py" || die +} + +pkg_postinst() { + optfeature "GPU code generation/execution on NVIDIA gpus" dev-util/nvidia-cuda-toolkit dev-util/nvidia-cuda-sdk + optfeature "GPU/CPU code generation on CUDA and OpenCL devices" dev-libs/libgpuarray dev-python/pycuda +} diff --git a/dev-python/aesara/aesara-2.6.6.ebuild b/dev-python/aesara/aesara-2.6.6.ebuild new file mode 100644 index 000000000000..5010ebf96928 --- /dev/null +++ b/dev-python/aesara/aesara-2.6.6.ebuild @@ -0,0 +1,91 @@ +# Copyright 2021-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{8..10} ) + +inherit distutils-r1 multiprocessing optfeature + +MY_P=aesara-rel-${PV} +DESCRIPTION="Library for operating on mathematical expressions with multi-dimensional arrays" +HOMEPAGE=" + https://github.com/aesara-devs/aesara/ + https://pypi.org/project/aesara/ +" +SRC_URI=" + https://github.com/aesara-devs/aesara/archive/rel-${PV}.tar.gz + -> ${MY_P}.tar.gz +" +S=${WORKDIR}/${MY_P} + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" + +RDEPEND=" + dev-python/cons[${PYTHON_USEDEP}] + dev-python/etuples[${PYTHON_USEDEP}] + dev-python/logical-unification[${PYTHON_USEDEP}] + dev-python/minikanren[${PYTHON_USEDEP}] + dev-python/filelock[${PYTHON_USEDEP}] + >=dev-python/numpy-1.17.0[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] + dev-python/scipy[${PYTHON_USEDEP}] + dev-python/typing-extensions[${PYTHON_USEDEP}] +" +BDEPEND=" + test? ( + dev-python/pytest-xdist[${PYTHON_USEDEP}] + ) +" + +PATCHES=( + "${FILESDIR}"/aesara-2.6.5-compiledir-tid.patch +) + +distutils_enable_sphinx doc 'dev-python/sphinx_rtd_theme' +distutils_enable_tests pytest + +python_test() { + local EPYTEST_DESELECT=( + # speed tests are unreliable + tests/scan/test_basic.py::test_speed + tests/scan/test_basic.py::test_speed_rnn + tests/scan/test_basic.py::test_speed_batchrnn + tests/link/test_vm.py::test_speed + tests/link/test_vm.py::test_speed_lazy + tests/tensor/test_gc.py::test_merge_opt_runtime + + # rounding problem? + # https://github.com/aesara-devs/aesara/issues/477 + tests/tensor/test_math_scipy.py::TestGammaUBroadcast::test_good + tests/tensor/test_math_scipy.py::TestGammaUInplaceBroadcast::test_good + ) + local EPYTEST_IGNORE=( + # we do not package numba + tests/link/test_numba.py + tests/link/test_numba_performance.py + ) + + local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 + local -x AESARA_FLAGS="cxx=${CXX}" + AESARA_FLAGS+=",config.gcc__cxxflags=\"${CXXFLAGS}\"" + AESARA_FLAGS+=',compiledir_format="compiledir_%(thread_id)s"' + + epytest -p xdist.plugin -n "$(makeopts_jobs)" + # clean up the compiledir, as it can grow pretty large + rm -r "${HOME}"/.aesara || die +} + +python_compile() { + esetup.py build_py + distutils-r1_python_compile + rm "${BUILD_DIR}/install$(python_get_sitedir)/bin/__init__.py" || die +} + +pkg_postinst() { + optfeature "GPU code generation/execution on NVIDIA gpus" dev-util/nvidia-cuda-toolkit dev-util/nvidia-cuda-sdk + optfeature "GPU/CPU code generation on CUDA and OpenCL devices" dev-libs/libgpuarray dev-python/pycuda +} diff --git a/dev-python/aesara/files/aesara-2.6.5-compiledir-tid.patch b/dev-python/aesara/files/aesara-2.6.5-compiledir-tid.patch new file mode 100644 index 000000000000..aa36fc26fb12 --- /dev/null +++ b/dev-python/aesara/files/aesara-2.6.5-compiledir-tid.patch @@ -0,0 +1,46 @@ +From 6e49c314cd5050763f983759d156f26ffbc59368 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> +Date: Sat, 7 May 2022 23:38:31 +0200 +Subject: [PATCH] Allow referencing thread identifier in `compiledir_format` + +Add a new `thread_id` key that permits referencing the current thread ID +(`threading.get_ident()`) in `compiledir_format`. This makes it +possible to use per-thread compiledirs in multithreaded programs, +and therefore make it possible for aesara to run multiple compiler +instances in parallel. + +Combined with pytest-xdist, this change makes it possible to run +aesara's tests in parallel and better utilize multiprocessor (multicore) +systems. On my Ryzen 5, this provides around 4x speedup (down from 82 +minutes to 20 minutes per test run). Given that we are running the test +suite multiple times to test different Python versions, this literally +saves hours at a time. + +Prior to this change, xdist would not be able to fully utilize +the available resources since the compiledir lock would prevent aesara +from starting multiple compiler instances in parallel, and therefore +practically serialize tests on compiler invocations. +--- + aesara/configdefaults.py | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/aesara/configdefaults.py b/aesara/configdefaults.py +index 8121919958..60eb4f997e 100644 +--- a/aesara/configdefaults.py ++++ b/aesara/configdefaults.py +@@ -7,6 +7,7 @@ + import socket + import sys + import textwrap ++import threading + + import numpy as np + +@@ -1345,6 +1346,7 @@ def _get_home_dir(): + "numpy_version": np.__version__, + "gxx_version": "xxx", + "hostname": socket.gethostname(), ++ "thread_id": threading.get_ident(), + } + + |