From 510d906303d72ac4399f1c4f3379cc30b912afe1 Mon Sep 17 00:00:00 2001 From: Igor Ulyanov Date: Sun, 19 Feb 2023 20:06:21 +0300 Subject: initial enable ROCM useflag Signed-off-by: Igor Ulyanov --- sci-libs/onnxruntime/Manifest | 3 +- ...ime-1.9.1-get-rocm-version-from-hipconfig.patch | 37 ++++++++++++++++++++++ sci-libs/onnxruntime/onnxruntime-1.9.1.ebuild | 4 ++- 3 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 sci-libs/onnxruntime/files/onnxruntime-1.9.1-get-rocm-version-from-hipconfig.patch diff --git a/sci-libs/onnxruntime/Manifest b/sci-libs/onnxruntime/Manifest index be3964f..755eb6d 100644 --- a/sci-libs/onnxruntime/Manifest +++ b/sci-libs/onnxruntime/Manifest @@ -1,4 +1,5 @@ AUX onnxruntime-1.9.1-fix-RepeatedIterator-compile-error.patch 1356 BLAKE2B 28f8c64f1092954b36726cd5550e3db9ce84aebfe158ed987b5e31104ae73c38c59a6e94d8fdaf15ca08ce186df3fae1e0f0e9c13c3d68ea45c8d9953d6218ab SHA512 97e59b8ce0ea217b77ffdac9167c7565fc6f72c6db1bbd68e71e5b3bdc616056c4abd0aa323e36b03f065202605ede0502e3ad112c5d092e1c1b707463817f5e +AUX onnxruntime-1.9.1-get-rocm-version-from-hipconfig.patch 1848 BLAKE2B 248992b6ac21c4caa2501e326a4aa157605a3bfa84a33a397ded8937ab71dfe8253360bb6b5038aa9cdf189533accfd54aa69a2d7f74e7244f85c6f9c7f2ef3f SHA512 877c03ffe53e3d5fb24d0db103b9a031a51d998985f22d8295207159ef7cd65174c6c86ce1b179861fd40fa1abfedd01df68410b4892b5b4922ea93e65594c3a AUX onnxruntime-1.9.1-system_libs.patch 3196 BLAKE2B b9107002944c53daaa9ac7da7daad84366f4e3ddfec6d7af677f960fc9cb95a8370dcd109c3942ab259e9193a93985514df653f10d5e6d66b993a3a9cb938396 SHA512 5b739446c8adc0dec6442577f6fbaca57a2c0f0acce83ae20a96cf3d12218118dbc318c979b69f03aeb21b02c8b02b1c64efb2c17bfc00d846698aa5af3494a4 DIST SafeInt-a104e0cf23.tar.gz 541952 BLAKE2B 6a7d025dce9aae6090704783aef4d1e71298c6e99af1d322f2ecf6c1504bf1c0c38140255f77b6f178fe23edb61b23a633b191c1b7d2b736692ba33a27916843 SHA512 95a0784e0d79e1a712e454475d1863732b5cf03abd83687e84fc9f1b993ecf0d47a3a252cd5b86a2baea3c194406c8b4678d6d6f8d86e89a18602270ddee18b9 DIST boost_mp11-21cace4e574.tar.gz 104182 BLAKE2B 9c4c103cab0a6d738a38bc0afd7752233592f47b55434de4af15f927f1b2711ca5fc47e8a2edb5e2991e9d554ae7303dd19a0386109b470f052089b25df79101 SHA512 82b32466c2287f87b16b3244793dac6eb1a34c52f3ebabf5a19f1f2527253e14f23349290e5ba9b5171503e2392debc7e1e4c75ce5fa0c7c9778afe658984423 @@ -9,4 +10,4 @@ DIST onnxruntime-1.9.1.tar.gz 290241910 BLAKE2B c0bbd2f987978f1d995c652904a79af3 DIST optional-lite-4acf4553ba.tar.gz 48384 BLAKE2B 63c310bb115310df95a3a95fd917b2c9c0dd91533aec06390a285d923f8b80f1f6a9322fae6837d2bcc933e5b0261ea1262157f177960a47fad48fa4a0135aa9 SHA512 f3ab8dc3b6705ebd201943cbcdce5cf5c75b1ced317561890d74be351e707b65db4a6b3bce6bef91f94d28c68715e58be9c7b522adec93c1acbb31ceb8fc0447 DIST pytorch-cpuinfo-5916273f79.tar.gz 3496223 BLAKE2B 4da452faf12138fbc1abd266d8ae6e0a0192f48a84faccb55fd05c3ac85d0bea2ecbd80b5eda69bb51c6704a223f90dd83d1f0fc79d56d35dd21cae5c5b8fab5 SHA512 50e537b61d991e8579577fb1ecf8d9ceb2171dbad96dfe159a062eadfdc0b2372b94988fc6f223c20e327453c7f55042ee06779f5b5fe0922f4470f746c9686b EBUILD onnxruntime-1.14.0.ebuild 2308 BLAKE2B f2eb8bd3eb866288c2f6369487a7e765ffe2bf718879856892b8fb57752cbbb71ff98bf1fad465b65ab473e8bb9abfffd0bddbda2441e88ba195056b1d395c82 SHA512 917297f36e05512756fd6f13f54ec0a413709585413320c9e6a26428a886c3c5935d8a91d3823109858392cd9173b3f72bd83a89f6453d3c83d0bc0bef2099e6 -EBUILD onnxruntime-1.9.1.ebuild 3202 BLAKE2B 979fe6931e88341ec468ad7a253b20c73f39eb6e04f80faa4156d4de62ed47b6b8c9cfe9ce25f0ec6d1621de99e736f344c95ad2356589f450d99ed894e1c81f SHA512 04152aaa6768dadc791bd1d6a3c0f7cd74ffb020f8a99796380d3b8b9ba14cb2a565774bcae80efa0f41f2c2f7d41b13c695760becf91e1f72cfded364f05076 +EBUILD onnxruntime-1.9.1.ebuild 3303 BLAKE2B d591c0990b5d6789500ffebfa2355a0c4f6489d948e8641dda383d41848e3071bd37c20153e3b4a27c5e88c6e87d1388d478eb484363710ebf0c4898271fd738 SHA512 65f3289eeb1355424d1d3cae56259ca6ee0fb2c4fd27ee6e8113535759685c60b8a133fddc5f36be949399447e07fdae019dbe7616c8620addeebf0f728f5627 diff --git a/sci-libs/onnxruntime/files/onnxruntime-1.9.1-get-rocm-version-from-hipconfig.patch b/sci-libs/onnxruntime/files/onnxruntime-1.9.1-get-rocm-version-from-hipconfig.patch new file mode 100644 index 0000000..ac57841 --- /dev/null +++ b/sci-libs/onnxruntime/files/onnxruntime-1.9.1-get-rocm-version-from-hipconfig.patch @@ -0,0 +1,37 @@ +From d299f50832f88f7d4e46b760f277782cee30f01f Mon Sep 17 00:00:00 2001 +From: Igor Ulyanov +Date: Sun, 19 Feb 2023 19:45:15 +0300 +Subject: [PATCH] get rocm version from hipconfig + +--- + cmake/CMakeLists.txt | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt +index 2534b99ff4..e79d43451e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1609,8 +1609,9 @@ if (onnxruntime_USE_ROCM) + + # replicate strategy used by pytorch to get ROCM_VERSION + # https://github.com/pytorch/pytorch/blob/8eb21488fdcdb8b0e6fa2e46179b5fa6c42e75af/cmake/public/LoadHIP.cmake#L153-L173 +- file(READ "${ROCM_PATH}/.info/version-dev" ROCM_VERSION_DEV_RAW) +- string(REGEX MATCH "^([0-9]+)\.([0-9]+)\.([0-9]+)-.*$" ROCM_VERSION_DEV_MATCH ${ROCM_VERSION_DEV_RAW}) ++ # file(READ "${ROCM_PATH}/.info/version-dev" ROCM_VERSION_DEV_RAW) ++ execute_process(COMMAND hipconfig -v OUTPUT_VARIABLE ROCM_VERSION_DEV_RAW) ++ string(REGEX MATCH "^([0-9]+)\.([0-9]+)\.([0-9]+)(-.*)?$" ROCM_VERSION_DEV_MATCH ${ROCM_VERSION_DEV_RAW}) + if(ROCM_VERSION_DEV_MATCH) + set(ROCM_VERSION_DEV_MAJOR ${CMAKE_MATCH_1}) + set(ROCM_VERSION_DEV_MINOR ${CMAKE_MATCH_2}) +@@ -1618,7 +1619,7 @@ if (onnxruntime_USE_ROCM) + set(ROCM_VERSION_DEV "${ROCM_VERSION_DEV_MAJOR}.${ROCM_VERSION_DEV_MINOR}.${ROCM_VERSION_DEV_PATCH}") + math(EXPR ROCM_VERSION_DEV_INT "(${ROCM_VERSION_DEV_MAJOR}*10000) + (${ROCM_VERSION_DEV_MINOR}*100) + ${ROCM_VERSION_DEV_PATCH}") + endif() +- message("\n***** ROCm version from ${ROCM_PATH}/.info/version-dev ****\n") ++ message("\n***** ROCm version from hipconfig -v ****\n") + message("ROCM_VERSION_DEV: ${ROCM_VERSION_DEV}") + message("ROCM_VERSION_DEV_MAJOR: ${ROCM_VERSION_DEV_MAJOR}") + message("ROCM_VERSION_DEV_MINOR: ${ROCM_VERSION_DEV_MINOR}") +-- +2.39.1 + diff --git a/sci-libs/onnxruntime/onnxruntime-1.9.1.ebuild b/sci-libs/onnxruntime/onnxruntime-1.9.1.ebuild index 2bbde3b..d6d82b3 100644 --- a/sci-libs/onnxruntime/onnxruntime-1.9.1.ebuild +++ b/sci-libs/onnxruntime/onnxruntime-1.9.1.ebuild @@ -26,7 +26,7 @@ SRC_URI=" LICENSE="MIT" SLOT="0" KEYWORDS="~amd64" -IUSE="benchmark test" +IUSE="benchmark test rocm" # libonnxruntime_framework.so: undefined reference to `onnx::AttributeProto_AttributeType_Name[abi:cxx11](onnx::AttributeProto_AttributeType)' RESTRICT="test" @@ -53,6 +53,7 @@ DEPEND=" PATCHES=( "${FILESDIR}/${P}-system_libs.patch" + "${FILESDIR}/${P}-get-rocm-version-from-hipconfig.patch" ) src_unpack() { @@ -91,6 +92,7 @@ src_configure() { -Donnxruntime_PREFER_SYSTEM_LIB=ON -Donnxruntime_BUILD_BENCHMARKS=$(usex benchmark) -Donnxruntime_BUILD_UNIT_TESTS=$(usex test) + -Donnxruntime_USE_ROCM=$(usex rocm) ) cmake_src_configure -- cgit v1.2.3-65-gdbad