summaryrefslogtreecommitdiff
path: root/sci-libs/miopen
diff options
context:
space:
mode:
Diffstat (limited to 'sci-libs/miopen')
-rw-r--r--sci-libs/miopen/Manifest6
-rw-r--r--sci-libs/miopen/files/miopen-5.0.2-strip-xnack-in-flags.patch20
-rw-r--r--sci-libs/miopen/files/miopen-5.1.3-avoid-metadata-error-for-vanilla-clang.patch183
-rw-r--r--sci-libs/miopen/files/miopen-5.1.3-deprecate-clang-ocl.patch55
-rw-r--r--sci-libs/miopen/files/miopen-5.1.3-gfx1031.patch375
-rw-r--r--sci-libs/miopen/miopen-5.1.3-r1.ebuild110
6 files changed, 0 insertions, 749 deletions
diff --git a/sci-libs/miopen/Manifest b/sci-libs/miopen/Manifest
index 0152019ae479..67dbecd71ef5 100644
--- a/sci-libs/miopen/Manifest
+++ b/sci-libs/miopen/Manifest
@@ -2,10 +2,6 @@ AUX miopen-4.2.0-disable-no-inline-boost.patch 447 BLAKE2B ed62e94b4a557c06654ec
AUX miopen-4.2.0-gcc11-numeric_limits.patch 461 BLAKE2B 4502c7dc41e0e4ebf4105076c4415ce36e56e596bf98672ecf3d77de4a984499be0990a762c2b05d5e395a06c7df511c9f7629362c7849b31a0d2868b45d99d0 SHA512 04ce10c55af9b979651ef0c345bd12156c850139809601f29ab9305235499b53034efe1928a6dbb77d04114ddf8d93c71d37cc7bef373b07620c2169f88aebc3
AUX miopen-4.3.0-enable-test.patch 1046 BLAKE2B a9a103eee9b3b6890c02349f36dba7c4cc4459969ebe07915d0cccd3aecbd0edab21de8acbdaee17daae602733965ec1bdda60456f2e0c6bd91ae9795c24622e SHA512 cadc3844aaa32713f0d630ae3ffb9a947c303cf80410785339187ad0ee3cce8bac1b201c12134ba0241c54c296e2752a1076a3826735ccfe4d2cf5f15504f390
AUX miopen-4.3.0-fix-interface-include-in-HIP_COMPILER_FLAGS.patch 954 BLAKE2B 11f260c1ab9dd1569cf25363626e6431615f8853f334b0123d82b0e3404dcdb1b4ecd9e26658e2f39e4fa6a15ba672cb6940b0279e0ef22535e46992721fd060 SHA512 28724e7e1c1de5cee2d18b6c3da76fa857f95aee64a286262c8426149787f62d07f4a3892472cef91d3c091ec53c7f474a70616ce63e5fbbb4c531ed2ab91a50
-AUX miopen-5.0.2-strip-xnack-in-flags.patch 1205 BLAKE2B d1ba065387050b51288dba37631adea42398b2f7cd8b604e5c305d3491fb661dce8c448e31db42c70f8b6e4dec84c4214ce869dd1419eb67c2ea4c33f18849b5 SHA512 ad32335831c7d1057b53469aa2d1f8f3366b23ccdc71cb7e9a4e7813e7da7e9bb73e62465f1086391653538ccbab2f662baf2446e10e8dbc0f0db631d7368a4d
-AUX miopen-5.1.3-avoid-metadata-error-for-vanilla-clang.patch 10748 BLAKE2B 582b362a54d9ee00c8f6062b4ec16bebdaea7734adadcd5f6201801cb8ce3a7ca64e8148a10f2f3ab682560ced1f037b217bdcd161869d80a8489f4d56bd5241 SHA512 08cd489d23a48d0b227dacc514e3f84999c1e9a0ac3dd5424d9376c77c4d745c65f48c0f470cb5e65c20e9dbbfcb457995301a74bfe27a81604bf89213a2f1d2
-AUX miopen-5.1.3-deprecate-clang-ocl.patch 2884 BLAKE2B 4f45f66d87dea51d9f87878f52520863b36defa1403055a580e5f33c18e3de08daad1b3d3d5fad06d7d3f16da4f0945390872f573f168d1893f5f635070f1463 SHA512 c4835559a4005ffd2aac7afb38213d06857ab1a8d4bc5bd5c150b82226671fb1d66c6ef1d4eab2106ad11c475007af441182ca26f659a3fd779cd7d4f5c90247
-AUX miopen-5.1.3-gfx1031.patch 19268 BLAKE2B b3d10c57601fd5f39ae431d101687863de34b149ee08df25c987d18ef0bd89d8419a4a18659a22060093eba1cf97c2774e92abf8a38449a202e8770070b29dbf SHA512 44fb3445065087a3952ac143fba88addb4cc634dbd13e15d85d234c64fabba9cf7b83d8161a361e847375a2bc92efc86489e12cfa23ecce1b035d2ccb028db56
AUX miopen-5.1.3-include-array.patch 343 BLAKE2B 993a8f3e301f4c16088ca216b2d820b17ceb42eeda4550b4291a70e00592281f992bf184407d024a0f8b2207a26fef2d56c26ef95e7a452d3b97090e1335a404 SHA512 887ac13f25c1bfd524bb2a3be701bf688f002a95ef8218cb798e41feaeb0678dbbd2ffaf905c59070a125001093bf5ede1bb6a77fdfe6f7a4ff19cbccfdc6624
AUX miopen-5.1.3-no-strip.patch 608 BLAKE2B 3173d95219542a48c6dcd2b87e7157dcf483ff714c3d1c1c47aab8fc8af7b1fd4f6ac52b9d8e892cc25bff973597f4a05426fa4714b0764733b810867af59cfe SHA512 201357718203ee9a4062362541c483e069321b825708c6aa0e8892cc7722bcd520808797307e320df34c4fbf0003198f7a46717d5ff3819b1e2c3a5a3a045725
AUX miopen-5.7.1-fix-miopendriver-gemm.patch 2818 BLAKE2B fd839ec500b297272f70cc1ee2fa87e74b8a70197cc72291c99c1372c9eeb7f2af33de8067fa1dc42d873bd96f93615074521c00f00b0676835c912ec0e2b73b SHA512 22c852082e0de5115acfa208c325cdb7870823dfe3b5984887c848b702a2fc5072c1d1944b218e27776f0e116d391c6039c3f8485ca65282e9699f3fc1885985
@@ -13,13 +9,11 @@ AUX miopen-6.1.1-build-all-tests.patch 548 BLAKE2B be700c5401e288a4da5423047303a
AUX miopen-6.1.1-fix-libcxx.patch 7454 BLAKE2B 143e69445abef40e30879ad8e38730b585a1acb17c7fee711dcc9f957cc42805ccd79457aabfd77587c790b8bb99b87c7b9d39525977b5e940a665134bf49856 SHA512 7605ab2db5c2f6d7a06ffd073f8b6bae77f04c710ffa08364af079817e5686c18e468159afec43832029c9b099a34678bd4269f10f31c141beb44ff2a59fea76
AUX miopen-6.3.0-conditional-ck-components.patch 2393 BLAKE2B cf41a17b7078664042d851ddf99ed9a702f30f6b2d9f2af9f8c164066e8cc127cd7bf99d950e4cae4d8718887c96632171804a17fd0a2dcb36a73e24299b79c0 SHA512 281c9f64c924c1cd7acf808678f52b7b32417b2b6532c0d9413b71e08c85392b296cde88a9fa50f3f18a91091a280cfaa1820ac389196d9637b0a57e4807e090
AUX miopen-6.3.0-isnan-include.patch 636 BLAKE2B 78eb4506461059191ef7999ea8252a0c50e99317ae32d25ee19f26cdc8086cca7cfbffa2b87cde8fc298696483961067929e5c68e5851582d8e94256ab08d770 SHA512 91154725cc22b52f5d6f72fe6bf11f496b033a16889f08041e81c4a814f5095ae75dcad1a00e8e93b7102c712f8b9f5ed58efc86f0fb949e85db0560ecb83468
-DIST MIOpen-5.1.3.tar.gz 88118329 BLAKE2B d24722ffc5f5dab6d6a1de2ce34193ad2f25c9a2562e38c52e010a29870f01d9ea1c56970ba0601a088c8286e97958ee95d0da27fc8082126dd2ebe5ccb36b70 SHA512 a14e28cfcb12e5061e0e7b999ef3e67fa0a0e897e31bc50e7288b8a23eb1791312e33d3b697021c2b654ccc065ae1b046c1cfd77ba8e04b0f3e87e9cc0626dcd
DIST MIOpen-5.7.1.tar.gz 100751593 BLAKE2B c5f847fe4374ab22737c281a65401125012328412d584fc09244b431ea6265d6d5028429115ee15fa8b04cbe0edd020e4e7ac8deb22561183ed76cb8c3d4d9d4 SHA512 3354b3b154f29a6337403abc5a71ec47c0b2558320c5a1b0cbfbbdb370c4fada2db12d4a19a312b5e30ca2e2302ee50ece3390603e84d132b2212a168e9523fa
DIST MIOpen-6.1.1.tar.gz 101935496 BLAKE2B 5aadaa5eefa1b22dedfe87deb36f8acdbe57962cac8b7b6b20bc76f136ef29f0441e48112010280c2e674a1ae9fd202ca3e07be47cf4a4bc797234d6dc618be5 SHA512 b8860583919bf2f3e0da7ace30fdb0595ab45b85a367be3737e0b15a22a5565b8d6660c652ee070f21c36ac7d17ef3ba8e2eda7ed89bd6a0c65a4df799626d1a
DIST MIOpen-6.3.0.tar.gz 104152308 BLAKE2B 46c238314393599a1bd4d3c49b0c95386b36cbee1831bf442ab127082b4c740116e81cf643c773627125b59c3974a2344753939b4287aa4adbbc51e4c4833988 SHA512 14ca2967ed6545ad68c362128be93b8e6a9d4aa69e16e989b187463d15351eca2fc437d07e88c41f693138131a7449add607333c698e24efaf0207077e15ae55
DIST MIOpen-6.3.2.tar.gz 104156821 BLAKE2B e7611ea2d37d3c72cde2e6be153271dacd7150083ec63ec2357e1c808dc9e79c1928f06fd4e70712989c5ab13a604a91d3fba1819723da12b49f6a447a561f3c SHA512 bf219459244c8f0962c54a8e94273aeeafe4b9b093c72ac962fa9d373526c9dc406c46d0464ec6b20d52b1e6c01e2cf2544267b573a0e774c7afd4ba9adc9fb9
DIST gtest-1.11.0_p20210611.tar.gz 887296 BLAKE2B 8f29b7028a6dd8190a113cd93398705b23b61d88bee38beaf9dcc0dfc8a463aed7fcd3719f6f1b131d4363aa57231629aaeffa108f6558efb58416cfface6d6e SHA512 cf9e7f3fd3e31ce6677eac355fb8bfe19c5b56a8ec3af8b9417d0904cdf5da92f99f7411a08131cc9fa4fc7d38e6a71fcfac993648e47b269a74a27de7607f7a
-EBUILD miopen-5.1.3-r1.ebuild 3182 BLAKE2B a6ae78e487ea88d31693fcf1b96a7ce6a1cb0505311c2f101be498bcafce5436cc678ca83e10dafc27549b3121c01cbf0c5d2a35e7f6117de086879002ecc138 SHA512 2165e4d250f125f699963bc7b6f1c22598467e962c9aac1bb7eeff24d6091fa3b72a696a11e1ab80ea18710525ef00f99889cc5b972068e23340c4eb14b621ef
EBUILD miopen-5.7.1-r1.ebuild 3338 BLAKE2B bbd84a39a04c4ef9e1b2dc42ff1bbe7b7e4ceda90ca0c82f416a05a55b1324727418e1c2c1446fe7a82800d23380cfb9a3e30463289a18e9af20ab10239cbfc7 SHA512 5a8ddf01d2c088325fd377499f80b3c1f84881d52596b53450f2ce07714e53a552304bd8a24aecf394a57ee039fd6f364642f93e7920d8d9df63bb7dd312057e
EBUILD miopen-6.1.1.ebuild 2347 BLAKE2B e00b587186711d0a4d51cf354c9cac89fdf0d3a3b05be358adcbb30a1e2cf86f68ad3c4ea136d2015755d814f9f347662343e84be8d7a6aa9f7366f193fa3108 SHA512 d94bef9186d91886d3fcc9310a9d2b12dc6885efb1dc340d8c78e8cf1899a180cf4cd8db2f0749f6ffde19f10e9db23d768d3690ddc758b17b3281c02248e0ae
EBUILD miopen-6.3.0.ebuild 3562 BLAKE2B 86359acdab8fc60cf038fa829ec1c9a1a68717c3d3eb72fef93a36d106b4ca2453616ad4b4682ed25ca5658414f0a082b840dfbdf6bd82cd2d9d965315a3fcff SHA512 3d20eaf391ffe598e7707a1e12d41ae0e0383dc38b4b97a5b9848f13365547456bd504d9776a71d54798c6bfbfdfa0628f63eec1d4ad9afdb107a3c547cf9198
diff --git a/sci-libs/miopen/files/miopen-5.0.2-strip-xnack-in-flags.patch b/sci-libs/miopen/files/miopen-5.0.2-strip-xnack-in-flags.patch
deleted file mode 100644
index 14d2c5b9daa5..000000000000
--- a/sci-libs/miopen/files/miopen-5.0.2-strip-xnack-in-flags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-if options like :xnack- exists in ${AMDGPU_TARGETS}, CMakeLists cannot handle HIP_COMPILER_FLAGS well
-
-the original regex replace should include :+- so xnack- is stripped as well. Otherwise clang complation at MIOpen runtime will fail.
-
-Signed-off-by: Yiyang Wu <xgreenlandforwyy@gmail.com>
-Index: MIOpen-rocm-5.0.2/CMakeLists.txt
-===================================================================
---- MIOpen-rocm-5.0.2.orig/CMakeLists.txt
-+++ MIOpen-rocm-5.0.2/CMakeLists.txt
-@@ -198,8 +198,8 @@ find_package(hip REQUIRED PATHS /opt/roc
- message(STATUS "Build with HIP ${hip_VERSION}")
- target_flags(HIP_COMPILER_FLAGS hip::device)
- # Remove cuda arch flags
--string(REGEX REPLACE --cuda-gpu-arch=[a-z0-9]+ "" HIP_COMPILER_FLAGS "${HIP_COMPILER_FLAGS}")
--string(REGEX REPLACE --offload-arch=[a-z0-9]+ "" HIP_COMPILER_FLAGS "${HIP_COMPILER_FLAGS}")
-+string(REGEX REPLACE --cuda-gpu-arch=[a-z0-9:+-]+ "" HIP_COMPILER_FLAGS "${HIP_COMPILER_FLAGS}")
-+string(REGEX REPLACE --offload-arch=[a-z0-9:+-]+ "" HIP_COMPILER_FLAGS "${HIP_COMPILER_FLAGS}")
- string(REPLACE "$<LINK_LANGUAGE:CXX>" "1" HIP_COMPILER_FLAGS "${HIP_COMPILER_FLAGS}")
- string(REPLACE "SHELL:" "" HIP_COMPILER_FLAGS "${HIP_COMPILER_FLAGS}")
-
diff --git a/sci-libs/miopen/files/miopen-5.1.3-avoid-metadata-error-for-vanilla-clang.patch b/sci-libs/miopen/files/miopen-5.1.3-avoid-metadata-error-for-vanilla-clang.patch
deleted file mode 100644
index 3dca20f1fb12..000000000000
--- a/sci-libs/miopen/files/miopen-5.1.3-avoid-metadata-error-for-vanilla-clang.patch
+++ /dev/null
@@ -1,183 +0,0 @@
-Together with find-sed command in 5.1.3 ebuild, this fixes
-https://github.com/ROCmSoftwarePlatform/MIOpen/issues/1731
-index 71b2cabf1..60e7fab6e 100644
---- a/src/kernels/Conv_Winograd_v13_3_12_epilogue.inc
-+++ b/src/kernels/Conv_Winograd_v13_3_12_epilogue.inc
-@@ -76,7 +76,7 @@ amdhsa.kernels:
- .max_flat_workgroup_size: \wg_x
- .wavefront_size: 64
- .args:
-- - { .size: 4, .offset: 0, .value_kind: by_value, .value_type: i32, .name: N }
-+ - { .size: 4, .offset: 0, .value_kind: by_value, .value_type: i32, .name: X }
- - { .size: 4, .offset: 4, .value_kind: by_value, .value_type: i32, .name: C }
- - { .size: 4, .offset: 8, .value_kind: by_value, .value_type: i32, .name: H }
- - { .size: 4, .offset: 12, .value_kind: by_value, .value_type: i32, .name: W }
-diff --git a/src/kernels/Conv_Winograd_v16_5_0_epilogue.inc b/src/kernels/Conv_Winograd_v16_5_0_epilogue.inc
-index 36d47c862..f8f677ec6 100644
---- a/src/kernels/Conv_Winograd_v16_5_0_epilogue.inc
-+++ b/src/kernels/Conv_Winograd_v16_5_0_epilogue.inc
-@@ -76,7 +76,7 @@ amdhsa.kernels:
- .max_flat_workgroup_size: \wg_x
- .wavefront_size: 64
- .args:
-- - { .size: 4, .offset: 0, .value_kind: by_value, .value_type: i32, .name: N }
-+ - { .size: 4, .offset: 0, .value_kind: by_value, .value_type: i32, .name: X }
- - { .size: 4, .offset: 4, .value_kind: by_value, .value_type: i32, .name: C }
- - { .size: 4, .offset: 8, .value_kind: by_value, .value_type: i32, .name: H }
- - { .size: 4, .offset: 12, .value_kind: by_value, .value_type: i32, .name: W }
-diff --git a/src/kernels/Conv_Winograd_v21_1_3_metadata.inc b/src/kernels/Conv_Winograd_v21_1_3_metadata.inc
-index deff81e84..ed47abea7 100644
---- a/src/kernels/Conv_Winograd_v21_1_3_metadata.inc
-+++ b/src/kernels/Conv_Winograd_v21_1_3_metadata.inc
-@@ -51,7 +51,7 @@ amdhsa.kernels:
- .max_flat_workgroup_size: \wg_x
- .wavefront_size: 64
- .args:
-- - { .size: 4, .offset: 0, .value_kind: by_value, .value_type: i32, .name: N }
-+ - { .size: 4, .offset: 0, .value_kind: by_value, .value_type: i32, .name: X }
- - { .size: 4, .offset: 4, .value_kind: by_value, .value_type: i32, .name: C }
- - { .size: 4, .offset: 8, .value_kind: by_value, .value_type: i32, .name: H }
- - { .size: 4, .offset: 12, .value_kind: by_value, .value_type: i32, .name: W }
-diff --git a/src/kernels/conv1x1u.s b/src/kernels/conv1x1u.s
-index 5dc213546..c890d45a4 100644
---- a/src/kernels/conv1x1u.s
-+++ b/src/kernels/conv1x1u.s
-@@ -1076,7 +1076,7 @@ amdhsa.kernels:
- .max_flat_workgroup_size: \wg_x
- .wavefront_size: 64
- .args:
-- - { .size: 4, .offset: 0, .value_kind: by_value, .value_type: i32, .name: N }
-+ - { .size: 4, .offset: 0, .value_kind: by_value, .value_type: i32, .name: X }
- - { .size: 4, .offset: 4, .value_kind: by_value, .value_type: i32, .name: C }
- - { .size: 4, .offset: 8, .value_kind: by_value, .value_type: i32, .name: H }
- - { .size: 4, .offset: 12, .value_kind: by_value, .value_type: i32, .name: W }
-diff --git a/src/kernels/conv1x1u_bias_activ.s b/src/kernels/conv1x1u_bias_activ.s
-index 1675e819a..6bbdd9936 100644
---- a/src/kernels/conv1x1u_bias_activ.s
-+++ b/src/kernels/conv1x1u_bias_activ.s
-@@ -1230,7 +1230,7 @@ amdhsa.kernels:
- .max_flat_workgroup_size: \wg_x
- .wavefront_size: 64
- .args:
-- - { .size: 4, .offset: 0, .value_kind: by_value, .value_type: i32, .name: N }
-+ - { .size: 4, .offset: 0, .value_kind: by_value, .value_type: i32, .name: X }
- - { .size: 4, .offset: 4, .value_kind: by_value, .value_type: i32, .name: C }
- - { .size: 4, .offset: 8, .value_kind: by_value, .value_type: i32, .name: H }
- - { .size: 4, .offset: 12, .value_kind: by_value, .value_type: i32, .name: W }
-diff --git a/src/kernels/conv1x1u_stride2.s b/src/kernels/conv1x1u_stride2.s
-index c5ea1e90c..6241edcf7 100644
---- a/src/kernels/conv1x1u_stride2.s
-+++ b/src/kernels/conv1x1u_stride2.s
-@@ -1162,7 +1162,7 @@ amdhsa.kernels:
- .max_flat_workgroup_size: \wg_x
- .wavefront_size: 64
- .args:
-- - { .size: 4, .offset: 0, .value_kind: by_value, .value_type: i32, .name: N }
-+ - { .size: 4, .offset: 0, .value_kind: by_value, .value_type: i32, .name: X }
- - { .size: 4, .offset: 4, .value_kind: by_value, .value_type: i32, .name: C }
- - { .size: 4, .offset: 8, .value_kind: by_value, .value_type: i32, .name: H }
- - { .size: 4, .offset: 12, .value_kind: by_value, .value_type: i32, .name: W }
-diff --git a/src/kernels/conv1x1wrw.s b/src/kernels/conv1x1wrw.s
-index b13b6ffa4..eb63f17c6 100644
---- a/src/kernels/conv1x1wrw.s
-+++ b/src/kernels/conv1x1wrw.s
-@@ -1243,7 +1243,7 @@ amdhsa.kernels:
- .max_flat_workgroup_size: \wg_x
- .wavefront_size: 64
- .args:
-- - { .size: 4, .offset: 0, .value_kind: by_value, .value_type: i32, .name: N }
-+ - { .size: 4, .offset: 0, .value_kind: by_value, .value_type: i32, .name: X }
- - { .size: 4, .offset: 4, .value_kind: by_value, .value_type: i32, .name: C }
- - { .size: 4, .offset: 8, .value_kind: by_value, .value_type: i32, .name: H }
- - { .size: 4, .offset: 12, .value_kind: by_value, .value_type: i32, .name: W }
-diff --git a/src/kernels/conv3x3wrw.s b/src/kernels/conv3x3wrw.s
-index a3f73aeae..b6fb1632c 100755
---- a/src/kernels/conv3x3wrw.s
-+++ b/src/kernels/conv3x3wrw.s
-@@ -1033,7 +1033,7 @@ amdhsa.kernels:
- .max_flat_workgroup_size: \wg_x
- .wavefront_size: 64
- .args:
-- - { .size: 4, .offset: 0, .value_kind: by_value, .value_type: i32, .name: N }
-+ - { .size: 4, .offset: 0, .value_kind: by_value, .value_type: i32, .name: X }
- - { .size: 4, .offset: 4, .value_kind: by_value, .value_type: i32, .name: C }
- - { .size: 4, .offset: 8, .value_kind: by_value, .value_type: i32, .name: H }
- - { .size: 4, .offset: 12, .value_kind: by_value, .value_type: i32, .name: W }
-diff --git a/src/kernels/conv_3x3_wheel_alpha_v3_0b_epilogue.inc b/src/kernels/conv_3x3_wheel_alpha_v3_0b_epilogue.inc
-index 358772e63..b27ad5284 100644
---- a/src/kernels/conv_3x3_wheel_alpha_v3_0b_epilogue.inc
-+++ b/src/kernels/conv_3x3_wheel_alpha_v3_0b_epilogue.inc
-@@ -76,7 +76,7 @@ amdhsa.kernels:
- .max_flat_workgroup_size: \wg_x
- .wavefront_size: 64
- .args:
-- - { .size: 4, .offset: 0, .value_kind: by_value, .value_type: i32, .name: N }
-+ - { .size: 4, .offset: 0, .value_kind: by_value, .value_type: i32, .name: X }
- - { .size: 4, .offset: 4, .value_kind: by_value, .value_type: i32, .name: C }
- - { .size: 4, .offset: 8, .value_kind: by_value, .value_type: i32, .name: H }
- - { .size: 4, .offset: 12, .value_kind: by_value, .value_type: i32, .name: W }
-diff --git a/src/kernels/conv_3x3_wheel_alpha_v7_0_3b_epilogue.inc b/src/kernels/conv_3x3_wheel_alpha_v7_0_3b_epilogue.inc
-index d3296969a..f873ce153 100644
---- a/src/kernels/conv_3x3_wheel_alpha_v7_0_3b_epilogue.inc
-+++ b/src/kernels/conv_3x3_wheel_alpha_v7_0_3b_epilogue.inc
-@@ -76,7 +76,7 @@ amdhsa.kernels:
- .max_flat_workgroup_size: \wg_x
- .wavefront_size: 64
- .args:
-- - { .size: 4, .offset: 0, .value_kind: by_value, .value_type: i32, .name: N }
-+ - { .size: 4, .offset: 0, .value_kind: by_value, .value_type: i32, .name: X }
- - { .size: 4, .offset: 4, .value_kind: by_value, .value_type: i32, .name: C }
- - { .size: 4, .offset: 8, .value_kind: by_value, .value_type: i32, .name: H }
- - { .size: 4, .offset: 12, .value_kind: by_value, .value_type: i32, .name: W }
-diff --git a/src/kernels/conv_3x3_wheel_alpha_v9_0_15_epilogue.inc b/src/kernels/conv_3x3_wheel_alpha_v9_0_15_epilogue.inc
-index a253cc0f9..1582d002c 100644
---- a/src/kernels/conv_3x3_wheel_alpha_v9_0_15_epilogue.inc
-+++ b/src/kernels/conv_3x3_wheel_alpha_v9_0_15_epilogue.inc
-@@ -76,7 +76,7 @@ amdhsa.kernels:
- .max_flat_workgroup_size: \wg_x
- .wavefront_size: 64
- .args:
-- - { .size: 4, .offset: 0, .value_kind: by_value, .value_type: i32, .name: N }
-+ - { .size: 4, .offset: 0, .value_kind: by_value, .value_type: i32, .name: X }
- - { .size: 4, .offset: 4, .value_kind: by_value, .value_type: i32, .name: C }
- - { .size: 4, .offset: 8, .value_kind: by_value, .value_type: i32, .name: H }
- - { .size: 4, .offset: 12, .value_kind: by_value, .value_type: i32, .name: W }
-diff --git a/src/kernels/conv_3x3_wheel_alpha_v9_2_7_epilogue.inc b/src/kernels/conv_3x3_wheel_alpha_v9_2_7_epilogue.inc
-index e40ac1f60..78495e024 100644
---- a/src/kernels/conv_3x3_wheel_alpha_v9_2_7_epilogue.inc
-+++ b/src/kernels/conv_3x3_wheel_alpha_v9_2_7_epilogue.inc
-@@ -76,7 +76,7 @@ amdhsa.kernels:
- .max_flat_workgroup_size: \wg_x
- .wavefront_size: 64
- .args:
-- - { .size: 4, .offset: 0, .value_kind: by_value, .value_type: i32, .name: N }
-+ - { .size: 4, .offset: 0, .value_kind: by_value, .value_type: i32, .name: X }
- - { .size: 4, .offset: 4, .value_kind: by_value, .value_type: i32, .name: C }
- - { .size: 4, .offset: 8, .value_kind: by_value, .value_type: i32, .name: H }
- - { .size: 4, .offset: 12, .value_kind: by_value, .value_type: i32, .name: W }
-diff --git a/src/kernels/xform_bidirect_winograd_code.inc b/src/kernels/xform_bidirect_winograd_code.inc
-index 724845f49..d03314ef5 100644
---- a/src/kernels/xform_bidirect_winograd_code.inc
-+++ b/src/kernels/xform_bidirect_winograd_code.inc
-@@ -1566,7 +1566,7 @@ amdhsa.kernels:
- .max_flat_workgroup_size: \wg_x
- .wavefront_size: 64
- .args:
-- - { .size: 4, .offset: 0, .value_kind: by_value, .value_type: i32, .name: N }
-+ - { .size: 4, .offset: 0, .value_kind: by_value, .value_type: i32, .name: X }
- - { .size: 4, .offset: 4, .value_kind: by_value, .value_type: i32, .name: C }
- - { .size: 4, .offset: 8, .value_kind: by_value, .value_type: i32, .name: H }
- - { .size: 4, .offset: 12, .value_kind: by_value, .value_type: i32, .name: W }
-diff --git a/src/kernels/xform_metadata.inc b/src/kernels/xform_metadata.inc
-index 960a9a2d8..83b736bee 100644
---- a/src/kernels/xform_metadata.inc
-+++ b/src/kernels/xform_metadata.inc
-@@ -74,7 +74,7 @@ amdhsa.kernels:
- .max_flat_workgroup_size: \wg_x
- .wavefront_size: 64
- .args:
-- - { .size: 4, .offset: 0, .value_kind: by_value, .value_type: i32, .name: N }
-+ - { .size: 4, .offset: 0, .value_kind: by_value, .value_type: i32, .name: X }
- - { .size: 4, .offset: 4, .value_kind: by_value, .value_type: i32, .name: C }
- - { .size: 4, .offset: 8, .value_kind: by_value, .value_type: i32, .name: H }
- - { .size: 4, .offset: 12, .value_kind: by_value, .value_type: i32, .name: W }
diff --git a/sci-libs/miopen/files/miopen-5.1.3-deprecate-clang-ocl.patch b/sci-libs/miopen/files/miopen-5.1.3-deprecate-clang-ocl.patch
deleted file mode 100644
index 93c66fd3ef05..000000000000
--- a/sci-libs/miopen/files/miopen-5.1.3-deprecate-clang-ocl.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-This is a cherry picked PR on 5.1.3, which replace clang-ocl with clang
-From 98f001dfe61208af04ecf7690023efd772ee7d43 Mon Sep 17 00:00:00 2001
-From: Jehandad Khan <jahandad@gmail.com>
-Date: Tue, 19 Jul 2022 17:24:05 -0500
-Subject: [PATCH] Remove clang-ocl and replace with clang
-
----
- CMakeLists.txt | 7 +------
- README.md | 1 -
- src/hipoc/hipoc_program.cpp | 7 ++++++-
- 3 files changed, 7 insertions(+), 8 deletions(-)
-
-Index: MIOpen-rocm-5.1.3/CMakeLists.txt
-===================================================================
---- MIOpen-rocm-5.1.3.orig/CMakeLists.txt
-+++ MIOpen-rocm-5.1.3/CMakeLists.txt
-@@ -241,7 +241,7 @@ if( MIOPEN_BACKEND STREQUAL "HIP" OR MIO
- # miopentensile default off
- set(MIOPEN_USE_MIOPENTENSILE OFF CACHE BOOL "")
-
-- find_program(HIP_OC_COMPILER clang-ocl
-+ find_program(HIP_OC_COMPILER clang
- PATH_SUFFIXES bin
- PATHS
- /opt/rocm
-Index: MIOpen-rocm-5.1.3/README.md
-===================================================================
---- MIOpen-rocm-5.1.3.orig/README.md
-+++ MIOpen-rocm-5.1.3/README.md
-@@ -14,7 +14,6 @@ MIOpen supports two programming models -
- * OpenCL - OpenCL libraries and header files
- * HIP -
- * HIP and HCC libraries and header files
-- * [clang-ocl](https://github.com/RadeonOpenCompute/clang-ocl) -- **required**
- * [MIOpenGEMM](https://github.com/ROCmSoftwarePlatform/MIOpenGEMM) to enable various functionalities including transposed and dilated convolutions. This is optional on the HIP backend. Users can enable this library using the cmake configuration flag `-DMIOPEN_USE_MIOPENGEMM=On`.
- * ROCm cmake modules can be installed from [here](https://github.com/RadeonOpenCompute/rocm-cmake)
- * [Half](http://half.sourceforge.net/) - IEEE 754-based half-precision floating point library
-Index: MIOpen-rocm-5.1.3/src/hipoc/hipoc_program.cpp
-===================================================================
---- MIOpen-rocm-5.1.3.orig/src/hipoc/hipoc_program.cpp
-+++ MIOpen-rocm-5.1.3/src/hipoc/hipoc_program.cpp
-@@ -255,7 +255,12 @@ void HIPOCProgramImpl::BuildCodeObjectIn
- if(miopen::IsEnabled(MIOPEN_DEBUG_OPENCL_WAVE64_NOWGP{}))
- params += " -mwavefrontsize64 -mcumode";
- WriteFile(src, dir->path / filename);
-- dir->Execute(HIP_OC_COMPILER, params + " " + filename + " -o " + hsaco_file.string());
-+ params += " -target amdgcn-amd-amdhsa -x cl -D__AMD__=1 -O3";
-+ params += " -cl-kernel-arg-info -cl-denorms-are-zero";
-+ params += " -cl-std=CL1.2 -mllvm -amdgpu-early-inline-all";
-+ params += " -mllvm -amdgpu-internalize-symbols ";
-+ params += " " + filename + " -o " + hsaco_file.string();
-+ dir->Execute(HIP_OC_COMPILER, params);
- }
- if(!boost::filesystem::exists(hsaco_file))
- MIOPEN_THROW("Cant find file: " + hsaco_file.string());
diff --git a/sci-libs/miopen/files/miopen-5.1.3-gfx1031.patch b/sci-libs/miopen/files/miopen-5.1.3-gfx1031.patch
deleted file mode 100644
index de22d66d887a..000000000000
--- a/sci-libs/miopen/files/miopen-5.1.3-gfx1031.patch
+++ /dev/null
@@ -1,375 +0,0 @@
-Enable gfx1031 support
-======================
---- MIOpen-rocm-5.1.3/fin/src/include/conv_fin.hpp 2022-05-08 14:08:05.000000000 +0800
-+++ gfx1031/fin/src/include/conv_fin.hpp 2022-09-01 18:36:18.630980283 +0800
-@@ -111,6 +111,10 @@ class ConvFin : public Fin
- {
- assert(num_cu == 72 || num_cu == 36);
- }
-+ else if(arch == "gfx1031")
-+ {
-+ assert(num_cu == 40 || num_cu == 20);
-+ }
- else if(arch == "gfx90a")
- {
- assert(num_cu == 110);
-Only in MIOpen-rocm-5.1.3: patches
---- MIOpen-rocm-5.1.3/src/composable_kernel/composable_kernel/include/utility/config.hpp 2022-05-08 14:08:05.000000000 +0800
-+++ gfx1031/src/composable_kernel/composable_kernel/include/utility/config.hpp 2022-09-01 18:36:18.634980274 +0800
-@@ -13,7 +13,7 @@
- // GPU target
- // should enable one and only one GPU target
- #if !(defined(CK_AMD_GPU_GFX803) || defined(CK_AMD_GPU_GFX900) || defined(CK_AMD_GPU_GFX906) || \
-- defined(CK_AMD_GPU_GFX908) || defined(CK_AMD_GPU_GFX90A) || defined(CK_AMD_GPU_GFX1030))
-+ defined(CK_AMD_GPU_GFX908) || defined(CK_AMD_GPU_GFX90A) || defined(CK_AMD_GPU_GFX1030) || defined(CK_AMD_GPU_GFX1031))
- #error Need to define (only) one GPU target
- #endif
-
-@@ -29,7 +29,7 @@
- #if defined(CK_AMD_GPU_GFX803) || defined(CK_AMD_GPU_GFX900) || defined(CK_AMD_GPU_GFX906) || \
- defined(CK_AMD_GPU_GFX908) || defined(CK_AMD_GPU_GFX90A)
- #define CK_BUFFER_RESOURCE_3RD_DWORD 0x00020000
--#elif defined(CK_AMD_GPU_GFX1030)
-+#elif (defined(CK_AMD_GPU_GFX1030) || defined(CK_AMD_GPU_GFX1031))
- #define CK_BUFFER_RESOURCE_3RD_DWORD 0x31014000
- #endif
-
-@@ -37,7 +37,7 @@
- #if defined(CK_AMD_GPU_GFX803) || defined(CK_AMD_GPU_GFX900)
- #define CK_USE_AMD_V_MAC_F32
- #elif defined(CK_AMD_GPU_GFX906) || defined(CK_AMD_GPU_GFX908) || defined(CK_AMD_GPU_GFX90a) || \
-- defined(CK_AMD_GPU_GFX1030)
-+ (defined(CK_AMD_GPU_GFX1030) || defined(CK_AMD_GPU_GFX1031))
- #define CK_USE_AMD_V_FMAC_F32
- #define CK_USE_AMD_V_DOT2_F32_F16
- #define CK_USE_AMD_V_DOT4_I32_I8
---- MIOpen-rocm-5.1.3/src/include/miopen/solver/ck_utility_common.hpp 2022-05-08 14:08:05.000000000 +0800
-+++ gfx1031/src/include/miopen/solver/ck_utility_common.hpp 2022-09-01 18:36:18.638980266 +0800
-@@ -54,6 +54,7 @@ static inline bool is_ck_supported_hardw
- StartsWith(handle.GetDeviceName(), "gfx908") ||
- StartsWith(handle.GetDeviceName(), "gfx90a") ||
- StartsWith(handle.GetDeviceName(), "gfx1030");
-+ StartsWith(handle.GetDeviceName(), "gfx1031");
- }
-
- static inline bool is_support_amd_buffer_atomic_fadd(const std::string& device_name)
-@@ -83,6 +84,8 @@ static inline auto get_ck_common_compile
- compiler_flag << " -DCK_AMD_GPU_GFX90A";
- else if(StartsWith(device_name, "gfx1030"))
- compiler_flag << " -DCK_AMD_GPU_GFX1030";
-+ else if(StartsWith(device_name, "gfx1031"))
-+ compiler_flag << " -DCK_AMD_GPU_GFX1031";
-
- // buffer atomic-fadd
- compiler_flag << " -DCK_USE_AMD_BUFFER_ATOMIC_FADD="
---- MIOpen-rocm-5.1.3/src/include/miopen/solver/implicitgemm_util.hpp 2022-05-08 14:08:05.000000000 +0800
-+++ gfx1031/src/include/miopen/solver/implicitgemm_util.hpp 2022-09-01 18:36:18.638980266 +0800
-@@ -469,7 +469,7 @@ static inline bool is_use_amd_buffer_loa
- {
- #if WORKAROUND_MIOPEN_ISSUE_557
- const auto device_name = ctx.GetStream().GetDeviceName();
-- return !StartsWith(device_name, "gfx1030");
-+ return !StartsWith(device_name, "gfx1030") && !StartsWith(device_name, "gfx1031");
- #else
- return true;
- #endif
-@@ -478,7 +478,7 @@ static inline bool is_use_amd_buffer_loa
- static inline bool is_use_v_fmac_f32(const ConvolutionContext& ctx)
- {
- const auto device_name = ctx.GetStream().GetDeviceName();
-- return StartsWith(device_name, "gfx1030");
-+ return StartsWith(device_name, "gfx1030") || StartsWith(device_name, "gfx1031");
- }
-
- static inline bool support_amd_buffer_atomic_fadd(const std::string& device_name)
-@@ -599,7 +599,8 @@ static inline bool IsComposableKernelSup
- StartsWith(c.GetStream().GetDeviceName(), "gfx906") ||
- StartsWith(c.GetStream().GetDeviceName(), "gfx908") ||
- StartsWith(c.GetStream().GetDeviceName(), "gfx90a") ||
-- StartsWith(c.GetStream().GetDeviceName(), "gfx1030");
-+ StartsWith(c.GetStream().GetDeviceName(), "gfx1030")||
-+ StartsWith(c.GetStream().GetDeviceName(), "gfx1031");
- }
-
- // greatest common divisor, aka highest common factor
---- MIOpen-rocm-5.1.3/src/kernels/batchnorm_functions.h 2022-05-08 14:08:05.000000000 +0800
-+++ gfx1031/src/kernels/batchnorm_functions.h 2022-09-01 18:36:18.858979772 +0800
-@@ -159,6 +159,10 @@
- #define MIO_BN_GFX1030 0
- #endif
-
-+#ifndef MIO_BN_GFX1031
-+#define MIO_BN_GFX1031 0
-+#endif
-+
- #define UNUSED __attribute__((__unused__))
-
- #if(MIO_BN_VARIANT != 4)
---- MIOpen-rocm-5.1.3/src/kernels/MIOpenBatchNormActivBwdPerAct.cl 2022-05-08 14:08:05.000000000 +0800
-+++ gfx1031/src/kernels/MIOpenBatchNormActivBwdPerAct.cl 2022-09-01 18:36:18.858979772 +0800
-@@ -34,7 +34,7 @@
- #endif
-
- #define MIOPEN_USE_AMDGCN 0
--#if defined(__AMDGCN__) && MIO_BN_GFX1030 != 1
-+#if defined(__AMDGCN__) && MIO_BN_GFX1030 != 1 && MIO_BN_GFX1031 != 1
- #undef MIOPEN_USE_AMDGCN
- #define MIOPEN_USE_AMDGCN 1
- #endif
---- MIOpen-rocm-5.1.3/src/kernels/MIOpenBatchNormActivBwdSpatial.cl 2022-05-08 14:08:05.000000000 +0800
-+++ gfx1031/src/kernels/MIOpenBatchNormActivBwdSpatial.cl 2022-09-01 18:36:18.858979772 +0800
-@@ -32,7 +32,7 @@
- #endif
-
- #define MIOPEN_USE_AMDGCN 0
--#if defined(__AMDGCN__) && MIO_BN_GFX1030 != 1
-+#if defined(__AMDGCN__) && MIO_BN_GFX1030 != 1 && MIO_BN_GFX1031 != 1
- #undef MIOPEN_USE_AMDGCN
- #define MIOPEN_USE_AMDGCN 1
- #endif
---- MIOpen-rocm-5.1.3/src/kernels/MIOpenBatchNormActivFwdTrainSpatial.cl 2022-05-08 14:08:05.000000000 +0800
-+++ gfx1031/src/kernels/MIOpenBatchNormActivFwdTrainSpatial.cl 2022-09-01 18:36:18.858979772 +0800
-@@ -33,7 +33,7 @@
- #endif
-
- #define MIOPEN_USE_AMDGCN 0
--#if defined(__AMDGCN__) && MIO_BN_GFX1030 != 1
-+#if defined(__AMDGCN__) && MIO_BN_GFX1030 != 1 && MIO_BN_GFX1031 != 1
- #undef MIOPEN_USE_AMDGCN
- #define MIOPEN_USE_AMDGCN 1
- #endif
---- MIOpen-rocm-5.1.3/src/kernels/MIOpenBatchNormBwdSpatial.cl 2022-05-08 14:08:05.000000000 +0800
-+++ gfx1031/src/kernels/MIOpenBatchNormBwdSpatial.cl 2022-09-01 18:36:18.858979772 +0800
-@@ -33,7 +33,7 @@
- #endif
-
- #define MIOPEN_USE_AMDGCN 0
--#if defined(__AMDGCN__) && MIO_BN_GFX1030 != 1
-+#if defined(__AMDGCN__) && MIO_BN_GFX1030 != 1 && MIO_BN_GFX1031 != 1
- #undef MIOPEN_USE_AMDGCN
- #define MIOPEN_USE_AMDGCN 1
- #endif
---- MIOpen-rocm-5.1.3/src/kernels/MIOpenBatchNormFwdTrainSpatial.cl 2022-05-08 14:08:05.000000000 +0800
-+++ gfx1031/src/kernels/MIOpenBatchNormFwdTrainSpatial.cl 2022-09-01 18:36:18.858979772 +0800
-@@ -33,7 +33,7 @@
- #endif
-
- #define MIOPEN_USE_AMDGCN 0
--#if defined(__AMDGCN__) && MIO_BN_GFX1030 != 1
-+#if defined(__AMDGCN__) && MIO_BN_GFX1030 != 1 && MIO_BN_GFX1031 != 1
- #undef MIOPEN_USE_AMDGCN
- #define MIOPEN_USE_AMDGCN 1
- #endif
---- MIOpen-rocm-5.1.3/src/md_graph.cpp 2022-05-08 14:08:05.000000000 +0800
-+++ gfx1031/src/md_graph.cpp 2022-09-01 18:36:18.630980283 +0800
-@@ -738,8 +738,8 @@ void FusionMDGraph::InitConv(FusionMDGra
-
- add_v21_wino("gfx9", {"gfx900", "gfx906", "gfx908", "gfx90a"}, 1);
- add_v21_wino("gfx9", {"gfx900", "gfx906", "gfx908", "gfx90a"}, 2);
-- add_v21_wino("gfx10", {"gfx1011", "gfx1012", "gfx1030"}, 1);
-- add_v21_wino("gfx10", {"gfx1011", "gfx1012", "gfx1030"}, 2);
-+ add_v21_wino("gfx10", {"gfx1011", "gfx1012", "gfx1030", "gfx1031"}, 1);
-+ add_v21_wino("gfx10", {"gfx1011", "gfx1012", "gfx1030", "gfx1031"}, 2);
- }
- }
-
---- MIOpen-rocm-5.1.3/src/ocl/fusionopbiasbnactivocl.cpp 2022-05-08 14:08:05.000000000 +0800
-+++ gfx1031/src/ocl/fusionopbiasbnactivocl.cpp 2022-09-01 18:36:18.634980274 +0800
-@@ -392,7 +392,8 @@ miopenStatus_t BatchNormBwdTrainFusionOp
- " -DMIO_BN_USESAVED=" + std::to_string(static_cast<int>(true)) +
- " -DMIO_BN_VARIANT=" + std::to_string(variant) +
- " -DMIO_BN_CBA_WRITE_INTERMEDIATE=" + std::to_string(0) +
-- " -DMIO_BN_GFX1030=" + ((handle.GetDeviceName() == "gfx1030") ? "1" : "0");
-+ " -DMIO_BN_GFX1030=" + ((handle.GetDeviceName() == "gfx1030") ? "1" : "0") +
-+ " -DMIO_BN_GFX1031=" + ((handle.GetDeviceName() == "gfx1031") ? "1" : "0");
-
- compile_config += add;
- MIOPEN_LOG_I2(add);
-@@ -607,7 +608,8 @@ miopenStatus_t BatchNormFwdTrainFusionOp
- " -DMIO_SAVE_MEAN_VARIANCE=" + (saveBatchStats ? "1" : "0") +
- " -DMIO_RUNNING_RESULT=" + ((savePopStats) ? "1" : "0") +
- " -DMIO_BN_VARIANT=" + std::to_string(variant) +
-- " -DMIO_BN_GFX1030=" + ((handle.GetDeviceName() == "gfx1030") ? "1" : "0");
-+ " -DMIO_BN_GFX1030=" + ((handle.GetDeviceName() == "gfx1030") ? "1" : "0") +
-+ " -DMIO_BN_GFX1031=" + ((handle.GetDeviceName() == "gfx1031") ? "1" : "0");
-
- compile_config += add;
- MIOPEN_LOG_I2(add);
---- MIOpen-rocm-5.1.3/src/solver/batchnorm/backward_per_activation.cpp 2022-05-08 14:08:05.000000000 +0800
-+++ gfx1031/src/solver/batchnorm/backward_per_activation.cpp 2022-09-01 18:36:18.638980266 +0800
-@@ -113,6 +113,7 @@ BnBwdTrainingPerActivation::GetSolution(
- {"MIO_BN_GRP1", ylocalsize},
- {"MIO_BN_GRP2", zlocalsize},
- {"MIO_BN_GFX1030", ((handle.GetDeviceName() == "gfx1030") ? "1" : "0")},
-+ {"MIO_BN_GFX1031", ((handle.GetDeviceName() == "gfx1031") ? "1" : "0")},
- };
-
- kernel.comp_options = build_params.GenerateFor(kbp::OpenCL{});
---- MIOpen-rocm-5.1.3/src/solver/batchnorm/backward_spatial_multiple.cpp 2022-05-08 14:08:05.000000000 +0800
-+++ gfx1031/src/solver/batchnorm/backward_spatial_multiple.cpp 2022-09-01 18:36:18.638980266 +0800
-@@ -210,6 +210,7 @@ ConvSolution BnBwdTrainingSpatialMultipl
- {"MIO_BN_GRP1", ylocalsize},
- {"MIO_BN_GRP2", zlocalsize},
- {"MIO_BN_GFX1030", ((handle.GetDeviceName() == "gfx1030") ? "1" : "0")},
-+ {"MIO_BN_GFX1031", ((handle.GetDeviceName() == "gfx1031") ? "1" : "0")},
- {"MIO_LAYOUT_NHWC", static_cast<int>(problem.IsLayoutNHWC())},
- };
-
---- MIOpen-rocm-5.1.3/src/solver/batchnorm/backward_spatial_single.cpp 2022-05-08 14:08:05.000000000 +0800
-+++ gfx1031/src/solver/batchnorm/backward_spatial_single.cpp 2022-09-01 18:36:18.638980266 +0800
-@@ -247,6 +247,7 @@ BnBwdTrainingSpatialSingle::GetSolution(
-
- build_params << KernelBuildParameters{
- {"MIO_BN_GFX1030", (handle.GetDeviceName() == "gfx1030") ? "1" : "0"},
-+ {"MIO_BN_GFX1031", ((handle.GetDeviceName() == "gfx1031") ? "1" : "0")},
- };
-
- kernel.comp_options = build_params.GenerateFor(kbp::OpenCL{});
---- MIOpen-rocm-5.1.3/src/solver/batchnorm/forward_inference.cpp 2022-05-08 14:08:05.000000000 +0800
-+++ gfx1031/src/solver/batchnorm/forward_inference.cpp 2022-09-01 18:36:18.638980266 +0800
-@@ -103,6 +103,7 @@ ConvSolution BnFwdInference::GetSolution
- {"MIO_BN_GRP1", ylocalsize},
- {"MIO_BN_GRP2", zlocalsize},
- {"MIO_BN_GFX1030", ((handle.GetDeviceName() == "gfx1030") ? "1" : "0")},
-+ {"MIO_BN_GFX1031", ((handle.GetDeviceName() == "gfx1031") ? "1" : "0")},
- };
-
- kernel.comp_options = build_params.GenerateFor(kbp::OpenCL{});
---- MIOpen-rocm-5.1.3/src/solver/batchnorm/forward_per_activation.cpp 2022-05-08 14:08:05.000000000 +0800
-+++ gfx1031/src/solver/batchnorm/forward_per_activation.cpp 2022-09-01 18:36:18.638980266 +0800
-@@ -105,6 +105,7 @@ BnFwdTrainingPerActivation::GetSolution(
- {"MIO_BN_GRP1", ylocalsize},
- {"MIO_BN_GRP2", zlocalsize},
- {"MIO_BN_GFX1030", ((handle.GetDeviceName() == "gfx1030") ? "1" : "0")},
-+ {"MIO_BN_GFX1031", ((handle.GetDeviceName() == "gfx1031") ? "1" : "0")},
- };
-
- auto kernel = KernelInfo{};
---- MIOpen-rocm-5.1.3/src/solver/batchnorm/forward_spatial_multiple.cpp 2022-05-08 14:08:05.000000000 +0800
-+++ gfx1031/src/solver/batchnorm/forward_spatial_multiple.cpp 2022-09-01 18:36:18.638980266 +0800
-@@ -177,6 +177,7 @@ ConvSolution BnFwdTrainingSpatialMultipl
- {"MIO_BN_GRP1", ylocalsize},
- {"MIO_BN_GRP2", zlocalsize},
- {"MIO_BN_GFX1030", ((handle.GetDeviceName() == "gfx1030") ? "1" : "0")},
-+ {"MIO_BN_GFX1031", ((handle.GetDeviceName() == "gfx1031") ? "1" : "0")},
- {"MIO_LAYOUT_NHWC", static_cast<int>(problem.IsLayoutNHWC())},
- };
-
---- MIOpen-rocm-5.1.3/src/solver/batchnorm/forward_spatial_single.cpp 2022-05-08 14:08:05.000000000 +0800
-+++ gfx1031/src/solver/batchnorm/forward_spatial_single.cpp 2022-09-01 18:36:18.638980266 +0800
-@@ -211,6 +211,7 @@ BnFwdTrainingSpatialSingle::GetSolution(
- {"MIO_BN_GRP1", ylocalsize},
- {"MIO_BN_GRP2", zlocalsize},
- {"MIO_BN_GFX1030", ((handle.GetDeviceName() == "gfx1030") ? "1" : "0")},
-+ {"MIO_BN_GFX1031", ((handle.GetDeviceName() == "gfx1031") ? "1" : "0")},
- {"MIO_LAYOUT_NHWC", static_cast<int>(problem.IsLayoutNHWC())},
- };
-
---- MIOpen-rocm-5.1.3/src/target_properties.cpp 2022-05-08 14:08:05.000000000 +0800
-+++ gfx1031/src/target_properties.cpp 2022-09-01 18:36:18.630980283 +0800
-@@ -54,6 +54,7 @@ static std::string GetDeviceNameFromMap(
- {"Vega10", "gfx900"},
- {"gfx901", "gfx900"},
- {"10.3.0 Sienna_Cichlid 18", "gfx1030"},
-+ {"10.3.1 Navi_flounder 18", "gfx1031"},
- };
-
- const char* const p_asciz = miopen::GetStringEnv(MIOPEN_DEBUG_ENFORCE_DEVICE{});
---- MIOpen-rocm-5.1.3/test/CMakeLists.txt 2022-05-08 14:08:05.000000000 +0800
-+++ gfx1031/test/CMakeLists.txt 2022-09-01 18:36:19.022979405 +0800
-@@ -38,6 +38,7 @@ option( MIOPEN_TEST_GFX90A "Test on gfx9
- option( MIOPEN_TEST_GFX900 "Test on Vega10 (gfx900)" OFF )
- option( MIOPEN_TEST_GFX906 "Test on Vega20 (gfx906)" OFF )
- option( MIOPEN_TEST_GFX1030 "Test on Navi21 (gfx1030)" OFF )
-+option( MIOPEN_TEST_GFX1031 "Test on Navi21 (gfx1031)" OFF )
- option( MIOPEN_TEST_GPU_XNACK_ENABLED "Test as if XNACK mode is enabled" OFF )
- option( MIOPEN_TEST_CONV Off)
- option( MIOPEN_TEST_DEEPBENCH Off)
-@@ -74,7 +75,7 @@ endif()
- # Also we do not detect GPU when target GPU for testing is specified explicitly.
- set(MIOPEN_TEST_GPU_DETECTION_FAILED FALSE)
- set(MIOPEN_NO_GPU FALSE)
--if(NOT (MIOPEN_TEST_GFX900 OR MIOPEN_TEST_GFX906 OR MIOPEN_TEST_GFX908 OR MIOPEN_TEST_GFX90A OR MIOPEN_TEST_GFX1030 OR MIOPEN_TEST_HIP_NOGPU))
-+if(NOT (MIOPEN_TEST_GFX900 OR MIOPEN_TEST_GFX906 OR MIOPEN_TEST_GFX908 OR MIOPEN_TEST_GFX90A OR MIOPEN_TEST_GFX1030 OR MIOPEN_TEST_GFX1031 OR MIOPEN_TEST_HIP_NOGPU))
- find_program(ROCMINFO
- NAMES rocminfo
- PATHS
-@@ -96,6 +97,8 @@ if(NOT (MIOPEN_TEST_GFX900 OR MIOPEN_TES
- elseif (NOT ROCMINFO_EXIT_STATUS EQUAL 0)
- message(WARNING "ROCMINFO FAILED, GPU TYPE UNKNOWN. Manually set respective MIOPEN_TEST_GFX* CMake variable to specify target GPU for testing.")
- set(MIOPEN_TEST_GPU_DETECTION_FAILED TRUE)
-+ elseif(ROCMINFO_OUTPUT MATCHES "gfx1031")
-+ set(MIOPEN_TEST_GFX1031 ON)
- elseif(ROCMINFO_OUTPUT MATCHES "gfx1030")
- set(MIOPEN_TEST_GFX1030 ON)
- elseif(ROCMINFO_OUTPUT MATCHES "gfx900")
-@@ -125,6 +128,7 @@ message(STATUS "MIOPEN_TEST_GFX906 ${MIO
- message(STATUS "MIOPEN_TEST_GFX908 ${MIOPEN_TEST_GFX908}")
- message(STATUS "MIOPEN_TEST_GFX90A ${MIOPEN_TEST_GFX90A}")
- message(STATUS "MIOPEN_TEST_GFX1030 ${MIOPEN_TEST_GFX1030}")
-+message(STATUS "MIOPEN_TEST_GFX1031 ${MIOPEN_TEST_GFX1031}")
- message(STATUS "MIOPEN_TEST_GPU_XNACK_ENABLED ${MIOPEN_TEST_GPU_XNACK_ENABLED}")
- message(STATUS "MIOPEN_TEST_GPU_DETECTION_FAILED ${MIOPEN_TEST_GPU_DETECTION_FAILED}")
-
-@@ -167,10 +171,10 @@ endmacro()
- set_var_to_condition(WORKAROUND_ISSUE_1187_DEFAULT MIOPEN_TEST_GFX90A AND MIOPEN_TEST_FLOAT)
- option( WORKAROUND_ISSUE_1187 "" ${WORKAROUND_ISSUE_1187_DEFAULT})
-
--set_var_to_condition(WORKAROUND_ISSUE_1148_DEFAULT MIOPEN_TEST_GFX1030 AND MIOPEN_TEST_FLOAT)
-+set_var_to_condition(WORKAROUND_ISSUE_1148_DEFAULT MIOPEN_TEST_GFX1030 OR MIOPEN_TEST_GFX1031 AND MIOPEN_TEST_FLOAT)
- option( WORKAROUND_ISSUE_1148 "" ${WORKAROUND_ISSUE_1148_DEFAULT})
-
--set_var_to_condition(WORKAROUND_ISSUE_1334_DEFAULT MIOPEN_TEST_GFX1030 AND MIOPEN_TEST_FLOAT)
-+set_var_to_condition(WORKAROUND_ISSUE_1334_DEFAULT MIOPEN_TEST_GFX1030 OR MIOPEN_TEST_GFX1031 AND MIOPEN_TEST_FLOAT)
- option( WORKAROUND_ISSUE_1334 "" ${WORKAROUND_ISSUE_1334_DEFAULT})
-
- if(NOT MIOPEN_TEST_MIOTENSILE)
-@@ -216,7 +220,7 @@ if (MIOPEN_NO_GPU)
- test_pooling3d test_perfdb)
- endif()
-
--if(MIOPEN_TEST_GFX1030)
-+if(MIOPEN_TEST_GFX1030 OR MIOPEN_TEST_GFX1031)
- if(WORKAROUND_ISSUE_1053 AND MIOPEN_TEST_ALL)
- list(APPEND SKIP_TESTS test_lrn_test)
- endif()
-@@ -439,7 +443,7 @@ endfunction()
- # If nothing is specified, the default value is taken.
- # Default: FLOAT_ENABLED HALF_DISABLED BF16_DISABLED INT8_DISABLED
- #
--# GPU types: GFX900, GFX906, GFX908, GFX90A, GFX1030
-+# GPU types: GFX900, GFX906, GFX908, GFX90A, GFX1030, GFX1031
- # The option can be enabled or disabled by using '_ENABLED' and '_DISABLED' suffix.
- # If nothing is specified, the default value is taken.
- # Default: GFX900_ENABLED, GFX906_ENABLED, GFX908_ENABLED, GFX90A_ENABLED, GFX1030_DISABLED
-@@ -571,7 +575,7 @@ function(add_custom_test NAME)
- set_tests_properties(${NAME} PROPERTIES RUN_SERIAL On)
- endif()
-
-- if( (is_gfx900_check OR is_gfx906_check OR is_gfx908_check OR is_gfx1030_check OR is_gfx90a_check)
-+ if( (is_gfx900_check OR is_gfx906_check OR is_gfx908_check OR is_gfx1030_check OR is_gfx1031_check OR is_gfx90a_check)
- AND is_full_check
- AND is_xnack_on_check
- AND (is_miotensile_check AND is_mlir_check)
---- MIOpen-rocm-5.1.3/test/handle_test.cpp 2022-05-08 14:08:05.000000000 +0800
-+++ gfx1031/test/handle_test.cpp 2022-09-01 18:36:19.018979413 +0800
-@@ -234,7 +234,7 @@ void test_warnings(kernel_type_t kern_ty
- void test_arch_name()
- {
- auto&& h = get_handle();
-- auto known_arch = {"gfx908", "gfx90a", "gfx906", "gfx900", "gfx803", "gfx1030"};
-+ auto known_arch = {"gfx908", "gfx90a", "gfx906", "gfx900", "gfx803", "gfx1030", "gfx1031"};
- auto this_arch = h.GetDeviceName();
- EXPECT(std::any_of(
- known_arch.begin(), known_arch.end(), [&](std::string arch) { return arch == this_arch; }));
---- MIOpen-rocm-5.1.3/test/mdgraph.cpp 2022-05-08 14:08:05.000000000 +0800
-+++ gfx1031/test/mdgraph.cpp 2022-09-01 18:36:19.022979405 +0800
-@@ -222,7 +222,7 @@ struct mdgraph_driver : test_driver
- auto target = h.GetTargetProperties();
-
- auto wino_supported_arch = {
-- "gfx1030", "gfx1012", "gfx1011", "gfx90a", "gfx908", "gfx906", "gfx900", "gfx803"};
-+ "gfx1030", "gfx1031","gfx1012", "gfx1011", "gfx90a", "gfx908", "gfx906", "gfx900", "gfx803"};
-
- auto is_wino_support = !xnack_enabled &&
- !miopen::IsDisabled(MIOPEN_DEBUG_GCN_ASM_KERNELS{}) &&
diff --git a/sci-libs/miopen/miopen-5.1.3-r1.ebuild b/sci-libs/miopen/miopen-5.1.3-r1.ebuild
deleted file mode 100644
index 7d02435948f7..000000000000
--- a/sci-libs/miopen/miopen-5.1.3-r1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ROCM_VERSION=${PV}
-
-inherit cmake flag-o-matic llvm rocm
-
-LLVM_MAX_SLOT=15
-
-DESCRIPTION="AMD's Machine Intelligence Library"
-HOMEPAGE="https://github.com/ROCmSoftwarePlatform/MIOpen"
-SRC_URI="https://github.com/ROCmSoftwarePlatform/MIOpen/archive/rocm-${PV}.tar.gz -> MIOpen-${PV}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64"
-SLOT="0/$(ver_cut 1-2)"
-
-IUSE="debug test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=dev-util/hip-5.1.3
- >=dev-db/sqlite-3.17
- sci-libs/rocBLAS:${SLOT}[${ROCM_USEDEP}]
- >=dev-libs/boost-1.72
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="dev-libs/half:0/1
- dev-build/rocm-cmake
-"
-
-S="${WORKDIR}/MIOpen-rocm-${PV}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-4.2.0-disable-no-inline-boost.patch"
- "${FILESDIR}/${PN}-4.2.0-gcc11-numeric_limits.patch"
- "${FILESDIR}/${PN}-5.0.2-strip-xnack-in-flags.patch"
- "${FILESDIR}/${PN}-4.3.0-fix-interface-include-in-HIP_COMPILER_FLAGS.patch"
- "${FILESDIR}/${PN}-4.3.0-enable-test.patch"
- "${FILESDIR}/${PN}-5.1.3-gfx1031.patch"
- "${FILESDIR}/${PN}-5.1.3-deprecate-clang-ocl.patch"
- "${FILESDIR}/${PN}-5.1.3-no-strip.patch"
- "${FILESDIR}/${PN}-5.1.3-include-array.patch"
- "${FILESDIR}/${PN}-5.1.3-avoid-metadata-error-for-vanilla-clang.patch"
-)
-
-src_prepare() {
- cmake_src_prepare
-
- sed -e "s:/opt/rocm/llvm:$(get_llvm_prefix ${LLVM_MAX_SLOT}) NO_DEFAULT_PATH:" \
- -e "s:/opt/rocm/hip:$(hipconfig -p) NO_DEFAULT_PATH:" \
- -e '/set( MIOPEN_INSTALL_DIR/s:miopen:${CMAKE_INSTALL_PREFIX}:' \
- -e '/MIOPEN_TIDY_ERRORS ALL/d' \
- -i CMakeLists.txt || die
-
- sed -e "/rocm_install_symlink_subdir(\${MIOPEN_INSTALL_DIR})/d" -i src/CMakeLists.txt || die
- sed -e "/add_test/s:--build \${CMAKE_CURRENT_BINARY_DIR}:--build ${BUILD_DIR}:" -i test/CMakeLists.txt || die
-
- sed -e "s:\${AMD_DEVICE_LIBS_PREFIX}/lib:${EPREFIX}/usr/lib/amdgcn/bitcode:" -i cmake/hip-config.cmake || die
-
- # This plus avoid-metadata-error-for-vanilla-clang.patch fix bug mentioned
- # in https://github.com/ROCmSoftwarePlatform/MIOpen/issues/1731
- find src/kernels -name "*.s" -exec \
- sed -e "s/.name: n /.name: x /g" -e "s/.name: y /.name: z /g" \
- -e "s/.name: y,/.name: z,/g" -i {} \; || die
-}
-
-src_configure() {
- if ! use debug; then
- append-cflags "-DNDEBUG"
- append-cxxflags "-DNDEBUG"
- CMAKE_BUILD_TYPE="Release"
- else
- CMAKE_BUILD_TYPE="Debug"
- fi
-
- local mycmakeargs=(
- -DCMAKE_SKIP_RPATH=ON
- -DAMDGPU_TARGETS="$(get_amdgpu_flags)"
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
- -DMIOPEN_BACKEND=HIP
- -DBoost_USE_STATIC_LIBS=OFF
- -DMIOPEN_USE_MLIR=OFF
- -DBUILD_TESTS=$(usex test ON OFF)
- -DMIOPEN_TEST_ALL=$(usex test ON OFF)
- -DHALF_INCLUDE_DIR="${EPREFIX}/usr/include/half"
- )
-
- if use test; then
- for gpu_target in ${AMDGPU_TARGETS}; do
- mycmakeargs+=( -DMIOPEN_TEST_${gpu_target^^}=ON )
- done
- fi
-
- addpredict /dev/kfd
- addpredict /dev/dri/
- append-cxxflags "--rocm-path=$(hipconfig -R)"
- append-cxxflags "--hip-device-lib-path=${EPREFIX}/usr/lib/amdgcn/bitcode"
- CXX="$(get_llvm_prefix ${LLVM_MAX_SLOT})/bin/clang++" cmake_src_configure
-}
-
-src_test() {
- check_amdgpu
- export LD_LIBRARY_PATH="${BUILD_DIR}"/lib
- MAKEOPTS="-j1" cmake_src_test
-}
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-04 04:53:57 +0000