From patchwork Mon Mar 13 17:34:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Tai X-Patchwork-Id: 47941 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 125A816E0A; Mon, 13 Mar 2023 17:35:24 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.7 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED, URIBL_SBL_A 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 ABD6916DFF for ; Mon, 13 Mar 2023 17:35:21 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pbm4i-0008US-Rn; Mon, 13 Mar 2023 13:35:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pbm4d-0008T0-B7 for guix-patches@gnu.org; Mon, 13 Mar 2023 13:35:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pbm4d-0006wU-0f for guix-patches@gnu.org; Mon, 13 Mar 2023 13:35:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pbm4c-00066b-IL for guix-patches@gnu.org; Mon, 13 Mar 2023 13:35:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62070] [PATCH v5] gnu: pocl: Update to 3.1 References: <20230309090624.765-1-atai@atai.org> In-Reply-To: <20230309090624.765-1-atai@atai.org> Resent-From: Andy Tai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 13 Mar 2023 17:35:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62070 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62070@debbugs.gnu.org Cc: Andy Tai Received: via spool by 62070-submit@debbugs.gnu.org id=B62070.167872886123408 (code B ref 62070); Mon, 13 Mar 2023 17:35:02 +0000 Received: (at 62070) by debbugs.gnu.org; 13 Mar 2023 17:34:21 +0000 Received: from localhost ([127.0.0.1]:35544 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pbm3w-00065U-Ho for submit@debbugs.gnu.org; Mon, 13 Mar 2023 13:34:20 -0400 Received: from mail-pj1-f49.google.com ([209.85.216.49]:46968) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pbm3u-00065H-TM for 62070@debbugs.gnu.org; Mon, 13 Mar 2023 13:34:19 -0400 Received: by mail-pj1-f49.google.com with SMTP id f6-20020a17090ac28600b0023b9bf9eb63so4175382pjt.5 for <62070@debbugs.gnu.org>; Mon, 13 Mar 2023 10:34:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678728852; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:from:to:cc:subject:date:message-id:reply-to; bh=FJ4Epn8ZKSjXvU0nnMMg2laKdowHJenzBh4nPOHW13E=; b=lPiC9wtgKYgJmVLnCfsDyaVz8dGR70bAl90cJtD+aab3nz5YJhGpXMRJYiwaODQ288 1v4stSK39ThnC4JOcW2JANTRy5Y0kgDlAO0PIISrhopzAFivOsE3foLMjzYzphvwXYkb 9Sk7nXVWKpxNpRCLVCMMk/iLDUt+1PumnJvjbFI8qaMcA2u0FsBBffd29nGkQgV3nFgL GAtPvBjjQFTKlO2V4PwBQYtf3x5hv5O+siytSTEgu4q2cVJWErNOgnV/yOxtnDJm/gex QJ/tPUB9UNnVz9Fv36/2fZfeyaeWYu/rUjoJcMkWSAMPbzudSAeaw1loBVficaBvhYx+ vkIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678728852; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=FJ4Epn8ZKSjXvU0nnMMg2laKdowHJenzBh4nPOHW13E=; b=vnxUMGyY6/BiqUmRZt1ALptWJf6cdKn7+EagE5xhVpNEww6vppgpOc92bI1esTksf6 antB/WN+GAOCmSBbcO3cM37J80O+FlcEc9lHfX+HmUG1lkYTjySsk3Xt0peyeapYkbti +5BK/oN/Z0AZOa5Ri19jovVCaQExh1tH7Nrk+s4rRONpPDJTBnaypVmdAcMYsFkdaT/W ZrwKPYqZ4bU2ZY+QpriPVRpfctXylsK4RPBWqVVrk0opJ6rky5khMey0T0zsM5s+72Ws pOdRoZDlF1v+JXRtz3YBGBaznuEb4PKsyFcZ2tFqTPyzzyLbYI9Uz60mjigEQ9C4ii5B zz1w== X-Gm-Message-State: AO0yUKWAspVds31w+7Gd0NqCgVS7zFtgfiAGXGEz0Ipil/AX3DeoApSb guixLVvc0US+RnlXw6PrOZt6lgz7A9U= X-Google-Smtp-Source: AK7set9n54WJUY4OqINvpSiDpzseN5mAOWLgnGtnfpOn8PgwUsnEVXRETyWqWYNDiM4S+pLRv02YOw== X-Received: by 2002:a17:903:486:b0:1a0:48ff:5387 with SMTP id jj6-20020a170903048600b001a048ff5387mr3381839plb.67.1678728852437; Mon, 13 Mar 2023 10:34:12 -0700 (PDT) Received: from localhost.localdomain ([98.37.226.98]) by smtp.googlemail.com with ESMTPSA id jy12-20020a17090342cc00b001992521f23esm154815plb.100.2023.03.13.10.34.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Mar 2023 10:34:11 -0700 (PDT) From: Andy Tai Date: Mon, 13 Mar 2023 10:34:08 -0700 Message-Id: <20230313173408.6781-1-atai@atai.org> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/opencl.scm (pocl): Update to 3.1 [native-inputs]: Add python-3 [arguments]: Update RPATH. Skip failed tests on aarch64 --- gnu/packages/opencl.scm | 73 +++++++++++++++++++++++++---------------- 1 file changed, 44 insertions(+), 29 deletions(-) base-commit: 7001cc68b6d5785a8dd6aa202d4acbb2ea9364e5 diff --git a/gnu/packages/opencl.scm b/gnu/packages/opencl.scm index 2e506156b2..85b063b136 100644 --- a/gnu/packages/opencl.scm +++ b/gnu/packages/opencl.scm @@ -279,38 +279,53 @@ (define-public beignet (define-public pocl (package (name "pocl") - (version "1.4") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/pocl/pocl") - (commit (string-append "v" version)))) - (sha256 - (base32 "1c4y69zks6hkq5fqh9waxgb8g4ka7y6h3vacmsm720kba0h57g8a")) - (file-name (git-file-name name version)))) + (version "3.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pocl/pocl") + (commit (string-append "v" version)))) + (sha256 + (base32 + "1pw4q0hi5ynx34fvzryravz3jbh89f9cg60fkjj77sxh9xw8phdd")) + (file-name (git-file-name name version)) + (modules '((guix build utils))) + (snippet + '(begin + ;; "kernel/test_printf_vectors" and + ;; "kernel/test_printf_vectors_ulongn" + ;; fail on aarch5 and likely other platforms + ;; as commented in CMakeLists.txt + ;; thus disable the block in CMakeList.txt adding + ;; these two tests + (substitute* "tests/kernel/CMakeLists.txt" + (("NOT ENABLE_POCL_FLOAT_CONVERSION") "false")))))) (build-system cmake-build-system) - (native-inputs - (list libltdl pkg-config)) - (inputs - (list clang-9 llvm-9 `(,hwloc-2 "lib") opencl-icd-loader)) + (native-inputs (list libltdl pkg-config python-3)) + (inputs (list clang-15 llvm-15 + `(,hwloc-2 "lib") opencl-icd-loader)) (arguments - `(#:configure-flags - (list "-DENABLE_ICD=ON" - "-DENABLE_TESTSUITES=ON" - ;; We are not developers, don't run conformance suite. - "-DENABLE_CONFORMANCE=OFF" - (string-append "-DEXTRA_HOST_LD_FLAGS=-L" - (assoc-ref %build-inputs "libc") "/lib")) - #:phases - (modify-phases %standard-phases - (add-before 'check 'set-HOME - (lambda _ - (setenv "HOME" "/tmp") + `(#:configure-flags (let* ((libdir (string-append (assoc-ref %outputs + "out") + "/lib"))) + (list "-DENABLE_ICD=ON" + "-DENABLE_TESTSUITES=ON" + ;; We are not developers, don't run conformance suite. + "-DENABLE_CONFORMANCE=OFF" + (string-append "-DEXTRA_HOST_LD_FLAGS=-L" + (assoc-ref %build-inputs + "libc") "/lib") + ;; We need both libdir and libdir/pocl in RUNPATH. + (string-append "-DCMAKE_INSTALL_RPATH=" + libdir ";" libdir "/pocl"))) + #:phases (modify-phases %standard-phases + (add-before 'check 'set-HOME + (lambda _ + (setenv "HOME" "/tmp") - ;; Since 2.9.0, hwloc fails when /sys is missing, so provide a - ;; fake topology. - (setenv "HWLOC_SYNTHETIC" "4")))))) + ;; Since 2.9.0, hwloc fails when /sys is missing, so provide a + ;; fake topology. + (setenv "HWLOC_SYNTHETIC" "4")))))) (home-page "http://portablecl.org/") (synopsis "Portable Computing Language (pocl), an OpenCL implementation") (description