From 3d947253ed94b67c6687fa96a7bbcc2572685f78 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 29 Dec 2022 14:15:14 +0000 Subject: gentoo auto-resync : 29:12:2022 - 14:15:14 --- sci-libs/rocBLAS/Manifest | 2 - ...ensile-4.3.0-hsaco-compile-specified-arch.patch | 96 ---------------------- .../files/Tensile-4.3.0-output-commands.patch | 23 ------ 3 files changed, 121 deletions(-) delete mode 100644 sci-libs/rocBLAS/files/Tensile-4.3.0-hsaco-compile-specified-arch.patch delete mode 100644 sci-libs/rocBLAS/files/Tensile-4.3.0-output-commands.patch (limited to 'sci-libs/rocBLAS') diff --git a/sci-libs/rocBLAS/Manifest b/sci-libs/rocBLAS/Manifest index 633d780e3cb2..9f7676fad6dc 100644 --- a/sci-libs/rocBLAS/Manifest +++ b/sci-libs/rocBLAS/Manifest @@ -1,5 +1,3 @@ -AUX Tensile-4.3.0-hsaco-compile-specified-arch.patch 3859 BLAKE2B 4590978cff0fdb0501ba2405615775cb3f8900ce164c3d57cc59dfe82e1adc25376b6463855a045f5e0652cc985b0015566b95ff28327c59f2db875a84cb49b3 SHA512 57520f1d46f46c7cfd5b8c3ae307da07695c19479b687ce994ad9fba2e755ed7c776c3d8bee8e0642c7613a5d53d8469f329b1eb07563c13d2f7bda8b3d36687 -AUX Tensile-4.3.0-output-commands.patch 1629 BLAKE2B c43395d8e8aeb956d5eb84c8a34ad4b995ed32499ceababeb22d5ca3ac5ee6e8ef353a1467a77943a441f0840b9a6ad1f53202ec8673ef3753aa2bec1395fec4 SHA512 45bdae1d87f6e31d337b22f146b9dee25f4f87357c6ac52bd843556dd742431db10efb55fb8ef815cc9941b5b9f05970d43a6fec0f2d9195c30c633e33d138bf AUX rocBLAS-4.3.0-fix-glibc-2.32-and-above.patch 1254 BLAKE2B d3bcf526f374065ed0615c89ab74cbc203d2d6b6d0a1c49072f3328aaa40aa52f0fa155b23a936a865d353db32f48f348a64f05f157eb6bb2d55c93f9da364d1 SHA512 e899b26e3dc4717cb7854c16d104b9e070067f49e308fe6a38f1be5735a83a814da46ab41752cf4431b4c378d29f31c6082e1fe63e1bf5ae72a55b54a9017c15 AUX rocBLAS-5.0.2-change-default-Tensile-library-dir.patch 2070 BLAKE2B b90c31653c68583432f54c3a17067a92e7fd91e66f902f37e96a7a413b885de57820b93c5a98458b1d6f4b4283138dac274ece1ec97f3fc0dd3ea00ce6002542 SHA512 946f9d66ac703628829ff585890ea9eae71f441e10bb1ff21f8dfad9a5d73279ed4880c4b96ac662be76af10ebe63ccbe0ef9f2c55fb2ebfc5c9087f32119b2a AUX rocBLAS-5.0.2-cpp_lib_filesystem.patch 1546 BLAKE2B e9a794a87b76a41d059c755565ae5da9a361b0c4648a92dd5ce35f9b5bd8c743827fcf79752c393a786c30083cd7db59bc334599d414920ce72c24216d014124 SHA512 e80ac744ce44bc9023de2600290c37577bda6161bfe750ac2b746d8fea7b45334a96461baa74131d0e31db497f8dd123ccd5dc181a40b265c2e2c72e1e479e88 diff --git a/sci-libs/rocBLAS/files/Tensile-4.3.0-hsaco-compile-specified-arch.patch b/sci-libs/rocBLAS/files/Tensile-4.3.0-hsaco-compile-specified-arch.patch deleted file mode 100644 index 8e6753781a2a..000000000000 --- a/sci-libs/rocBLAS/files/Tensile-4.3.0-hsaco-compile-specified-arch.patch +++ /dev/null @@ -1,96 +0,0 @@ -https://github.com/ROCmSoftwarePlatform/Tensile/issues/1395 -https://github.com/ROCmSoftwarePlatform/Tensile/pull/1398 - ---- a/Tensile/TensileCreateLibrary.py -+++ b/Tensile/TensileCreateLibrary.py -@@ -136,6 +136,35 @@ def which(p): - return candidate - return None - -+def splitArchs(): -+ # Helper for architecture -+ def isSupported(arch): -+ return globalParameters["AsmCaps"][arch]["SupportedISA"] and \ -+ globalParameters["AsmCaps"][arch]["SupportedSource"] -+ -+ if ";" in globalParameters["Architecture"]: -+ wantedArchs = globalParameters["Architecture"].split(";") -+ else: -+ wantedArchs = globalParameters["Architecture"].split("_") -+ archs = [] -+ cmdlineArchs = [] -+ if "all" in wantedArchs: -+ for arch in globalParameters['SupportedISA']: -+ if isSupported(arch): -+ if (arch == (9,0,6) or arch == (9,0,8) or arch == (9,0,10)): -+ if (arch == (9,0,10)): -+ archs += [gfxName(arch) + '-xnack+'] -+ cmdlineArchs += [gfxName(arch) + ':xnack+'] -+ archs += [gfxName(arch) + '-xnack-'] -+ cmdlineArchs += [gfxName(arch) + ':xnack-'] -+ else: -+ archs += [gfxName(arch)] -+ cmdlineArchs += [gfxName(arch)] -+ else: -+ for arch in wantedArchs: -+ archs += [re.sub(":", "-", arch)] -+ cmdlineArchs += [arch] -+ return archs, cmdlineArchs - - def buildSourceCodeObjectFile(CxxCompiler, outputPath, kernelFile): - buildPath = ensurePath(os.path.join(globalParameters['WorkingPath'], 'code_object_tmp')) -@@ -149,24 +178,8 @@ def buildSourceCodeObjectFile(CxxCompiler, outputPath, kernelFile): - objectFilename = base + '.o' - soFilename = base + '.so' - -- def isSupported(arch): -- return globalParameters["AsmCaps"][arch]["SupportedISA"] and \ -- globalParameters["AsmCaps"][arch]["SupportedSource"] -- - if (CxxCompiler == "hipcc"): -- archs = [] -- cmdlineArchs = [] -- for arch in globalParameters['SupportedISA']: -- if isSupported(arch): -- if (arch == (9,0,6) or arch == (9,0,8) or arch == (9,0,10)): -- if (arch == (9,0,10)): -- archs += [gfxName(arch) + '-xnack+'] -- cmdlineArchs += [gfxName(arch) + ':xnack+'] -- archs += [gfxName(arch) + '-xnack-'] -- cmdlineArchs += [gfxName(arch) + ':xnack-'] -- else: -- archs += [gfxName(arch)] -- cmdlineArchs += [gfxName(arch)] -+ archs, cmdlineArchs = splitArchs() - - archFlags = ['--offload-arch=' + arch for arch in cmdlineArchs] - -@@ -1063,11 +1076,6 @@ def buildObjectFileNames(solutionWriter, kernelWriterSource, kernelWriterAssembl - sourceKernels = list([k for k in kernels if k['KernelLanguage'] == 'Source']) - asmKernels = list([k for k in kernels if k['KernelLanguage'] == 'Assembly']) - -- # Helper for architecture -- def isSupported(arch): -- return globalParameters["AsmCaps"][arch]["SupportedISA"] and \ -- globalParameters["AsmCaps"][arch]["SupportedSource"] -- - # Build a list of kernel object names. - for kernel in sourceKernels: - sourceKernelNames += [kernelWriterSource.getKernelFileBase(kernel)] -@@ -1081,15 +1089,7 @@ def buildObjectFileNames(solutionWriter, kernelWriterSource, kernelWriterAssembl - - # Source based kernels are built for all supported architectures - if (cxxCompiler == 'hipcc'): -- sourceArchs = [] -- for arch in globalParameters['SupportedISA']: -- if isSupported(arch): -- if (arch == (9,0,6) or arch == (9,0,8) or arch == (9,0,10)): -- if (arch == (9,0,10)): -- sourceArchs += [gfxName(arch) + '-xnack+'] -- sourceArchs += [gfxName(arch) + '-xnack-'] -- else: -- sourceArchs += [gfxName(arch)] -+ sourceArchs, _ = splitArchs() - else: - raise RuntimeError("Unknown compiler %s" % cxxCompiler) - diff --git a/sci-libs/rocBLAS/files/Tensile-4.3.0-output-commands.patch b/sci-libs/rocBLAS/files/Tensile-4.3.0-output-commands.patch deleted file mode 100644 index be5a4db21429..000000000000 --- a/sci-libs/rocBLAS/files/Tensile-4.3.0-output-commands.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --color -uprN orig/Tensile/cmake/TensileConfig.cmake Tensile-rocm-4.3.0/Tensile/cmake/TensileConfig.cmake ---- orig/Tensile/cmake/TensileConfig.cmake 2021-08-18 17:48:00.115478470 +0800 -+++ Tensile-rocm-4.3.0/Tensile/cmake/TensileConfig.cmake 2021-08-18 17:48:49.963478801 +0800 -@@ -234,6 +234,7 @@ function(TensileCreateLibraryFiles - COMMENT "Generating Tensile Libraries" - OUTPUT ${Tensile_EMBED_LIBRARY_SOURCE};${Tensile_MANIFEST_CONTENTS} - COMMAND ${CommandLine} -+ USES_TERMINAL - ) - - set("${Tensile_VAR_PREFIX}_ALL_FILES" ${Tensile_MANIFEST_CONTENTS} PARENT_SCOPE) -diff --color -uprN orig/Tensile/Common.py Tensile-rocm-4.3.0/Tensile/Common.py ---- orig/Tensile/Common.py 2021-08-18 17:48:00.075478470 +0800 -+++ Tensile-rocm-4.3.0/Tensile/Common.py 2021-08-18 17:48:23.287478624 +0800 -@@ -179,7 +179,7 @@ globalParameters["PrintTensorD"] = 0 - globalParameters["PrintTensorRef"] = 0 # Print reference tensor. 0x1=after init; 0x2=after copy-back; 0x3=both - globalParameters["PrintIndexAssignments"] = 0 # Print the tensor index assignment info - globalParameters["PrintWinnersOnly"] = False # Only print the solutions which become the fastest --globalParameters["PrintCodeCommands"] = False # print the commands used to generate the code objects (asm,link,hip-clang, etc) -+globalParameters["PrintCodeCommands"] = True # print the commands used to generate the code objects (asm,link,hip-clang, etc) - globalParameters["DumpTensors"] = False # If True, dump tensors to binary files instead of printing them. - - # TODO - remove this when NewClient is mainstream -- cgit v1.2.3