Gentoo Archives: gentoo-commits

From: Andrew Ammerlaan <andrewammerlaan@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/miopen/, sci-libs/miopen/files/
Date: Thu, 22 Sep 2022 10:19:21
Message-Id: 1663841921.ce369e4a15e0df245cfcd626611bda81fd39327f.andrewammerlaan@gentoo
1 commit: ce369e4a15e0df245cfcd626611bda81fd39327f
2 Author: Yiyang Wu <xgreenlandforwyy <AT> gmail <DOT> com>
3 AuthorDate: Thu Sep 22 03:35:20 2022 +0000
4 Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
5 CommitDate: Thu Sep 22 10:18:41 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce369e4a
7
8 sci-libs/miopen: drop 4.3.0
9
10 Signed-off-by: Yiyang Wu <xgreenlandforwyy <AT> gmail.com>
11 Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
12
13 sci-libs/miopen/Manifest | 1 -
14 sci-libs/miopen/files/miopen-4.3.0-no-strip.patch | 16 -----
15 .../files/miopen-4.3.0-strip-xnack-in-flags.patch | 18 -----
16 sci-libs/miopen/miopen-4.3.0.ebuild | 80 ----------------------
17 4 files changed, 115 deletions(-)
18
19 diff --git a/sci-libs/miopen/Manifest b/sci-libs/miopen/Manifest
20 index c987c1548233..39e5f94389f6 100644
21 --- a/sci-libs/miopen/Manifest
22 +++ b/sci-libs/miopen/Manifest
23 @@ -1,3 +1,2 @@
24 -DIST MIOpen-4.3.0.tar.gz 59405686 BLAKE2B fe91bd91a74023866883d6d0a2a8071a8fe40c4cff2fb4ef58fc6e343a05ac2a731f73e657f4d183ade4e5b7c1fbbe41f3f032918f6e50cb713073aee8d97dc5 SHA512 a8615b7738acfbc7f68d9417b0746c62630d2b48fb8485fafba4db65a4b277a8230f601d249d7e54f89ba25c14176429ca76ad8365a437b09d836b031b0c4fbb
25 DIST MIOpen-5.0.2.tar.gz 76294827 BLAKE2B 7b2a1f0e675793aee4a0fa2a270caac8332cda36c8f04cee483cc2882ed987b6e676e9c24a1acf4976a16a10f922b1a6263470b419aa88a29cfcb6d6d4b4cc29 SHA512 a581b45220797904db3e4dd3840f2ef96085f00baf8187c5ab574325a66da4f599dee6496457bb1cc32825b57a13fb0ef35a2ef1bd2a5f449c7e7b9fa64b27d1
26 DIST MIOpen-5.1.3.tar.gz 88118329 BLAKE2B d24722ffc5f5dab6d6a1de2ce34193ad2f25c9a2562e38c52e010a29870f01d9ea1c56970ba0601a088c8286e97958ee95d0da27fc8082126dd2ebe5ccb36b70 SHA512 a14e28cfcb12e5061e0e7b999ef3e67fa0a0e897e31bc50e7288b8a23eb1791312e33d3b697021c2b654ccc065ae1b046c1cfd77ba8e04b0f3e87e9cc0626dcd
27
28 diff --git a/sci-libs/miopen/files/miopen-4.3.0-no-strip.patch b/sci-libs/miopen/files/miopen-4.3.0-no-strip.patch
29 deleted file mode 100644
30 index 2d0565821063..000000000000
31 --- a/sci-libs/miopen/files/miopen-4.3.0-no-strip.patch
32 +++ /dev/null
33 @@ -1,16 +0,0 @@
34 -Don't strip for release. Let portage handle stripping.
35 ---- orig/CMakeLists.txt
36 -+++ MIOpen-rocm-4.3.0/CMakeLists.txt
37 -@@ -69,12 +69,6 @@ set(MIOPEN_ENABLE_SQLITE_BACKOFF On CACH
38 - option( BUILD_DEV "Build for development only" OFF)
39 -
40 -
41 --# Strip symbols for release
42 --if(NOT WIN32 AND NOT APPLE)
43 -- set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -s")
44 -- set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s")
45 --endif()
46 --
47 - rocm_setup_version(VERSION 2.12.0)
48 -
49 - list( APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake )
50
51 diff --git a/sci-libs/miopen/files/miopen-4.3.0-strip-xnack-in-flags.patch b/sci-libs/miopen/files/miopen-4.3.0-strip-xnack-in-flags.patch
52 deleted file mode 100644
53 index dc6db68c2afc..000000000000
54 --- a/sci-libs/miopen/files/miopen-4.3.0-strip-xnack-in-flags.patch
55 +++ /dev/null
56 @@ -1,18 +0,0 @@
57 -if options like :xnack- exists in ${AMDGPU_TARGETS}, CMakeLists cannot handle HIP_COMPILER_FLAGS well
58 -
59 -the original regex replace should include :+- so xnack- is stripped as well. Otherwise clang complation at MIOpen runtime will fail.
60 -
61 -Signed-off-by: Yiyang Wu <xgreenlandforwyy@×××××.com>
62 ---- orig/CMakeLists.txt
63 -+++ MIOpen-rocm-4.3.0/CMakeLists.txt
64 -@@ -191,8 +191,8 @@ find_package(hip REQUIRED PATHS /opt/roc
65 - message(STATUS "Build with HIP ${hip_VERSION}")
66 - target_flags(HIP_COMPILER_FLAGS hip::device)
67 - # Remove cuda arch flags
68 --string(REGEX REPLACE --cuda-gpu-arch=[a-z0-9]+ "" HIP_COMPILER_FLAGS "${HIP_COMPILER_FLAGS}")
69 --string(REGEX REPLACE --offload-arch=[a-z0-9]+ "" HIP_COMPILER_FLAGS "${HIP_COMPILER_FLAGS}")
70 -+string(REGEX REPLACE --cuda-gpu-arch=[a-z0-9:+-]+ "" HIP_COMPILER_FLAGS "${HIP_COMPILER_FLAGS}")
71 -+string(REGEX REPLACE --offload-arch=[a-z0-9:+-]+ "" HIP_COMPILER_FLAGS "${HIP_COMPILER_FLAGS}")
72 -
73 - # Override HIP version in config.h, if necessary.
74 - # The variables set by find_package() can't be overwritten,
75
76 diff --git a/sci-libs/miopen/miopen-4.3.0.ebuild b/sci-libs/miopen/miopen-4.3.0.ebuild
77 deleted file mode 100644
78 index 41e9131d7714..000000000000
79 --- a/sci-libs/miopen/miopen-4.3.0.ebuild
80 +++ /dev/null
81 @@ -1,80 +0,0 @@
82 -# Copyright 1999-2022 Gentoo Authors
83 -# Distributed under the terms of the GNU General Public License v2
84 -
85 -EAPI=7
86 -
87 -inherit cmake
88 -
89 -DESCRIPTION="AMD's Machine Intelligence Library"
90 -HOMEPAGE="https://github.com/ROCmSoftwarePlatform/MIOpen"
91 -SRC_URI="https://github.com/ROCmSoftwarePlatform/MIOpen/archive/rocm-${PV}.tar.gz -> MIOpen-${PV}.tar.gz"
92 -
93 -LICENSE="MIT"
94 -KEYWORDS="~amd64"
95 -SLOT="0/$(ver_cut 1-2)"
96 -
97 -IUSE="debug test"
98 -RESTRICT="!test? ( test )"
99 -
100 -RDEPEND="
101 - dev-util/hip:${SLOT}
102 - >=dev-db/sqlite-3.17
103 - dev-libs/ocl-icd
104 - dev-util/rocm-clang-ocl:${SLOT}
105 - sci-libs/rocBLAS:${SLOT}
106 - dev-libs/boost
107 -"
108 -
109 -DEPEND="${RDEPEND}"
110 -
111 -BDEPEND="dev-libs/half:0/1"
112 -
113 -S="${WORKDIR}/MIOpen-rocm-${PV}"
114 -
115 -PATCHES=(
116 - "${FILESDIR}/${PN}-4.2.0-disable-no-inline-boost.patch"
117 - "${FILESDIR}/${PN}-4.2.0-gcc11-numeric_limits.patch"
118 - "${FILESDIR}/${PN}-4.3.0-strip-xnack-in-flags.patch"
119 - "${FILESDIR}/${PN}-4.3.0-fix-interface-include-in-HIP_COMPILER_FLAGS.patch"
120 - "${FILESDIR}/${PN}-4.3.0-enable-test.patch"
121 - "${FILESDIR}/${PN}-4.3.0-no-strip.patch"
122 -)
123 -
124 -src_prepare() {
125 - sed -e "s:/opt/rocm/llvm:""${EPREFIX}""/usr/lib/llvm/roc/ NO_DEFAULT_PATH:" \
126 - -e "s:/opt/rocm/hip:""${EPREFIX}""/usr/lib/hip/ NO_DEFAULT_PATH:" \
127 - -e '/set( MIOPEN_INSTALL_DIR/s:miopen:${CMAKE_INSTALL_PREFIX}:' \
128 - -e '/set(MIOPEN_SYSTEM_DB_PATH/s:${CMAKE_INSTALL_PREFIX}/::' \
129 - -e '/MIOPEN_TIDY_ERRORS ALL/d' \
130 - -i CMakeLists.txt || die
131 -
132 - sed -e "/rocm_install_symlink_subdir(\${MIOPEN_INSTALL_DIR})/d" -i src/CMakeLists.txt || die
133 - sed -e "/add_test/s:--build \${CMAKE_CURRENT_BINARY_DIR}:--build ${BUILD_DIR}:" -i test/CMakeLists.txt || die
134 -
135 - sed -e "s:\${AMD_DEVICE_LIBS_PREFIX}/lib:${EPREFIX}/usr/lib/amdgcn/bitcode:" -i cmake/hip-config.cmake || die
136 -
137 - cmake_src_prepare
138 -}
139 -
140 -src_configure() {
141 - if ! use debug; then
142 - append-cflags "-DNDEBUG"
143 - append-cxxflags "-DNDEBUG"
144 - CMAKE_BUILD_TYPE="Release"
145 - else
146 - CMAKE_BUILD_TYPE="Debug"
147 - fi
148 -
149 - export CXX="${EPREFIX}/usr/lib/llvm/roc/bin/clang++"
150 -
151 - local mycmakeargs=(
152 - -DCMAKE_SKIP_RPATH=ON
153 - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
154 - -DMIOPEN_BACKEND=HIP
155 - -DBoost_USE_STATIC_LIBS=OFF
156 - -DBUILD_TESTS=$(usex test ON OFF)
157 - ${AMDGPU_TARGETS+-DAMDGPU_TARGETS="${AMDGPU_TARGETS}"}
158 - )
159 -
160 - cmake_src_configure
161 -}