From patchwork Thu Jun 16 12:04:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lars-Dominik Braun X-Patchwork-Id: 40046 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B8E5827BBEA; Thu, 16 Jun 2022 13:05:25 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 300B927BBE9 for ; Thu, 16 Jun 2022 13:05:25 +0100 (BST) Received: from localhost ([::1]:48348 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o1oFY-00053k-55 for patchwork@mira.cbaines.net; Thu, 16 Jun 2022 08:05:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33584) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o1oFC-00052o-K6 for guix-patches@gnu.org; Thu, 16 Jun 2022 08:05:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47042) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o1oFC-0002lb-BA for guix-patches@gnu.org; Thu, 16 Jun 2022 08:05:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o1oFC-0002cE-1L for guix-patches@gnu.org; Thu, 16 Jun 2022 08:05:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55948] [PATCH 0/2] gnu: Update rocm to 5.1.3. Resent-From: Lars-Dominik Braun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 16 Jun 2022 12:05:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55948 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55948@debbugs.gnu.org, ludo@gnu.org, john.kehayias@protonmail.com Received: via spool by 55948-submit@debbugs.gnu.org id=B55948.165538106410006 (code B ref 55948); Thu, 16 Jun 2022 12:05:01 +0000 Received: (at 55948) by debbugs.gnu.org; 16 Jun 2022 12:04:24 +0000 Received: from localhost ([127.0.0.1]:40939 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o1oEZ-0002bK-KH for submit@debbugs.gnu.org; Thu, 16 Jun 2022 08:04:23 -0400 Received: from mout-p-102.mailbox.org ([80.241.56.152]:47478) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o1oEW-0002b2-Jy for 55948@debbugs.gnu.org; Thu, 16 Jun 2022 08:04:22 -0400 Received: from smtp102.mailbox.org (smtp102.mailbox.org [10.196.197.102]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-102.mailbox.org (Postfix) with ESMTPS id 4LP171024Wz9sTP; Thu, 16 Jun 2022 14:04:13 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6xq.net; s=MBO0001; t=1655381053; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CzQ9GQXtH/f1hctt/YzDalD0iCrmAAyfULeSLCHfOmk=; b=jnVn5LFo8YuiBMo0Q90uQ5QriKuKwUrP1ddddDVhwOld1c8OJUr/CqsomPF6BqNReBd3L3 QT8RQC8sQLngXDbCXxr1+aJW1KHshUAQjE0ompFWYdjqCN8qif+1Lj0bqHqATGHG86eP1f EIWHpXtwzdtRx5+iKBit4RL9DYx9r1deCr/wPirYg1Oqx2KCttcdg75aabJZ3n3ew5R5Lo YghGtQD7EFJvrk8Xp/wikDFdFLIfa8NDowOm60n8tsL6uEGGdxi4wDqxY/6jS2DWCtPmea Qjrt5dwPiw7mYzdsAKtfL5ryyH6pp5tHHCLOvge6UExHHLjALoD6h35vM5C9Ug== Date: Thu, 16 Jun 2022 14:04:08 +0200 From: Lars-Dominik Braun Message-ID: References: <87sfo4lu22.fsf@gnu.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <87sfo4lu22.fsf@gnu.org> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hi Ludo, > Pushed! aw, I’m too late. I was going to propose the attached changes. Lars diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 7b197bb67b..f5d3eac588 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -1127,14 +1127,9 @@ (define-public llvm-for-rocm (search-patches "llvm-roc-5.0.0-linkdl.patch" "llvm-roc-4.0.0-remove-isystem-usr-include.patch")))) (arguments - (substitute-keyword-arguments (package-arguments llvm-12) - ((#:phases phases '%standard-phases) - `(modify-phases ,phases - (add-after 'unpack 'chdir - (lambda _ - (chdir "llvm"))))) + (substitute-keyword-arguments (package-arguments llvm-14) ((#:configure-flags flags) - ''("-DLLVM_ENABLE_PROJECTS=llvm;clang;lld" + #~(list"-DLLVM_ENABLE_PROJECTS=llvm;clang;lld" "-DLLVM_TARGETS_TO_BUILD=AMDGPU;X86" "-DCMAKE_SKIP_BUILD_RPATH=FALSE" "-DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE" diff --git a/gnu/packages/rocm.scm b/gnu/packages/rocm.scm index 6c1a83cc88..b85b39d783 100644 --- a/gnu/packages/rocm.scm +++ b/gnu/packages/rocm.scm @@ -193,51 +193,6 @@ (define rocclr-src (base32 "0x1frzpz9j1s516vscbdm9g5cqirvv5w7wmq2kyljcygnci7yqar")))) -(define-public rocclr-4 - (package - (name "rocclr-4") - (version "4.3.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/ROCm-Developer-Tools/ROCclr.git") - (commit (string-append "rocm-" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1pm1y020zriz7zmi95w0rcpka0jrsc7wwh81sssnysi8wxk3nnfy")))) - (build-system cmake-build-system) - (arguments - `(#:tests? #f ; No tests. - #:configure-flags - `(,(string-append - "-DOPENCL_DIR=" - (assoc-ref %build-inputs "rocm-opencl-runtime-src"))))) - (inputs - `(("mesa" ,mesa) - ("rocm-comgr" ,rocm-comgr) - ("llvm" ,llvm-for-rocm) - ("rocm-device-libs" ,rocm-device-libs) - ("rocr-runtime" ,rocr-runtime) - ("rocm-cmake" ,rocm-cmake) - ;; rocclr depends on a few headers provided by rocm-opencl-runtime. - ("rocm-opencl-runtime-src" - ,(origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime.git") - (commit (string-append "rocm-" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1cglpiaj3ny1z74ssmy6j63vj92sfy4q38ix6qsga0mg3b2wvqz3")))))) - (home-page "https://github.com/ROCm-Developer-Tools/ROCclr") - (synopsis "Radeon Open Compute Common Language Runtime") - (description "ROCclr is a virtual device interface that compute runtimes -interact with to different backends such as ROCr or PAL. This abstraction -allows runtimes to work on Windows as well as on Linux without much effort.") - (license license:ncsa))) - (define-public rocm-opencl-runtime (package (name "rocm-opencl-runtime")