From d79ab35b7ac170babebe8bc151fe5d037c16285c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 22 Sep 2022 17:28:08 +0100 Subject: gentoo auto-resync : 22:09:2022 - 17:28:08 --- sci-libs/miopen/Manifest | 6 +- sci-libs/miopen/files/miopen-4.3.0-no-strip.patch | 16 ----- .../files/miopen-4.3.0-strip-xnack-in-flags.patch | 18 ----- sci-libs/miopen/files/miopen-5.1.3-gfx1031.patch | 22 ------ sci-libs/miopen/miopen-4.3.0.ebuild | 80 ---------------------- 5 files changed, 1 insertion(+), 141 deletions(-) delete mode 100644 sci-libs/miopen/files/miopen-4.3.0-no-strip.patch delete mode 100644 sci-libs/miopen/files/miopen-4.3.0-strip-xnack-in-flags.patch delete mode 100644 sci-libs/miopen/miopen-4.3.0.ebuild (limited to 'sci-libs/miopen') diff --git a/sci-libs/miopen/Manifest b/sci-libs/miopen/Manifest index bf01b50818af..f6a3e9666493 100644 --- a/sci-libs/miopen/Manifest +++ b/sci-libs/miopen/Manifest @@ -2,20 +2,16 @@ 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-4.3.0-no-strip.patch 530 BLAKE2B 7706c0cfb7497a116f1a8a30735615254c907b6a11af243aa2d4945c54fdfb117d6196f0b1fa38163d00d8c7313653cec6342464bde9bf120ccfaf1d795aa374 SHA512 feb4181dbde51a41702450ae7f09231d6a24d94d4a93085250ae07c511d24f45b0149e78ee782b222b6a76e7cfde920598084188a6bcc634875b0fc5979bb708 -AUX miopen-4.3.0-strip-xnack-in-flags.patch 1032 BLAKE2B 6cd0d65676edd394e8b8e06c3ec2a7e7bd16888c81f017f1608db7f658166c6354afc26eb71f70f1a94191ed49a87bc17263ef57b61c74bbace82a51e5dc11ec SHA512 d266707d57b7d05124e808c7ba10d7487a6c07a38285927270eb117422c761e3e382a56401a5f1527177e62fb43fe280e365c823969079842766b345dc0b5747 AUX miopen-5.0.2-gfx1031.patch 11488 BLAKE2B 25b3136015309e8a06de6fcac7864f90d146beb50674db9810ed568b1ff1e8a761bf3a2a96f74ca4e215c1c670df0fcf09bb60c51d54122a063c8c8ee4059ebf SHA512 ebc1fb32aeef147366440e4ded002a833cc2f7b621b5cb2059ec5b3cc5786167c3f5955d04b0e6e3d9cfab86fe6f414e2e74a15db0090429fd97be3671c7445c AUX miopen-5.0.2-no-strip.patch 670 BLAKE2B 20a9c14b5df7d1d964ade240fc5c77ff3d119bded10f3b60e6bb17b98db116d3b7e954a6fb9ff6b5bf47243ca0e2c6160e63f27113a0663ee62eeac438c50f8d SHA512 342238b750bdf8210ccb6fc2e4839ce8d236efeec8bbf23b8fb70b0e31027aac39a8f443f0a38835d59365bc9d55bb0ecb210695c9c6488cd8e765c42754b674 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 22036 BLAKE2B b3072b4f21162324c4ac63a020e5c448ed2df02032a7bf4e2db6f2dfc9742fddae2a7a780cf197f6c4e08123a3fa19b4f76ac22ae33d89f53adec33151eaa6b7 SHA512 8ca0c6f2aa2ffda460cf895be8d9a68aff581f6c388ba5145aa40a2b952f896901c74a24c9a03aa1c693f5f798909922bc8f056efe746f22feba8adccd0dd3d1 +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 -DIST MIOpen-4.3.0.tar.gz 59405686 BLAKE2B fe91bd91a74023866883d6d0a2a8071a8fe40c4cff2fb4ef58fc6e343a05ac2a731f73e657f4d183ade4e5b7c1fbbe41f3f032918f6e50cb713073aee8d97dc5 SHA512 a8615b7738acfbc7f68d9417b0746c62630d2b48fb8485fafba4db65a4b277a8230f601d249d7e54f89ba25c14176429ca76ad8365a437b09d836b031b0c4fbb DIST MIOpen-5.0.2.tar.gz 76294827 BLAKE2B 7b2a1f0e675793aee4a0fa2a270caac8332cda36c8f04cee483cc2882ed987b6e676e9c24a1acf4976a16a10f922b1a6263470b419aa88a29cfcb6d6d4b4cc29 SHA512 a581b45220797904db3e4dd3840f2ef96085f00baf8187c5ab574325a66da4f599dee6496457bb1cc32825b57a13fb0ef35a2ef1bd2a5f449c7e7b9fa64b27d1 DIST MIOpen-5.1.3.tar.gz 88118329 BLAKE2B d24722ffc5f5dab6d6a1de2ce34193ad2f25c9a2562e38c52e010a29870f01d9ea1c56970ba0601a088c8286e97958ee95d0da27fc8082126dd2ebe5ccb36b70 SHA512 a14e28cfcb12e5061e0e7b999ef3e67fa0a0e897e31bc50e7288b8a23eb1791312e33d3b697021c2b654ccc065ae1b046c1cfd77ba8e04b0f3e87e9cc0626dcd -EBUILD miopen-4.3.0.ebuild 2200 BLAKE2B 2f13af068c451192140c7df7957440e02a7f7721036c344748cb83b8f934d81ea43415625d771fe8cd73d436ad302e61dbfd1477933277ab43e9cf9b58af268c SHA512 28fcd69a452a824de2b0bba8e960940506b9b1f9e9c4eef39c842ee26b0aa6ed6e8349cb55a83658ab3fb7f4cb763092857e02216e86da3aaff54b15826a7807 EBUILD miopen-5.0.2.ebuild 2221 BLAKE2B affa8b448a9b67b91921c1fd1390ecece736fb12e40bf24f614b8460d88134810dae2136fc74a5eae1adcf41f8bfd761354679871d834fd340051745ba449ad4 SHA512 3b3197f2b73ba51e8bf095f35d7e4c11e7baefb9de74c67153c99ab1ce0c589f425a3ee40e1779e1c35eaffdbbb69b02e7ee6af0757684f8e4478647015b5250 EBUILD miopen-5.1.3.ebuild 3130 BLAKE2B aea79cb60e5eb33d5036037e82dc7f28dd7bc3f91e8441742b570e1b915a5299df715d1416f7fc1f6db0487d31a1971f8132cda54c01c2798f0cf8c2e3cd6ab2 SHA512 6fee1d5acb2c66150c397ba5d2e536c22de1f00a32ba189b63edc1145a7a50165eb95bbd8fd9ba6ee19168473355dd3ac91595d6f3212785795a023d0c38f5d0 MISC metadata.xml 453 BLAKE2B 4c1e76cbc277e93a92a95cda405973cc72863882ab9a6729a07976e7815119e985688387c14fc5017fd6e85aaa64eaa72b900375c7f7428eb6bbb2569c5ecaa6 SHA512 0e42066a5ac8720d1b561bcf23269013d9cceff52a9ddd6a6e0af58c7d2628c335bb290e0dc6c262a0542e286f54fd07cb487dd908343fac5cfca07410df6e56 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 deleted file mode 100644 index 2d0565821063..000000000000 --- a/sci-libs/miopen/files/miopen-4.3.0-no-strip.patch +++ /dev/null @@ -1,16 +0,0 @@ -Don't strip for release. Let portage handle stripping. ---- orig/CMakeLists.txt -+++ MIOpen-rocm-4.3.0/CMakeLists.txt -@@ -69,12 +69,6 @@ set(MIOPEN_ENABLE_SQLITE_BACKOFF On CACH - option( BUILD_DEV "Build for development only" OFF) - - --# Strip symbols for release --if(NOT WIN32 AND NOT APPLE) -- set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -s") -- set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s") --endif() -- - rocm_setup_version(VERSION 2.12.0) - - list( APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake ) 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 deleted file mode 100644 index dc6db68c2afc..000000000000 --- a/sci-libs/miopen/files/miopen-4.3.0-strip-xnack-in-flags.patch +++ /dev/null @@ -1,18 +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 ---- orig/CMakeLists.txt -+++ MIOpen-rocm-4.3.0/CMakeLists.txt -@@ -191,8 +191,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}") - - # Override HIP version in config.h, if necessary. - # The variables set by find_package() can't be overwritten, diff --git a/sci-libs/miopen/files/miopen-5.1.3-gfx1031.patch b/sci-libs/miopen/files/miopen-5.1.3-gfx1031.patch index 42041f2414ed..de22d66d887a 100644 --- a/sci-libs/miopen/files/miopen-5.1.3-gfx1031.patch +++ b/sci-libs/miopen/files/miopen-5.1.3-gfx1031.patch @@ -14,7 +14,6 @@ Enable gfx1031 support { assert(num_cu == 110); Only in MIOpen-rocm-5.1.3: patches -diff --color -upr MIOpen-rocm-5.1.3/src/composable_kernel/composable_kernel/include/utility/config.hpp gfx1031/src/composable_kernel/composable_kernel/include/utility/config.hpp --- 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 @@ @@ -44,7 +43,6 @@ diff --color -upr MIOpen-rocm-5.1.3/src/composable_kernel/composable_kernel/incl #define CK_USE_AMD_V_FMAC_F32 #define CK_USE_AMD_V_DOT2_F32_F16 #define CK_USE_AMD_V_DOT4_I32_I8 -diff --color -upr MIOpen-rocm-5.1.3/src/include/miopen/solver/ck_utility_common.hpp gfx1031/src/include/miopen/solver/ck_utility_common.hpp --- 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 @@ -64,7 +62,6 @@ diff --color -upr MIOpen-rocm-5.1.3/src/include/miopen/solver/ck_utility_common. // buffer atomic-fadd compiler_flag << " -DCK_USE_AMD_BUFFER_ATOMIC_FADD=" -diff --color -upr MIOpen-rocm-5.1.3/src/include/miopen/solver/implicitgemm_util.hpp gfx1031/src/include/miopen/solver/implicitgemm_util.hpp --- 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 @@ -95,7 +92,6 @@ diff --color -upr MIOpen-rocm-5.1.3/src/include/miopen/solver/implicitgemm_util. } // greatest common divisor, aka highest common factor -diff --color -upr MIOpen-rocm-5.1.3/src/kernels/batchnorm_functions.h gfx1031/src/kernels/batchnorm_functions.h --- 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 @@ @@ -109,7 +105,6 @@ diff --color -upr MIOpen-rocm-5.1.3/src/kernels/batchnorm_functions.h gfx1031/sr #define UNUSED __attribute__((__unused__)) #if(MIO_BN_VARIANT != 4) -diff --color -upr MIOpen-rocm-5.1.3/src/kernels/MIOpenBatchNormActivBwdPerAct.cl gfx1031/src/kernels/MIOpenBatchNormActivBwdPerAct.cl --- 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 @@ @@ -121,7 +116,6 @@ diff --color -upr MIOpen-rocm-5.1.3/src/kernels/MIOpenBatchNormActivBwdPerAct.cl #undef MIOPEN_USE_AMDGCN #define MIOPEN_USE_AMDGCN 1 #endif -diff --color -upr MIOpen-rocm-5.1.3/src/kernels/MIOpenBatchNormActivBwdSpatial.cl gfx1031/src/kernels/MIOpenBatchNormActivBwdSpatial.cl --- 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 @@ @@ -133,7 +127,6 @@ diff --color -upr MIOpen-rocm-5.1.3/src/kernels/MIOpenBatchNormActivBwdSpatial.c #undef MIOPEN_USE_AMDGCN #define MIOPEN_USE_AMDGCN 1 #endif -diff --color -upr MIOpen-rocm-5.1.3/src/kernels/MIOpenBatchNormActivFwdTrainSpatial.cl gfx1031/src/kernels/MIOpenBatchNormActivFwdTrainSpatial.cl --- 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 @@ @@ -145,7 +138,6 @@ diff --color -upr MIOpen-rocm-5.1.3/src/kernels/MIOpenBatchNormActivFwdTrainSpat #undef MIOPEN_USE_AMDGCN #define MIOPEN_USE_AMDGCN 1 #endif -diff --color -upr MIOpen-rocm-5.1.3/src/kernels/MIOpenBatchNormBwdSpatial.cl gfx1031/src/kernels/MIOpenBatchNormBwdSpatial.cl --- 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 @@ @@ -157,7 +149,6 @@ diff --color -upr MIOpen-rocm-5.1.3/src/kernels/MIOpenBatchNormBwdSpatial.cl gfx #undef MIOPEN_USE_AMDGCN #define MIOPEN_USE_AMDGCN 1 #endif -diff --color -upr MIOpen-rocm-5.1.3/src/kernels/MIOpenBatchNormFwdTrainSpatial.cl gfx1031/src/kernels/MIOpenBatchNormFwdTrainSpatial.cl --- 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 @@ @@ -169,7 +160,6 @@ diff --color -upr MIOpen-rocm-5.1.3/src/kernels/MIOpenBatchNormFwdTrainSpatial.c #undef MIOPEN_USE_AMDGCN #define MIOPEN_USE_AMDGCN 1 #endif -diff --color -upr MIOpen-rocm-5.1.3/src/md_graph.cpp gfx1031/src/md_graph.cpp --- 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 @@ -183,7 +173,6 @@ diff --color -upr MIOpen-rocm-5.1.3/src/md_graph.cpp gfx1031/src/md_graph.cpp } } -diff --color -upr MIOpen-rocm-5.1.3/src/ocl/fusionopbiasbnactivocl.cpp gfx1031/src/ocl/fusionopbiasbnactivocl.cpp --- 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 @@ -206,7 +195,6 @@ diff --color -upr MIOpen-rocm-5.1.3/src/ocl/fusionopbiasbnactivocl.cpp gfx1031/s compile_config += add; MIOPEN_LOG_I2(add); -diff --color -upr MIOpen-rocm-5.1.3/src/solver/batchnorm/backward_per_activation.cpp gfx1031/src/solver/batchnorm/backward_per_activation.cpp --- 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( @@ -217,7 +205,6 @@ diff --color -upr MIOpen-rocm-5.1.3/src/solver/batchnorm/backward_per_activation }; kernel.comp_options = build_params.GenerateFor(kbp::OpenCL{}); -diff --color -upr MIOpen-rocm-5.1.3/src/solver/batchnorm/backward_spatial_multiple.cpp gfx1031/src/solver/batchnorm/backward_spatial_multiple.cpp --- 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 @@ -228,7 +215,6 @@ diff --color -upr MIOpen-rocm-5.1.3/src/solver/batchnorm/backward_spatial_multip {"MIO_LAYOUT_NHWC", static_cast(problem.IsLayoutNHWC())}, }; -diff --color -upr MIOpen-rocm-5.1.3/src/solver/batchnorm/backward_spatial_single.cpp gfx1031/src/solver/batchnorm/backward_spatial_single.cpp --- 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( @@ -239,7 +225,6 @@ diff --color -upr MIOpen-rocm-5.1.3/src/solver/batchnorm/backward_spatial_single }; kernel.comp_options = build_params.GenerateFor(kbp::OpenCL{}); -diff --color -upr MIOpen-rocm-5.1.3/src/solver/batchnorm/forward_inference.cpp gfx1031/src/solver/batchnorm/forward_inference.cpp --- 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 @@ -250,7 +235,6 @@ diff --color -upr MIOpen-rocm-5.1.3/src/solver/batchnorm/forward_inference.cpp g }; kernel.comp_options = build_params.GenerateFor(kbp::OpenCL{}); -diff --color -upr MIOpen-rocm-5.1.3/src/solver/batchnorm/forward_per_activation.cpp gfx1031/src/solver/batchnorm/forward_per_activation.cpp --- 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( @@ -261,7 +245,6 @@ diff --color -upr MIOpen-rocm-5.1.3/src/solver/batchnorm/forward_per_activation. }; auto kernel = KernelInfo{}; -diff --color -upr MIOpen-rocm-5.1.3/src/solver/batchnorm/forward_spatial_multiple.cpp gfx1031/src/solver/batchnorm/forward_spatial_multiple.cpp --- 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 @@ -272,7 +255,6 @@ diff --color -upr MIOpen-rocm-5.1.3/src/solver/batchnorm/forward_spatial_multipl {"MIO_LAYOUT_NHWC", static_cast(problem.IsLayoutNHWC())}, }; -diff --color -upr MIOpen-rocm-5.1.3/src/solver/batchnorm/forward_spatial_single.cpp gfx1031/src/solver/batchnorm/forward_spatial_single.cpp --- 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( @@ -283,7 +265,6 @@ diff --color -upr MIOpen-rocm-5.1.3/src/solver/batchnorm/forward_spatial_single. {"MIO_LAYOUT_NHWC", static_cast(problem.IsLayoutNHWC())}, }; -diff --color -upr MIOpen-rocm-5.1.3/src/target_properties.cpp gfx1031/src/target_properties.cpp --- 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( @@ -294,7 +275,6 @@ diff --color -upr MIOpen-rocm-5.1.3/src/target_properties.cpp gfx1031/src/target }; const char* const p_asciz = miopen::GetStringEnv(MIOPEN_DEBUG_ENFORCE_DEVICE{}); -diff --color -upr MIOpen-rocm-5.1.3/test/CMakeLists.txt gfx1031/test/CMakeLists.txt --- 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 @@ -371,7 +351,6 @@ diff --color -upr MIOpen-rocm-5.1.3/test/CMakeLists.txt gfx1031/test/CMakeLists. AND is_full_check AND is_xnack_on_check AND (is_miotensile_check AND is_mlir_check) -diff --color -upr MIOpen-rocm-5.1.3/test/handle_test.cpp gfx1031/test/handle_test.cpp --- 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 @@ -383,7 +362,6 @@ diff --color -upr MIOpen-rocm-5.1.3/test/handle_test.cpp gfx1031/test/handle_tes auto this_arch = h.GetDeviceName(); EXPECT(std::any_of( known_arch.begin(), known_arch.end(), [&](std::string arch) { return arch == this_arch; })); -diff --color -upr MIOpen-rocm-5.1.3/test/mdgraph.cpp gfx1031/test/mdgraph.cpp --- 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 diff --git a/sci-libs/miopen/miopen-4.3.0.ebuild b/sci-libs/miopen/miopen-4.3.0.ebuild deleted file mode 100644 index 41e9131d7714..000000000000 --- a/sci-libs/miopen/miopen-4.3.0.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -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:${SLOT} - >=dev-db/sqlite-3.17 - dev-libs/ocl-icd - dev-util/rocm-clang-ocl:${SLOT} - sci-libs/rocBLAS:${SLOT} - dev-libs/boost -" - -DEPEND="${RDEPEND}" - -BDEPEND="dev-libs/half:0/1" - -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}-4.3.0-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}-4.3.0-no-strip.patch" -) - -src_prepare() { - sed -e "s:/opt/rocm/llvm:""${EPREFIX}""/usr/lib/llvm/roc/ NO_DEFAULT_PATH:" \ - -e "s:/opt/rocm/hip:""${EPREFIX}""/usr/lib/hip/ NO_DEFAULT_PATH:" \ - -e '/set( MIOPEN_INSTALL_DIR/s:miopen:${CMAKE_INSTALL_PREFIX}:' \ - -e '/set(MIOPEN_SYSTEM_DB_PATH/s:${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 - - cmake_src_prepare -} - -src_configure() { - if ! use debug; then - append-cflags "-DNDEBUG" - append-cxxflags "-DNDEBUG" - CMAKE_BUILD_TYPE="Release" - else - CMAKE_BUILD_TYPE="Debug" - fi - - export CXX="${EPREFIX}/usr/lib/llvm/roc/bin/clang++" - - local mycmakeargs=( - -DCMAKE_SKIP_RPATH=ON - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" - -DMIOPEN_BACKEND=HIP - -DBoost_USE_STATIC_LIBS=OFF - -DBUILD_TESTS=$(usex test ON OFF) - ${AMDGPU_TARGETS+-DAMDGPU_TARGETS="${AMDGPU_TARGETS}"} - ) - - cmake_src_configure -} -- cgit v1.2.3