From patchwork Tue Jan 21 18:31:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Jansa X-Patchwork-Id: 55912 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id D7D83C0218D for ; Tue, 21 Jan 2025 18:31:54 +0000 (UTC) Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by mx.groups.io with SMTP id smtpd.web10.23200.1737484304778900973 for ; Tue, 21 Jan 2025 10:31:45 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=iXeVsZzR; spf=pass (domain: gmail.com, ip: 209.85.128.47, mailfrom: martin.jansa@gmail.com) Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-4361f664af5so69198875e9.1 for ; Tue, 21 Jan 2025 10:31:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1737484303; x=1738089103; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=sgL/MWkyPWn8EMnrS+R2bO/mPx+210UH3ezVRBlcidk=; b=iXeVsZzR3DbuI5MRMoQ4jHafIcjASHwAR0oHMssTv/twL8qwGGZq6M6uh3M2gjV8hX qtHA3yDbazMqWxzLrUjIfb3CrCN7sPjJ3Sb9IRnJ/fSRsI58YgqyXfowrJFHdUFT+R1m pf9PVkcfpnOKLqmPvknrJq94IOPlorMXU/GFEov42EzgAoqkUS3HzN2rlnmgnrlQ9PE8 h04y6X50Y7pLRa520+6dqGnbs9vABN9eeBqGwvBYtPgOo1PN5J1/+xYigpxKzYKdqkWh EkxrvDQbV+azIEpAhgIFqyXJE7jiD/EIZzdcI2zTPR779grQUCu7u7fwP/qRpJPkwxwH qB5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737484303; x=1738089103; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=sgL/MWkyPWn8EMnrS+R2bO/mPx+210UH3ezVRBlcidk=; b=Waw63w2Yg39sunLGz4lST35AratnVlYfMssw4PY/aLyKsTJ2JWdVWepZm7OVMccXqV qQd7tZWJoDhbhdfVPdh3qoZDhuNI9nnaQoILUaZRlTzZZarldeY/dyL45m78yNpkoWNd 05im1UcuL9/xeO6+DP0oMkCKt6T4lYVsIWiD278QgWcOVQ2ObQ52nuIKju9DJIPVksBy NoBYss5qZ6SjP2Hefr+yTHz0ccEPV9jF2iEzKRR3GlV9maYiUlQMQOkC2lueWKHHY5gC N4BCDmeZD8UDC38w0mF66lGre+MYMoFv70pVqJqjkEModR++vmbh+2B7Ak8lDZcoVFxH dDCg== X-Gm-Message-State: AOJu0YzKZPR6NJKxH0D1cIU4KLnXYC2qcR0hv2x+uCB1s+adSz8icV+y TbAV0zE7wIbBGpu1WYRwxql5RCOq+xBrnQVnPlF3ymqMPNwSo0t4M89yqA== X-Gm-Gg: ASbGncvIPzQ4RkY7pPabZVa69C0nsGFOfCX8j949sxsuEiQpu+X7sC1ihGN+50b33HC rVc24QBQINOJ3+sCCj25TWT5ZxKRbdWe0seVV8vypgRUxqYH1OH60aTeFolWM19059HRwrfStbX 2khs0DstKAfrxV4dSIoUkB30qedTIs78fpUtKOyblOg/EXUEIQtoWXi+0Zz7lw4Dazm4QGD199g /P+aQfWtrin2mwMzioEvA5SfnLs210sq5iCnvr7aDmlmAFcsIkp7pwV4b21XuD9WaubtDBjUwmt g8S4EGhbuh0B1e8+oOgjVrywhj4= X-Google-Smtp-Source: AGHT+IHSjoHELDa5Q3LsghPQzpwmc0RjiSMMfHTRcwPdvOaI4AsbPIqDRVBYIEmj7JtkfxXQkRoyJQ== X-Received: by 2002:a05:6000:4008:b0:385:df2c:91b5 with SMTP id ffacd0b85a97d-38bf55bebd7mr17494155f8f.0.1737484302742; Tue, 21 Jan 2025 10:31:42 -0800 (PST) Received: from localhost (ip-109-238-218-228.aim-net.cz. [109.238.218.228]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-38bf322acdcsm14365306f8f.55.2025.01.21.10.31.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jan 2025 10:31:42 -0800 (PST) From: Martin Jansa To: openembedded-devel@lists.openembedded.org Cc: peng.zhang1.cn@windriver.com, Martin Jansa Subject: [meta-oe][PATCH 1/3] lapack: add PACKAGECONFIG for cblas Date: Tue, 21 Jan 2025 19:31:31 +0100 Message-ID: <20250121183133.23102-1-martin.jansa@gmail.com> X-Mailer: git-send-email 2.48.1 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 21 Jan 2025 18:31:54 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/115007 Signed-off-by: Martin Jansa --- meta-oe/recipes-devtools/lapack/lapack_3.12.0.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-oe/recipes-devtools/lapack/lapack_3.12.0.bb b/meta-oe/recipes-devtools/lapack/lapack_3.12.0.bb index 4357515b71..aafcdef681 100644 --- a/meta-oe/recipes-devtools/lapack/lapack_3.12.0.bb +++ b/meta-oe/recipes-devtools/lapack/lapack_3.12.0.bb @@ -24,6 +24,7 @@ S = "${WORKDIR}/git" PACKAGECONFIG ?= "" PACKAGECONFIG[lapacke] = "-DLAPACKE=ON,-DLAPACKE=OFF" +PACKAGECONFIG[cblas] = "-DCBLAS=ON,-DCBLAS=OFF" EXTRA_OECMAKE = " -DBUILD_SHARED_LIBS=ON \ ${@bb.utils.contains('PTEST_ENABLED', '1', ' -DBUILD_TESTING=ON', '', d)} \ From patchwork Tue Jan 21 18:31:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Jansa X-Patchwork-Id: 55911 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id D485FC02182 for ; Tue, 21 Jan 2025 18:31:54 +0000 (UTC) Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by mx.groups.io with SMTP id smtpd.web10.23202.1737484306849810641 for ; Tue, 21 Jan 2025 10:31:47 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=E5hyliWW; spf=pass (domain: gmail.com, ip: 209.85.128.48, mailfrom: martin.jansa@gmail.com) Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-4363dc916ceso505775e9.0 for ; Tue, 21 Jan 2025 10:31:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1737484305; x=1738089105; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=x/APBb2q/AqCfEO+JT1Q+/Y+2hQMGowRnoBEY08AELk=; b=E5hyliWWP5yDOO5ctcjR8tH7fOlVwYOFNC09jc8P2tAxQtlwwDUpMmdmQjpDwdwyE5 Dicrr9QCK46RuxGDRGL1BWH14zbXf3Qp0uTEj+RurW/8vKsSo5a30y5llCmyzxHCf/gF wArWR9gWwj5XD19GWc9N6S1G43z/7g/Lpyoyz6jzIs3ViGa+sggIZzeN1Twb3smGkthP GwzCf/ZY2yfNd44ykkx8hmlt2q18ORzRN2+hiyHOEzQbAY+VxrxKJoECPzjKs9f8goUs yamHJAf/pDWodTYDF/C48WrmxHckjyukDaoI0xLlp/BCDnBV9AGVinduDuS+2fV0CyuT pXBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737484305; x=1738089105; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=x/APBb2q/AqCfEO+JT1Q+/Y+2hQMGowRnoBEY08AELk=; b=NrvGOgCC+8RzdBEh2cWY5YA1hbaJmgi1J7eVxGnoYzQhQv6K1cEfGyamkVk7FWcnwA tARL0C5MTdMn0bKsKnxEkfnnkWKVf/Squ8t9iKNpr3sJ5fUF9TshlNBJ5ME0V/8XORyx I62JCk34YiH+hzr9TdQYgURyglgn7UjaB13/9lKQ12Wj77QbMgJhJNo0hftoo+2ghdRu h9XGv+JSI+pGcCeAmimvkSePQ9d1oPXI9tqT/uBfGY6biScemCrKFnhkxOO37RJEHJxp iia7LIgtn/fKbBd2KRe76ZB3Be94AFpdmuOxzAGx0suFARqdpsQ16Kl0lPTbfzFPGK9a 3rDA== X-Gm-Message-State: AOJu0YyzswF0VWtypwZBpAPSV8HkEHU5TgdcJxV/rE5GlrmNjg5uoQJ3 8Av2NqSzxVTqBNafxQf/c8ai8IJBQDqY34KEg02lh5k3d3QeuPMGx0BebQ== X-Gm-Gg: ASbGncvNTV3OAVhitRAcwrvgUzP3KjLVDowakjXRgHOvzGxnBzDJDumGi2Px1wy4Slz l869LZMJo/Jk2xyNuwFCfQzHHQFme5UonzSBKDPeBkERBT7ONZ38iZyDiCTbX3YoX6y5QB1ptq/ I3Clcec3gB4U9w+uF3rJY5RUsuJWC3Tzv/G1Y4AaGOasj9vtvmOkNZvrsWUX8LCMx+OMPN7ZONr uKYbzuIdXwCRMHYQ/rKIWvFrX/GgKFeZpwzmUfrcwL718XFjrpB1jfWPNDj9af1GV/XZn4j+JoQ xr8UaRH8MX+tvsJnawJoXKsnZNg= X-Google-Smtp-Source: AGHT+IElnUYJVzCubf49pX3x5QzL8Zo0pFzLGhbhnHl2YHddptKeHm0UpcLeadmrUreGb3CwIModiA== X-Received: by 2002:a05:600c:1e29:b0:434:e892:1033 with SMTP id 5b1f17b1804b1-437c6b7b184mr239322115e9.2.1737484304990; Tue, 21 Jan 2025 10:31:44 -0800 (PST) Received: from localhost (ip-109-238-218-228.aim-net.cz. [109.238.218.228]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-437c753cc1fsm252778375e9.39.2025.01.21.10.31.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jan 2025 10:31:44 -0800 (PST) From: Martin Jansa To: openembedded-devel@lists.openembedded.org Cc: peng.zhang1.cn@windriver.com, Martin Jansa Subject: [meta-oe][PATCH 2/3] lapack: fix buildpaths in ptest also when CBLAS is enabled Date: Tue, 21 Jan 2025 19:31:32 +0100 Message-ID: <20250121183133.23102-2-martin.jansa@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250121183133.23102-1-martin.jansa@gmail.com> References: <20250121183133.23102-1-martin.jansa@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 21 Jan 2025 18:31:54 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/115008 ERROR: lapack-3.12.0-r0 do_package_qa: QA Issue: File /usr/lib/lapack/ptest/bin/xccblat3 in package lapack-ptest contains reference to TMPDIR File /usr/lib/lapack/ptest/bin/xdcblat3 in package lapack-ptest contains reference to TMPDIR File /usr/lib/lapack/ptest/bin/xdcblat1 in package lapack-ptest contains reference to TMPDIR File /usr/lib/lapack/ptest/bin/xscblat1 in package lapack-ptest contains reference to TMPDIR File /usr/lib/lapack/ptest/bin/xccblat2 in package lapack-ptest contains reference to TMPDIR File /usr/lib/lapack/ptest/bin/xzcblat2 in package lapack-ptest contains reference to TMPDIR File /usr/lib/lapack/ptest/bin/xzcblat1 in package lapack-ptest contains reference to TMPDIR File /usr/lib/lapack/ptest/bin/xccblat1 in package lapack-ptest contains reference to TMPDIR File /usr/lib/lapack/ptest/bin/xdcblat2 in package lapack-ptest contains reference to TMPDIR File /usr/lib/lapack/ptest/bin/xscblat2 in package lapack-ptest contains reference to TMPDIR File /usr/lib/lapack/ptest/bin/xscblat3 in package lapack-ptest contains reference to TMPDIR File /usr/lib/lapack/ptest/bin/xzcblat3 in package lapack-ptest contains reference to TMPDIR [buildpaths] Signed-off-by: Martin Jansa --- .../recipes-devtools/lapack/lapack_3.12.0.bb | 23 ++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/meta-oe/recipes-devtools/lapack/lapack_3.12.0.bb b/meta-oe/recipes-devtools/lapack/lapack_3.12.0.bb index aafcdef681..4845d34106 100644 --- a/meta-oe/recipes-devtools/lapack/lapack_3.12.0.bb +++ b/meta-oe/recipes-devtools/lapack/lapack_3.12.0.bb @@ -35,7 +35,12 @@ inherit cmake pkgconfig ptest EXCLUDE_FROM_WORLD = "1" # The `xerbla.o` file contains an absolute path in `xerbla.f.o`, but the options -# `-fdebug-prefix-map` and `-ffile-prefix-map` cannot be used because gfortran does not support them. +# `-fdebug-prefix-map` and `-ffile-prefix-map` cannot be used because gfortran does +# not support them. And we cannot easily change CMake to use relative paths, because +# it will convert them to absolute paths when generating Unix Makefiles or Ninja: +# https://gitlab.kitware.com/cmake/community/-/wikis/FAQ#why-does-cmake-use-full-paths-or-can-i-copy-my-build-tree +# https://gitlab.kitware.com/cmake/cmake/-/issues/13894 +# # To address this issue, we manually replace the absolute path with a relative path # in the generated `build.make` file. # @@ -46,7 +51,7 @@ EXCLUDE_FROM_WORLD = "1" # of `xerbla.f` to a relative path. The steps are as follows: # # 1. Locate all `build.make` files after the `do_configure` step is completed. -# 2. Compute the relative path for `xerbla.f` based on the current build directory. +# 2. Compute the relative path for various `*.f` files based on the current build directory. # 3. Replace the absolute path with the calculated relative path in the `build.make` files # # Additionally, when ptests are enabled, apply a simpler workaround for ptest code: @@ -54,11 +59,17 @@ EXCLUDE_FROM_WORLD = "1" # the MATGEN subdirectory, with a relative path prefix of `"../../.."`. do_configure:append(){ for file in `find ${B} -name build.make`; do - sed -i -e "s#\(.*-c \).*\(/xerbla\.f \)#\1$(grep '\-c .*xerbla\.f' $file | awk -F'cd ' '{print $2}'| \ - awk '{src=$1; sub(/.*-c /, ""); sub(/xerbla\.f.*/, ""); obj=$0; print src, obj}' | \ - while read src obj; do echo "$(realpath --relative-to="$src" "$obj")"; done)\2#g" $file + # Replacing all .f files found with: + # for f in $(find ${S} -name \*.f -printf " %f" | sort -u); do + # would be more reliable with other optional PACKAGECONFIGs, but also very slow as there are + # ~ 3500 of them and this loop takes around 20 minutes + for f in xerbla c_cblat1 c_cblat2 c_cblat3 c_dblat1 c_dblat2 c_dblat3 c_sblat1 c_sblat2 c_sblat3 c_zblat1 c_zblat2 c_zblat3; do + sed -i -e "s#\(.*-c \).*\(/$f\.f \)#\1$(grep "\-c .*$f\.f" $file | awk -F'cd ' '{print $2}'| \ + awk "{src=\$1; sub(/.*-c /, \"\"); sub(/$f\.f.*/, \"\"); obj=\$0; print src, obj}" | \ + while read src obj; do echo "$(realpath --relative-to="$src" "$obj")"; done)\2#g" $file + done done - if (${@bb.utils.contains('PTEST_ENABLED', '1', 'true', 'false', d)});then + if ${@bb.utils.contains('PTEST_ENABLED', '1', 'true', 'false', d)} ; then for file in `find . -name build.make -path '*TESTING*' -not -path '*MATGEN*'`; do sed -i -e "s#\(.*-c \)\(${WORKDIR}\)\(.*.[f|F] \)#\1../../..\3#g" $file done From patchwork Tue Jan 21 18:31:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Jansa X-Patchwork-Id: 55910 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id D5B75C0218C for ; Tue, 21 Jan 2025 18:31:54 +0000 (UTC) Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by mx.groups.io with SMTP id smtpd.web10.23205.1737484307710548935 for ; Tue, 21 Jan 2025 10:31:48 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=FdBqedLI; spf=pass (domain: gmail.com, ip: 209.85.128.44, mailfrom: martin.jansa@gmail.com) Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-436249df846so41480045e9.3 for ; Tue, 21 Jan 2025 10:31:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1737484306; x=1738089106; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=wTn2cuf4X0ah9FjJlrxsCkCkxrRKAUvV+9UeSHWx81o=; b=FdBqedLI/OAZS6fNEySnTuE0Q83aLpxAT2DeutqPMEwfaBlSDZ1vguKP361MNiGfAw Ay7Xn7B0r+lMOr0P7IpcAlnQ8NFPsN6kiEgkhl4EqGbDc4ZrfVY52VgoHDj2yTGvJ+Y7 HEykYFL5dbqyO89T6DZbAc0oAmAlOJ7jmvA2LKIPqlqcAqa+6SIazO1V1AhQXYbXEEpj xJeTREWSC31iWKpftafaixqsPTgE0aH/Kc6Z43FSaQJn46iCWkUx3WMxNmiY3vBlEKN8 KT7fJ2SVZrNPqxxkgiwQAjwcKtNoPbYr8Xtgwtw6HjdtbKn3cz0pYuU7jPrhnRoWcwJx 6BTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737484306; x=1738089106; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wTn2cuf4X0ah9FjJlrxsCkCkxrRKAUvV+9UeSHWx81o=; b=PnWPPBcsNcTeaiaf0emVASnucnukl+K4MfyXd8mLQHTCZK/CJQsHqOZZto2a6tviOl uKGew6lWUqQEaN/iv12SZ2XK/Rgm9DXc6l40citlGIXCNNLcTfBhS+QLTSntNVP6VgJp xm6GM9xQNVDxcRFp82x6yoLLj4t5BeL46jVFj7y7ggvRVfFwF/ZRydWKMGL5jE2YofJD 0cr3Sy8d3hVThHeWtprBmxQJPPSvcKt2EqIc1T9JFwcT9mQRyC964CwB7vxdsm4lFoFR c1kyxGFQbOLC6w5GCKh82skjB7wYo7ZzsJ7TMonY9u4MDiuu78dq8ypL+A75kF3dZk/G aggg== X-Gm-Message-State: AOJu0YwCiHyipvwXSfdrHfipe9SwAqGw2m2z7S8IWTAhQnexs1I2MFCo Dc/Mhw3TSvQkj/S8jVcfce73P+qQcq8Gk74d/LTvFwITihlBhWLpVpfSeA== X-Gm-Gg: ASbGnctrRo6O5dU8ESNJnMa2xPCdr1QRiuyyCX/ulGSvg5g6U7iM4eA6M2C6WMnVk01 0gLMg3YBj/lsNiEsdxweoBoypWgNik5/W7GDgRHUa2ZB01WD9O4PsMaKeaAN/fksWnSnIIBkgM2 DtRjGdZ9dj5DAFbiMs12tL6iNx/vnY2OKPBrQZpg6du1Gfo2hzcqAf0dCQk7VZUWFX7A6GesueC icwh+Hx4NH8ABp3E7dSJ7A31tQGtZ4KjCMd3jc7o80MVZHo/A5BTd68upAlAw9S+WEcNXMUEhzy AxWtmeLd/BRW8B4EdlbOeehr6R0= X-Google-Smtp-Source: AGHT+IFapZdp0LazwCSxdlibC84l8VuJb5q39v43HzX5qUhRP4Piaq+QLOtPKDDis0Vu9JopZVo2tg== X-Received: by 2002:a05:600c:a03:b0:434:a902:97cd with SMTP id 5b1f17b1804b1-438913ed350mr178462515e9.12.1737484305899; Tue, 21 Jan 2025 10:31:45 -0800 (PST) Received: from localhost (ip-109-238-218-228.aim-net.cz. [109.238.218.228]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-38bf321508esm14312664f8f.10.2025.01.21.10.31.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jan 2025 10:31:45 -0800 (PST) From: Martin Jansa To: openembedded-devel@lists.openembedded.org Cc: peng.zhang1.cn@windriver.com, Martin Jansa Subject: [meta-oe][PATCH 3/3] lapack: upgrade to latest 3.12.1 Date: Tue, 21 Jan 2025 19:31:33 +0100 Message-ID: <20250121183133.23102-3-martin.jansa@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250121183133.23102-1-martin.jansa@gmail.com> References: <20250121183133.23102-1-martin.jansa@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 21 Jan 2025 18:31:54 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/115009 * adjust the list of .f files to cover also newly used .f90 files, causing: http://errors.yoctoproject.org/Errors/Details/840502/ ERROR: lapack-3.12.1-r0 do_package_qa: QA Issue: File /usr/lib/lapack/ptest/bin/xdmdeigtsts in package lapack-ptest contains reference to TMPDIR [buildpaths] ERROR: lapack-3.12.1-r0 do_package_qa: QA Issue: File /usr/lib/lapack/ptest/bin/xdmdeigtstd in package lapack-ptest contains reference to TMPDIR [buildpaths] ERROR: lapack-3.12.1-r0 do_package_qa: QA Issue: File /usr/lib/lapack/ptest/bin/xdmdeigtstz in package lapack-ptest contains reference to TMPDIR [buildpaths] ERROR: lapack-3.12.1-r0 do_package_qa: QA Issue: File /usr/lib/lapack/ptest/bin/xdmdeigtstc in package lapack-ptest contains reference to TMPDIR [buildpaths] ERROR: lapack-3.12.1-r0 do_package_qa: Fatal QA errors were found, failing task. Signed-off-by: Martin Jansa --- .../lapack/{lapack_3.12.0.bb => lapack_3.12.1.bb} | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) rename meta-oe/recipes-devtools/lapack/{lapack_3.12.0.bb => lapack_3.12.1.bb} (90%) diff --git a/meta-oe/recipes-devtools/lapack/lapack_3.12.0.bb b/meta-oe/recipes-devtools/lapack/lapack_3.12.1.bb similarity index 90% rename from meta-oe/recipes-devtools/lapack/lapack_3.12.0.bb rename to meta-oe/recipes-devtools/lapack/lapack_3.12.1.bb index 4845d34106..87a5747246 100644 --- a/meta-oe/recipes-devtools/lapack/lapack_3.12.0.bb +++ b/meta-oe/recipes-devtools/lapack/lapack_3.12.1.bb @@ -16,7 +16,7 @@ DEPENDS = "libgfortran \ " RDEPENDS:${PN}-ptest += "cmake" -SRCREV = "04b044e020a3560ccfa9988c8a80a1fb7083fc2e" +SRCREV = "5ebe92156143a341ab7b14bf76560d30093cfc54" SRC_URI = "git://github.com/Reference-LAPACK/lapack.git;protocol=https;branch=master \ ${@bb.utils.contains('PTEST_ENABLED', '1', 'file://run-ptest', '', d)} \ " @@ -63,9 +63,9 @@ do_configure:append(){ # for f in $(find ${S} -name \*.f -printf " %f" | sort -u); do # would be more reliable with other optional PACKAGECONFIGs, but also very slow as there are # ~ 3500 of them and this loop takes around 20 minutes - for f in xerbla c_cblat1 c_cblat2 c_cblat3 c_dblat1 c_dblat2 c_dblat3 c_sblat1 c_sblat2 c_sblat3 c_zblat1 c_zblat2 c_zblat3; do - sed -i -e "s#\(.*-c \).*\(/$f\.f \)#\1$(grep "\-c .*$f\.f" $file | awk -F'cd ' '{print $2}'| \ - awk "{src=\$1; sub(/.*-c /, \"\"); sub(/$f\.f.*/, \"\"); obj=\$0; print src, obj}" | \ + for f in xerbla.f c_cblat1.f c_cblat2.f c_cblat3.f c_dblat1.f c_dblat2.f c_dblat3.f c_sblat1.f c_sblat2.f c_sblat3.f c_zblat1.f c_zblat2.f c_zblat3.f cchkdmd.f90 dchkdmd.f90 schkdmd.f90 zchkdmd.f90; do + sed -i -e "s#\(.*-c \).*\(/$f \)#\1$(grep "\-c .*$f" $file | awk -F'cd ' '{print $2}'| \ + awk "{src=\$1; sub(/.*-c /, \"\"); sub(/$f.*/, \"\"); obj=\$0; print src, obj}" | \ while read src obj; do echo "$(realpath --relative-to="$src" "$obj")"; done)\2#g" $file done done