From e33383d972aad8129fd4c1ee2b87f529f6efa8e9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 24 Nov 2022 01:09:44 +0000 Subject: gentoo auto-resync : 24:11:2022 - 01:09:44 --- sci-libs/Manifest.gz | Bin 44403 -> 44390 bytes sci-libs/miopen/Manifest | 4 - sci-libs/miopen/files/miopen-5.0.2-gfx1031.patch | 241 ---------------------- sci-libs/miopen/files/miopen-5.0.2-no-strip.patch | 18 -- sci-libs/miopen/miopen-5.0.2.ebuild | 81 -------- sci-libs/mkl/Manifest | 2 +- sci-libs/mkl/metadata.xml | 3 + 7 files changed, 4 insertions(+), 345 deletions(-) delete mode 100644 sci-libs/miopen/files/miopen-5.0.2-gfx1031.patch delete mode 100644 sci-libs/miopen/files/miopen-5.0.2-no-strip.patch delete mode 100644 sci-libs/miopen/miopen-5.0.2.ebuild (limited to 'sci-libs') diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz index a2f469d46c1c..468d140b3ad6 100644 Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ diff --git a/sci-libs/miopen/Manifest b/sci-libs/miopen/Manifest index 10f51846ec25..46916fd4d68e 100644 --- a/sci-libs/miopen/Manifest +++ b/sci-libs/miopen/Manifest @@ -2,16 +2,12 @@ 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-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 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-5.0.2.tar.gz 76294827 BLAKE2B 7b2a1f0e675793aee4a0fa2a270caac8332cda36c8f04cee483cc2882ed987b6e676e9c24a1acf4976a16a10f922b1a6263470b419aa88a29cfcb6d6d4b4cc29 SHA512 a581b45220797904db3e4dd3840f2ef96085f00baf8187c5ab574325a66da4f599dee6496457bb1cc32825b57a13fb0ef35a2ef1bd2a5f449c7e7b9fa64b27d1 DIST MIOpen-5.1.3.tar.gz 88118329 BLAKE2B d24722ffc5f5dab6d6a1de2ce34193ad2f25c9a2562e38c52e010a29870f01d9ea1c56970ba0601a088c8286e97958ee95d0da27fc8082126dd2ebe5ccb36b70 SHA512 a14e28cfcb12e5061e0e7b999ef3e67fa0a0e897e31bc50e7288b8a23eb1791312e33d3b697021c2b654ccc065ae1b046c1cfd77ba8e04b0f3e87e9cc0626dcd -EBUILD miopen-5.0.2.ebuild 2221 BLAKE2B affa8b448a9b67b91921c1fd1390ecece736fb12e40bf24f614b8460d88134810dae2136fc74a5eae1adcf41f8bfd761354679871d834fd340051745ba449ad4 SHA512 3b3197f2b73ba51e8bf095f35d7e4c11e7baefb9de74c67153c99ab1ce0c589f425a3ee40e1779e1c35eaffdbbb69b02e7ee6af0757684f8e4478647015b5250 EBUILD miopen-5.1.3-r1.ebuild 3130 BLAKE2B 207d459d970a54b75422191bb0b649593db96b8e8a4fd857a2086fb7eed911ee39654775455a77968d4404a443737b655485c51c0f6535571b0e291e1a0e5a87 SHA512 614a3b82edd2d07eb28a74e655d6c3d1095c813e0c892cc4688fd171648af1889adf2e2b663c063eb910a13ba7dfc9ec9d6952aee0d7990cdfba4c1139513200 MISC metadata.xml 453 BLAKE2B 4c1e76cbc277e93a92a95cda405973cc72863882ab9a6729a07976e7815119e985688387c14fc5017fd6e85aaa64eaa72b900375c7f7428eb6bbb2569c5ecaa6 SHA512 0e42066a5ac8720d1b561bcf23269013d9cceff52a9ddd6a6e0af58c7d2628c335bb290e0dc6c262a0542e286f54fd07cb487dd908343fac5cfca07410df6e56 diff --git a/sci-libs/miopen/files/miopen-5.0.2-gfx1031.patch b/sci-libs/miopen/files/miopen-5.0.2-gfx1031.patch deleted file mode 100644 index 15ac67bd3cef..000000000000 --- a/sci-libs/miopen/files/miopen-5.0.2-gfx1031.patch +++ /dev/null @@ -1,241 +0,0 @@ -Index: MIOpen-rocm-5.0.2/src/include/miopen/solver/implicitgemm_util.hpp -=================================================================== ---- MIOpen-rocm-5.0.2.orig/src/include/miopen/solver/implicitgemm_util.hpp -+++ MIOpen-rocm-5.0.2/src/include/miopen/solver/implicitgemm_util.hpp -@@ -478,7 +478,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 -@@ -487,7 +487,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) -@@ -608,7 +608,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 -Index: MIOpen-rocm-5.0.2/src/kernels/batchnorm_functions.h -=================================================================== ---- MIOpen-rocm-5.0.2.orig/src/kernels/batchnorm_functions.h -+++ MIOpen-rocm-5.0.2/src/kernels/batchnorm_functions.h -@@ -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) -Index: MIOpen-rocm-5.0.2/src/kernels/MIOpenBatchNormActivBwdPerAct.cl -=================================================================== ---- MIOpen-rocm-5.0.2.orig/src/kernels/MIOpenBatchNormActivBwdPerAct.cl -+++ MIOpen-rocm-5.0.2/src/kernels/MIOpenBatchNormActivBwdPerAct.cl -@@ -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 -Index: MIOpen-rocm-5.0.2/src/kernels/MIOpenBatchNormActivBwdSpatial.cl -=================================================================== ---- MIOpen-rocm-5.0.2.orig/src/kernels/MIOpenBatchNormActivBwdSpatial.cl -+++ MIOpen-rocm-5.0.2/src/kernels/MIOpenBatchNormActivBwdSpatial.cl -@@ -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 -Index: MIOpen-rocm-5.0.2/src/kernels/MIOpenBatchNormActivFwdTrainSpatial.cl -=================================================================== ---- MIOpen-rocm-5.0.2.orig/src/kernels/MIOpenBatchNormActivFwdTrainSpatial.cl -+++ MIOpen-rocm-5.0.2/src/kernels/MIOpenBatchNormActivFwdTrainSpatial.cl -@@ -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 -Index: MIOpen-rocm-5.0.2/src/kernels/MIOpenBatchNormBwdSpatial.cl -=================================================================== ---- MIOpen-rocm-5.0.2.orig/src/kernels/MIOpenBatchNormBwdSpatial.cl -+++ MIOpen-rocm-5.0.2/src/kernels/MIOpenBatchNormBwdSpatial.cl -@@ -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 -Index: MIOpen-rocm-5.0.2/src/kernels/MIOpenBatchNormFwdTrainSpatial.cl -=================================================================== ---- MIOpen-rocm-5.0.2.orig/src/kernels/MIOpenBatchNormFwdTrainSpatial.cl -+++ MIOpen-rocm-5.0.2/src/kernels/MIOpenBatchNormFwdTrainSpatial.cl -@@ -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 -Index: MIOpen-rocm-5.0.2/src/md_graph.cpp -=================================================================== ---- MIOpen-rocm-5.0.2.orig/src/md_graph.cpp -+++ MIOpen-rocm-5.0.2/src/md_graph.cpp -@@ -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); - } - } - -Index: MIOpen-rocm-5.0.2/src/ocl/fusionopbiasbnactivocl.cpp -=================================================================== ---- MIOpen-rocm-5.0.2.orig/src/ocl/fusionopbiasbnactivocl.cpp -+++ MIOpen-rocm-5.0.2/src/ocl/fusionopbiasbnactivocl.cpp -@@ -392,7 +392,8 @@ miopenStatus_t BatchNormBwdTrainFusionOp - " -DMIO_BN_USESAVED=" + std::to_string(static_cast(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); -Index: MIOpen-rocm-5.0.2/src/target_properties.cpp -=================================================================== ---- MIOpen-rocm-5.0.2.orig/src/target_properties.cpp -+++ MIOpen-rocm-5.0.2/src/target_properties.cpp -@@ -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{}); -Index: MIOpen-rocm-5.0.2/test/CMakeLists.txt -=================================================================== ---- MIOpen-rocm-5.0.2.orig/test/CMakeLists.txt -+++ MIOpen-rocm-5.0.2/test/CMakeLists.txt -@@ -37,6 +37,7 @@ option( MIOPEN_TEST_GFX908 "Test on MI10 - option( MIOPEN_TEST_GFX90A "Test on gfx90a" OFF ) - option( MIOPEN_TEST_VEGA "Test on Vega10/20 (gfx900, 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_VEGA OR MIOPEN_TEST_GFX908 OR MIOPEN_TEST_GFX90A OR MIOPEN_TEST_GFX1030 OR MIOPEN_TEST_HIP_NOGPU)) -+if(NOT (MIOPEN_TEST_VEGA 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_VEGA OR MIOPEN_TEST_ - 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|gfx906") -@@ -122,6 +125,7 @@ message(STATUS "MIOPEN_TEST_VEGA ${MIOPE - 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}") - -@@ -164,10 +168,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}) - - set_var_to_condition(WORKAROUND_ISSUE_1317_DEFAULT MIOPEN_TEST_OPENCL) -@@ -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() -@@ -443,7 +447,7 @@ endfunction() - # If nothing is specified, the default value is taken. - # Default: FLOAT_ENABLED HALF_DISABLED BF16_DISABLED INT8_DISABLED - # --# GPU types: VEGA, GFX908, GFX90A, GFX1030 -+# GPU types: VEGA, GFX908, GFX90A, GFX1030, GFX1031 - # VEGA tests are intended to be run on gfx900 or gfx906. - # The option can be enabled or disabled by using '_ENABLED' and '_DISABLED' suffix. - # If nothing is specified, the default value is taken. -@@ -574,7 +578,7 @@ function(add_custom_test NAME) - set_tests_properties(${NAME} PROPERTIES RUN_SERIAL On) - endif() - -- if( (is_vega_check OR is_gfx908_check OR is_gfx1030_check OR is_gfx90a_check) -+ if( (is_vega_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) diff --git a/sci-libs/miopen/files/miopen-5.0.2-no-strip.patch b/sci-libs/miopen/files/miopen-5.0.2-no-strip.patch deleted file mode 100644 index a7be67e99578..000000000000 --- a/sci-libs/miopen/files/miopen-5.0.2-no-strip.patch +++ /dev/null @@ -1,18 +0,0 @@ -Don't strip for release. Let portage handle stripping. -Index: MIOpen-rocm-5.0.2/CMakeLists.txt -=================================================================== ---- MIOpen-rocm-5.0.2.orig/CMakeLists.txt -+++ MIOpen-rocm-5.0.2/CMakeLists.txt -@@ -78,12 +78,6 @@ option( BUILD_DEV "Build for development - option(MIOPEN_ENABLE_FIN "Enable the fin driver for MIOpen" 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.15.0) - - list( APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake ) diff --git a/sci-libs/miopen/miopen-5.0.2.ebuild b/sci-libs/miopen/miopen-5.0.2.ebuild deleted file mode 100644 index 10be8feadaf5..000000000000 --- a/sci-libs/miopen/miopen-5.0.2.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake flag-o-matic - -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 - >=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}-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.0.2-no-strip.patch" - "${FILESDIR}/${PN}-5.0.2-gfx1031.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 '/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) - -DMIOPEN_TEST_ALL=$(usex test ON OFF) - ${AMDGPU_TARGETS+-DAMDGPU_TARGETS="${AMDGPU_TARGETS}"} - ) - - cmake_src_configure -} diff --git a/sci-libs/mkl/Manifest b/sci-libs/mkl/Manifest index b697a8992b10..090194d47f9e 100644 --- a/sci-libs/mkl/Manifest +++ b/sci-libs/mkl/Manifest @@ -10,4 +10,4 @@ AUX mkl-static-lp64-iomp.pc 342 BLAKE2B eddd6bba13426762a47a306469613e2010f5882b AUX mkl-static-lp64-seq.pc 331 BLAKE2B 5c234425fff2462f668fc8dd681a9c3d6d1c4e39f73ec4e5cb984eeeede1f84907ffcba3066b81912b7e8712d2dc154af5703d19d085b0f5a5fa3ab0290f2457 SHA512 b828a7513a491e852c65922159333418be026497d4b0b8b456607463af8b0d71da910e0eb4cd915f5a7eb1d0ff959c87bfc443df352f1f84ce9006530dd0af7f DIST mkl-2020.4.304.tar.gz 549319314 BLAKE2B 9ffdb0dc87c9fba1f003961f09cabef7376bd3d10e98085900c863383f0eb1e026f0f804390b2edf4e29d5b0b685af7b74092a7cb5cc871ca656462cec9487e4 SHA512 9c4ff7710484a1c0dd3e6ba7401eb6cb599f771651006b6a570c45b9abf1f43e8e400940d859a656c6892aa81e634c4d74eefe88e8287fdbb19a513f332326b7 EBUILD mkl-2020.4.304.ebuild 6674 BLAKE2B abe1ed5d32ba1114aee0aa33c4b0259f1ce6f241dbfc146f344903ea5d815e81b4059a54df0ab2b934b3dd672f1471666565989981ed54bbf15283411e7bd8c1 SHA512 3deaa4858df6b8ddb58755ddcbfd62d11ea98af5b38597cfa916b80cf59b23fe043dd667b9b6c2f1d458545579002f07d375a484e0896aa7f6ef5572021baeae -MISC metadata.xml 717 BLAKE2B 1e0c641fb3f818df9d2e952257722cf152e6978c6dd60203228031d5b040243b2a556c4b73daf74676b9152333389fe16d70a345c0f8b2d1527a040e0c14bf65 SHA512 c179f78da3f14f7859cc316248664c7beadb6344a5c7083533c5a3d9d564072fac3feebf9a7cb3506f7856c8d231b7b343882f41f6becd2c3a0164d7c08e909c +MISC metadata.xml 799 BLAKE2B 98a214e275d4d4930086f0dd1695c4d5dfd44da3399f77cc1f839e403423050c6d20f7b38892bd9ff96e5e8578a4c83ff8979e6505dfb67417c6dbb40fe59500 SHA512 3b609c66ec90f057cb16c6721e6a5bfd6a3522a1ff2bba47e2a77212e26f06fb850be8b178a0a2020f751882ddd32fda082879c7f5a9b008c041ce493f55d28a diff --git a/sci-libs/mkl/metadata.xml b/sci-libs/mkl/metadata.xml index 07376226d866..1c12a7532045 100644 --- a/sci-libs/mkl/metadata.xml +++ b/sci-libs/mkl/metadata.xml @@ -13,4 +13,7 @@ capacities. The package is installed as binary and has a restrictive license. Please see license terms and home page for proper use. + + oneapi-src/oneMKL + -- cgit v1.2.3