From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id YH/7KTN8hWb3ZQEA62LTzQ:P1 (envelope-from ) for ; Wed, 03 Jul 2024 16:28:35 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id YH/7KTN8hWb3ZQEA62LTzQ (envelope-from ) for ; Wed, 03 Jul 2024 18:28:35 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=PAYGMjl5; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1720024115; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=hLllJOyPIySSDm68EM2LRxsxar9jw1smeMVpZc8r5RU=; b=V6Xk9Wp9qaJDNHHfxwm5JR3b3cHAoB2j7GedyZ1eLOWT0wzsjnK7Mp13TOIOD196AKwVw6 sF+bFdBxXl4XpIJ5JTkTrldSvFa3fQG81qgAzm6HB7nQZSj0aXgJcZf8E0PNXNIioJ0jIY h6D02hKQS+fZ2AnGOU80p6feruuCbYTcUXOLNt/gxUvoDbJALlhMdTQ6ncIXfeA1tBtdYp TCDGk5CdEVo8i8e8XrejceRBPPZWw64Ufmr4u7kw8y4eJSiKjhUxEeb6FNoG+aX/0RcmHE Z1gebn95f1LBSlSHeNA6NQ65N7s9FUC55DyFZbqrv9h8ZksWVwtd8Wsnqr6KRA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=PAYGMjl5; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1720024115; a=rsa-sha256; cv=none; b=etlb5BqPn6qAyIX+wXI53L6wGFFhn8H14waFiD03TDMMyPmxoaZHdNb3p82MlpzlEMcQLS sOK4avWC8WUJjzOcsHdhtAarV5LnUxLSa7DHpVUJi1i5EvW7T0PsCd5e7WBA5Ow87CIR5/ UmKnuyldGu8j5Rc820BXHIZTNpbpfK3ZB0rImYQHuxy1+c5yBSU5z7Aww86fF8P1nSFXTb 3jIILSS9bYC0vAa+grGRxDniPbTBZHNWTY95LMjzS5gC0btN1qU+ga/PduMjgN3s+C4hMj eanDcEj8xtIcu8pWvIMwDFOwhp4qNm7YU36y5XzLHEwSoGIFzYOyueKYhLUxXQ== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 3C7DD56690 for ; Wed, 3 Jul 2024 18:28:35 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sP2q8-0008JV-OY; Wed, 03 Jul 2024 12:28:16 -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 1sP1jA-0001lb-4u for guix-patches@gnu.org; Wed, 03 Jul 2024 11:17:00 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sP1j9-0004rz-Rk for guix-patches@gnu.org; Wed, 03 Jul 2024 11:16:59 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sP1jB-0004Og-JQ for guix-patches@gnu.org; Wed, 03 Jul 2024 11:17:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71920] [PATCH] gnu: xyce: Update to 7.8. Resent-From: Robin Ole Heinemann Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 03 Jul 2024 15:17:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 71920 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71920@debbugs.gnu.org Cc: Robin Ole Heinemann X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.172001981616883 (code B ref -1); Wed, 03 Jul 2024 15:17:01 +0000 Received: (at submit) by debbugs.gnu.org; 3 Jul 2024 15:16:56 +0000 Received: from localhost ([127.0.0.1]:40140 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sP1j5-0004OE-QF for submit@debbugs.gnu.org; Wed, 03 Jul 2024 11:16:56 -0400 Received: from lists.gnu.org ([209.51.188.17]:46604) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sP1j3-0004O6-6h for submit@debbugs.gnu.org; Wed, 03 Jul 2024 11:16:53 -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 1sP1j1-0001kE-2j for guix-patches@gnu.org; Wed, 03 Jul 2024 11:16:51 -0400 Received: from mail-ed1-x531.google.com ([2a00:1450:4864:20::531]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sP1ix-0004qZ-3l for guix-patches@gnu.org; Wed, 03 Jul 2024 11:16:50 -0400 Received: by mail-ed1-x531.google.com with SMTP id 4fb4d7f45d1cf-58c947a6692so1670127a12.0 for ; Wed, 03 Jul 2024 08:16:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720019804; x=1720624604; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=hLllJOyPIySSDm68EM2LRxsxar9jw1smeMVpZc8r5RU=; b=PAYGMjl5BNXvofxjuTbfpNtHDtgcHYXRbO2WG2ausrfc2ggIWu3dPkGsEsAxEKGmsg 6Tzt9vERQL3CPjTksl1XxaiewhqLGy2x4q0lIhC3GS0Y0BWLIYRbw0ET5pJ0oS6f8GlZ PVvpbCT8A6RtX2Da+GhTySmtPM2/qvcYmtuJjDcjS2/6cXfhmKlximHl6d83gwwWXEv0 PbCN7EWpZJSLNXXXEo5zkp7aaRaPXgMzgXstIFZP7NhqGRsWkcwRVHsgFNP2hKP34mdc 1F9TXgR0djm8x0T7gnNi+IceWD4xuPGXQGPzsBi2C/d2DeAv+EExMCHfXnWfvka82DR3 9Urw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720019804; x=1720624604; 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=hLllJOyPIySSDm68EM2LRxsxar9jw1smeMVpZc8r5RU=; b=YlpOnCyhNlm6oKiHXzS/oDIFGO5RU7qxrNlPk744DMQLpBYsMkKgFJneHtXO4nQ1y6 iO+p9qiscSQmj4nJnDVXhPtUJBCgSJxGQTm6pTQgHW1JOttsD19lEGbtjj0GLsy8x2Gn 6QhOWouGs7v+5r2f4aMdXiz5hWSIdo6tQqLlFVtbAUVuveKAXuPo1Usd/K10b7vy1i9v f373q6E0xQCClgo28MacI8xifQfEemEqBFPwqf+Yd8RGRdkhPuN9erVUcPX6AMyAyeuY +u0NOeBZ8z8rxXCnzVD/w7EiQ07SJrYppR9D5EreeDeE7ZIeJ44vgwnXqUPxUQ/rKg1p i1nA== X-Gm-Message-State: AOJu0Yzk6rhuHnAgddIYppyR+DTwc+7yZotJgoJbdg+0HBd4g2EMWrAe t+r1dkjSRyOFClhpqWagLwXUi8ZzRtwAU7GhvvapiHQVgjNfkMjC8UYzOA== X-Google-Smtp-Source: AGHT+IGI4iCvMj0iCg2jqFmNrFIvFLzll2uaTLN1kYfKS+/ewEZMefyKqa5astXz3NZ4dew6gSNH3g== X-Received: by 2002:a17:906:6898:b0:a6f:2ee7:b21a with SMTP id a640c23a62f3a-a75144a7a7fmr734417566b.65.1720019803886; Wed, 03 Jul 2024 08:16:43 -0700 (PDT) Received: from localhost (ip-046-223-058-012.um13.pools.vodafone-ip.de. [46.223.58.12]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a72aaf1b555sm512413666b.5.2024.07.03.08.16.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jul 2024 08:16:43 -0700 (PDT) From: Robin Ole Heinemann Date: Wed, 3 Jul 2024 17:16:12 +0200 Message-ID: <7055f694200985944497842ed3668f4e93658eff.1720019772.git.robin.ole.heinemann@gmail.com> X-Mailer: git-send-email 2.45.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::531; envelope-from=robin.ole.heinemann@gmail.com; helo=mail-ed1-x531.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Wed, 03 Jul 2024 12:28:15 -0400 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Queue-Id: 3C7DD56690 X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -4.99 X-Spam-Score: -4.99 X-TUID: jqhvhS02WhHe * gnu/packages/engineering.scm (xyce-{serial,parallel}): Update to 7.8. [inputs]: Remove lapack. Add openblas. [arguments]: Add option to 'configure-flags' to use openblas instead of lapack. Change-Id: Ie99689829c679851233e186c639924935de6b297 --- gnu/packages/engineering.scm | 181 ++++++++++++++++++----------------- 1 file changed, 93 insertions(+), 88 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 64335d89f7..344a12fd2e 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2079,44 +2079,49 @@ (define trilinos-serial-xyce (build-system cmake-build-system) (arguments `(#:out-of-source? #t - #:phases - (modify-phases %standard-phases - ;; Delete unneeded tribits(build system) directory which makes validate-runpath - ;; phase to fail. - (add-before 'validate-runpath 'delete-tribits - (lambda* (#:key outputs #:allow-other-keys) - (delete-file-recursively - (string-append (assoc-ref outputs "out") - "/lib/cmake/tribits"))))) - #:configure-flags - (list "-DCMAKE_CXX_FLAGS=-O3 -fPIC" - "-DCMAKE_C_FLAGS=-O3 -fPIC" - "-DCMAKE_Fortran_FLAGS=-O3 -fPIC" - "-DTrilinos_ENABLE_NOX=ON" - "-DNOX_ENABLE_LOCA=ON" - "-DTrilinos_ENABLE_EpetraExt=ON" - "-DEpetraExt_BUILD_BTF=ON" - "-DEpetraExt_BUILD_EXPERIMENTAL=ON" - "-DEpetraExt_BUILD_GRAPH_REORDERINGS=ON" - "-DTrilinos_ENABLE_TrilinosCouplings=ON" - "-DTrilinos_ENABLE_Ifpack=ON" - "-DTrilinos_ENABLE_Isorropia=ON" - "-DTrilinos_ENABLE_AztecOO=ON" - "-DTrilinos_ENABLE_Belos=ON" - "-DTrilinos_ENABLE_Teuchos=ON" - "-DTeuchos_ENABLE_COMPLEX=ON" - "-DTrilinos_ENABLE_Amesos=ON" - "-DAmesos_ENABLE_KLU=ON" - "-DAmesos_ENABLE_UMFPACK=ON" - "-DTrilinos_ENABLE_Sacado=ON" - "-DTrilinos_ENABLE_Kokkos=OFF" - "-DTrilinos_ENABLE_ALL_OPTIONAL_PACKAGES=OFF" - "-DTPL_ENABLE_AMD=ON" - "-DTPL_ENABLE_UMFPACK=ON" - "-DTPL_ENABLE_BLAS=ON" - "-DTPL_ENABLE_LAPACK=ON"))) + #:phases (modify-phases %standard-phases + ;; Delete unneeded tribits(build system) directory which makes validate-runpath + ;; phase to fail. + (add-before 'validate-runpath 'delete-tribits + (lambda* (#:key outputs #:allow-other-keys) + (delete-file-recursively (string-append (assoc-ref + outputs "out") + "/lib/cmake/tribits"))))) + #:configure-flags (list "-DCMAKE_CXX_FLAGS=-O3 -fPIC" + "-DCMAKE_C_FLAGS=-O3 -fPIC" + "-DCMAKE_Fortran_FLAGS=-O3 -fPIC" + "-DTrilinos_ENABLE_NOX=ON" + "-DNOX_ENABLE_LOCA=ON" + "-DTrilinos_ENABLE_EpetraExt=ON" + "-DEpetraExt_BUILD_BTF=ON" + "-DEpetraExt_BUILD_EXPERIMENTAL=ON" + "-DEpetraExt_BUILD_GRAPH_REORDERINGS=ON" + "-DTrilinos_ENABLE_TrilinosCouplings=ON" + "-DTrilinos_ENABLE_Ifpack=ON" + "-DTrilinos_ENABLE_Isorropia=ON" + "-DTrilinos_ENABLE_AztecOO=ON" + "-DTrilinos_ENABLE_Belos=ON" + "-DTrilinos_ENABLE_Teuchos=ON" + "-DTrilinos_ENABLE_COMPLEX_DOUBLE=ON" + "-DTrilinos_ENABLE_Amesos=ON" + "-DAmesos_ENABLE_KLU=ON" + "-DAmesos_ENABLE_UMFPACK=ON" + "-DTrilinos_ENABLE_Amesos2=ON" + "-DAmesos2_ENABLE_KLU2=ON" + "-DAmesos2_ENABLE_Basker=ON" + "-DTrilinos_ENABLE_Sacado=ON" + "-DTrilinos_ENABLE_Stokhos=ON" + "-DTrilinos_ENABLE_Kokkos=ON" + "-DTrilinos_ENABLE_ALL_OPTIONAL_PACKAGES=OFF" + "-DTrilinos_ENABLE_CXX11=ON" + "-DTPL_ENABLE_AMD=ON" + "-DTPL_ENABLE_UMFPACK=ON" + "-DTPL_ENABLE_BLAS=ON" + "-DTPL_ENABLE_LAPACK=ON" + "-DBLAS_LIBRARY_NAMES=openblas" + "-DLAPACK_LIBRARY_NAMES=openblas"))) (native-inputs (list gfortran swig)) - (inputs (list boost lapack suitesparse)) + (inputs (list boost openblas suitesparse)) (home-page "https://trilinos.org") (synopsis "Engineering and scientific problems algorithms") (description @@ -2124,37 +2129,43 @@ (define trilinos-serial-xyce technologies within an object-oriented software framework for the solution of large-scale, complex multi-physics engineering and scientific problems. A unique design feature of Trilinos is its focus on packages.") - (license (list license:lgpl2.1+ - license:bsd-3)))) + (license (list license:lgpl2.1+ license:bsd-3)))) + +(define xyce-common-flags + (list "CXXFLAGS=-O3" + "--enable-stokhos" + "--enable-amesos2" + "LIBS=-lopenblas")) (define-public xyce-serial (package (name "xyce-serial") - (version "6.8") + (version "7.8.0") (source - (origin (method url-fetch) - (uri (string-append "https://archive.org/download/Xyce-" - version "/Xyce-" version ".tar.gz")) - (sha256 - (base32 - "09flp1xywbb2laayd9rg8vd0fjsh115y6k1p71jacy0nrbdvvlcg")))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Xyce/Xyce") + (commit (string-append "Release-" version)))) + (sha256 + (base32 "01h2gln4qik12a2mp9ai52c21pd8316vsm2nxishw5dfn7cp58zr")))) (build-system gnu-build-system) (arguments - `(#:tests? #f - #:configure-flags - (list - "CXXFLAGS=-O3" - (string-append "ARCHDIR=" - (assoc-ref %build-inputs "trilinos"))))) - (native-inputs - `(("bison" ,bison-3.0) ;'configure' fails with Bison 3.4 - ("flex" ,flex) - ("fortran" ,gfortran))) - (inputs - `(("fftw" ,fftw) - ("suitesparse" ,suitesparse) - ("lapack" ,lapack) - ("trilinos" ,trilinos-serial-xyce))) + (list + #:tests? #f + #:configure-flags #~(list + (string-append "ARCHDIR=" #$(this-package-input "trilinos")) + #$@xyce-common-flags))) + (native-inputs (list bison + flex + gfortran + autoconf + automake + libtool)) + (inputs `(("fftw" ,fftw) + ("suitesparse" ,suitesparse) + ("openblas" ,openblas) + ("trilinos" ,trilinos-serial-xyce))) (home-page "https://xyce.sandia.gov/") (synopsis "High-performance analog circuit simulator") (description @@ -2164,39 +2175,33 @@ (define-public xyce-serial (license license:gpl3+))) (define trilinos-parallel-xyce - (package (inherit trilinos-serial-xyce) + (package + (inherit trilinos-serial-xyce) (name "trilinos-parallel-xyce") (arguments - `(,@(substitute-keyword-arguments (package-arguments trilinos-serial-xyce) - ((#:configure-flags flags) - `(append (list "-DTrilinos_ENABLE_ShyLU=ON" - "-DTrilinos_ENABLE_Zoltan=ON" - "-DTPL_ENABLE_MPI=ON") - ,flags))))) - (inputs - `(("mpi" ,openmpi) - ,@(package-inputs trilinos-serial-xyce))))) + (substitute-keyword-arguments (package-arguments trilinos-serial-xyce) + ((#:configure-flags flags) + `(cons* + "-DTrilinos_ENABLE_ShyLU=ON" + "-DTrilinos_ENABLE_Zoltan=ON" + "-DTPL_ENABLE_MPI=ON" + ,flags)))) + (inputs (modify-inputs (package-inputs trilinos-serial-xyce) + (append openmpi))))) (define-public xyce-parallel - (package (inherit xyce-serial) + (package + (inherit xyce-serial) (name "xyce-parallel") (arguments - `(,@(substitute-keyword-arguments (package-arguments xyce-serial) - ((#:configure-flags flags) - `(list "CXXFLAGS=-O3" - "CXX=mpiCC" - "CC=mpicc" - "F77=mpif77" - "--enable-mpi" - (string-append - "ARCHDIR=" - (assoc-ref %build-inputs "trilinos"))))))) - (propagated-inputs - `(("mpi" ,openmpi))) - (inputs - `(("trilinos" ,trilinos-parallel-xyce) - ,@(alist-delete "trilinos" - (package-inputs xyce-serial)))))) + (substitute-keyword-arguments (package-arguments xyce-serial) + ((#:configure-flags _) + #~(list "CXX=mpiCC" "CC=mpicc" "F77=mpif77" "--enable-mpi" + (string-append "ARCHDIR=" #$(this-package-input "trilinos")) + #$@xyce-common-flags)))) + (propagated-inputs (list openmpi)) + (inputs (modify-inputs (package-inputs xyce-serial) + (replace "trilinos" trilinos-parallel-xyce))))) (define-public freehdl (package base-commit: 85012e64819b39fd6112038134548b415fd5daff -- 2.45.1