From debbugs-submit-bounces@debbugs.gnu.org Mon Nov 06 12:19:09 2017 Received: (at submit) by debbugs.gnu.org; 6 Nov 2017 17:19:09 +0000 Received: from localhost ([127.0.0.1]:54441 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eBl3F-00042b-6y for submit@debbugs.gnu.org; Mon, 06 Nov 2017 12:19:09 -0500 Received: from eggs.gnu.org ([208.118.235.92]:49728) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eBl3A-000422-CS for submit@debbugs.gnu.org; Mon, 06 Nov 2017 12:19:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eBl34-0004fI-Ef for submit@debbugs.gnu.org; Mon, 06 Nov 2017 12:18:59 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:43618) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eBl34-0004f9-By for submit@debbugs.gnu.org; Mon, 06 Nov 2017 12:18:58 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40694) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eBl33-0007Px-Gj for guix-patches@gnu.org; Mon, 06 Nov 2017 12:18:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eBl30-0004dm-6L for guix-patches@gnu.org; Mon, 06 Nov 2017 12:18:57 -0500 Received: from serenity.mcc.ac.uk ([130.88.200.93]:10519) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eBl30-0003uz-0P for guix-patches@gnu.org; Mon, 06 Nov 2017 12:18:54 -0500 Received: from albion.it.manchester.ac.uk ([130.88.138.79] helo=albion.its.manchester.ac.uk) by serenity.mcc.ac.uk with esmtp (Exim 4.85 (FreeBSD)) (envelope-from ) id 1eBl1H-000Kfe-Nu for guix-patches@gnu.org; Mon, 06 Nov 2017 17:17:07 +0000 Received: by albion.its.manchester.ac.uk (Postfix, from userid 1000) id B259C165A; Mon, 6 Nov 2017 17:16:56 +0000 (GMT) From: Dave Love To: guix-patches@gnu.org Subject: [PATCH] gnu: Add psm. Date: Mon, 6 Nov 2017 17:16:25 +0000 Message-Id: <20171106171626.29830-1-fx@gnu.org> X-Mailer: git-send-email 2.11.0 X-SA-Exim-Connect-IP: 130.88.138.79 X-SA-Exim-Mail-From: mdehsdl3@ds.man.ac.uk X-SA-Exim-Scanned: No (on serenity.mcc.ac.uk); SAEximRunCond expanded to false X-detected-operating-system: by eggs.gnu.org: FreeBSD 9.x [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) There probably aren't a lot of sites for which this hardware support is relevant, but it's easy to provide. Arguably it should go in rdma-core on the same basis as the OFED support for other hardware. From debbugs-submit-bounces@debbugs.gnu.org Mon Nov 06 12:21:32 2017 Received: (at submit) by debbugs.gnu.org; 6 Nov 2017 17:21:32 +0000 Received: from localhost ([127.0.0.1]:54450 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eBl5Y-00047H-43 for submit@debbugs.gnu.org; Mon, 06 Nov 2017 12:21:32 -0500 Received: from eggs.gnu.org ([208.118.235.92]:50875) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eBl5U-000472-2H for submit@debbugs.gnu.org; Mon, 06 Nov 2017 12:21:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eBl5N-00068O-Jf for submit@debbugs.gnu.org; Mon, 06 Nov 2017 12:21:22 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:52559) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eBl5N-000683-Fh for submit@debbugs.gnu.org; Mon, 06 Nov 2017 12:21:21 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41820) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eBl5L-0000Sn-G7 for guix-patches@gnu.org; Mon, 06 Nov 2017 12:21:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eBl5J-00064c-PD for guix-patches@gnu.org; Mon, 06 Nov 2017 12:21:19 -0500 Received: from tranquility.mcc.ac.uk ([130.88.200.145]:59924) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eBl5F-00048I-J2; Mon, 06 Nov 2017 12:21:13 -0500 Received: from albion.it.manchester.ac.uk ([130.88.138.79] helo=albion.its.manchester.ac.uk) by tranquility.mcc.ac.uk with esmtp (Exim 4.85 (FreeBSD)) (envelope-from ) id 1eBl1q-000NKZ-2t; Mon, 06 Nov 2017 17:17:42 +0000 Received: by albion.its.manchester.ac.uk (Postfix, from userid 1000) id EE0F8165A; Mon, 6 Nov 2017 17:17:19 +0000 (GMT) From: Dave Love To: guix-patches@gnu.org Subject: [PATCH] gnu: Add psm. Date: Mon, 6 Nov 2017 17:16:26 +0000 Message-Id: <20171106171626.29830-2-fx@gnu.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171106171626.29830-1-fx@gnu.org> References: <20171106171626.29830-1-fx@gnu.org> X-SA-Exim-Connect-IP: 130.88.138.79 X-SA-Exim-Mail-From: mdehsdl3@ds.man.ac.uk X-SA-Exim-Scanned: No (on tranquility.mcc.ac.uk); SAEximRunCond expanded to false X-detected-operating-system: by eggs.gnu.org: FreeBSD 9.x [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: submit Cc: Dave Love X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) * gnu/packages/linux.scm (psm): New variable. (libfabric): Use it. * gnu/packages/mpi.scm (openmpi)[inputs]: Add psm. * gnu/packages/patches/psm-arch.patch, gnu/packages/patches/psm-ldflags.patch, gnu/packages/patches/psm-repro.patch: New files. * gnu/local.mk (dist_patch_DATA): Add them. --- gnu/local.mk | 3 +++ gnu/packages/linux.scm | 45 +++++++++++++++++++++++++++++++++- gnu/packages/mpi.scm | 1 + gnu/packages/patches/psm-arch.patch | 11 +++++++++ gnu/packages/patches/psm-ldflags.patch | 11 +++++++++ gnu/packages/patches/psm-repro.patch | 12 +++++++++ 6 files changed, 82 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/psm-arch.patch create mode 100644 gnu/packages/patches/psm-ldflags.patch create mode 100644 gnu/packages/patches/psm-repro.patch diff --git a/gnu/local.mk b/gnu/local.mk index 6b70300ff..d7b162d31 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -957,6 +957,9 @@ dist_patch_DATA = \ %D%/packages/patches/procmail-ambiguous-getline-debian.patch \ %D%/packages/patches/procmail-CVE-2014-3618.patch \ %D%/packages/patches/proot-test-fhs.patch \ + %D%/packages/patches/psm-arch.patch \ + %D%/packages/patches/psm-ldflags.patch \ + %D%/packages/patches/psm-repro.patch \ %D%/packages/patches/pt-scotch-build-parallelism.patch \ %D%/packages/patches/pulseaudio-fix-mult-test.patch \ %D%/packages/patches/pulseaudio-longer-test-timeout.patch \ diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 49665e24d..1a3ffa347 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4387,7 +4387,7 @@ comparing system environments.") (base32 "19l2m1frna1l765z4j7wl8hp4rb9wrh0hy5496685hd183hmy5pv")))) (build-system gnu-build-system) (inputs `(("rdma-core" ,rdma-core) - ;; TODO: add psm, psm(2). + ("psm" ,psm) ("libnl" ,libnl))) (home-page "https://ofiwg.github.io/libfabric/") (synopsis "Open Fabric Interfaces") @@ -4403,3 +4403,46 @@ exports the user-space API of OFI, and is typically the only software that applications deal with directly. It works in conjunction with provider libraries, which are often integrated directly into libfabric.") (license (list license:bsd-2 license:gpl2)))) ;dual + +(define-public psm + (package + (name "psm") + (version "3.3.20170428") + (source + (origin + (method git-fetch) + (uri (git-reference (url "http://github.com/01org/psm") + (commit "604758e76dc31e68d1de736ccf5ddf16cb22355b"))) + (file-name (string-append "psm-" version ".tar.gz")) + (sha256 + (base32 "0nsb325dmhn5ia3d2cnksqr0gdvrrx2hmvlylfgvmaqdpq76zm85")) + (patches (search-patches + "psm-arch.patch" ; uname -p returns "unknown" on Debian 9 + "psm-ldflags.patch" ; build shared lib with LDFLAGS + "psm-repro.patch")))) ; reproducibility + (build-system gnu-build-system) + (inputs `(("libuuid" ,util-linux))) + (arguments + '(#:make-flags `("PSM_USE_SYS_UUID=1" "CC=gcc" "WERROR=" + ,(string-append "INSTALL_PREFIX=" %output) + ,(string-append "LDFLAGS=-Wl,-rpath=" %output "/lib")) + #:tests? #f + #:phases (modify-phases %standard-phases + (delete 'configure) + (add-after 'unpack 'patch-/usr/include + (lambda _ + (substitute* "Makefile" + (("\\$\\{DESTDIR}/usr/include") + (string-append %output "/include"))) + (substitute* "Makefile" + (("/lib64") "/lib")) + #t))))) + (home-page "https://github.com/01org/psm") + (synopsis "Intel Performance Scaled Messaging (PSM) Libraries") + (description + "The PSM Messaging API, or PSM API, is Intel's low-level +user-level communications interface for the True Scale +family of products. PSM users are enabled with mechanisms +necessary to implement higher level communications +interfaces in parallel environments.") + (license (list license:bsd-2 license:gpl2)))) ;dual diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index 741d30a8c..9f14d2c18 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -125,6 +125,7 @@ bind processes, and much more.") (inputs `(("hwloc" ,hwloc "lib") ("libfabric" ,libfabric) + ("psm" ,psm) ("rdma-core" ,rdma-core) ("valgrind" ,valgrind))) (native-inputs diff --git a/gnu/packages/patches/psm-arch.patch b/gnu/packages/patches/psm-arch.patch new file mode 100644 index 000000000..a17d6ac3a --- /dev/null +++ b/gnu/packages/patches/psm-arch.patch @@ -0,0 +1,11 @@ +--- psm-3.3/buildflags.mak~ 2014-08-20 21:00:18.000000000 +0100 ++++ psm-3.3/buildflags.mak 2017-10-22 12:02:12.855291447 +0100 +@@ -38,7 +38,7 @@ + endif + + export os ?= $(shell uname -s | tr '[A-Z]' '[a-z]') +-export arch := $(shell uname -p | sed -e 's,\(i[456]86\|athlon$$\),i386,') ++export arch := $(shell uname -m | sed -e 's,\(i[456]86\|athlon$$\),i386,') + + CC ?= gcc + diff --git a/gnu/packages/patches/psm-ldflags.patch b/gnu/packages/patches/psm-ldflags.patch new file mode 100644 index 000000000..be053c637 --- /dev/null +++ b/gnu/packages/patches/psm-ldflags.patch @@ -0,0 +1,11 @@ +--- psm-3.3/ipath/Makefile~ 1970-01-01 01:00:00.000000000 +0100 ++++ psm-3.3/ipath/Makefile 2017-10-22 15:10:10.269177711 +0100 +@@ -73,7 +73,7 @@ + ${TARGLIB}.so.${MAJOR}.${MINOR}: ${${TARGLIB}-objs} + date +'static __attribute__ ((unused)) char __psc_infinipath_revision[] ="$$""Date: %F %R ${rpm_extra_description}InfiniPath $$";' > _revision.c + $(CC) -c $(BASECFLAGS) $(INCLUDES) _revision.c -o _revision.o +- $(CC) -o $@ -Wl,-soname=${TARGLIB}.so.${MAJOR} -shared \ ++ $(CC) -o $@ -Wl,-soname=${TARGLIB}.so.${MAJOR} $(LDFLAGS) -shared \ + -Wl,--unique='*fastpath*' \ + ${${TARGLIB}-objs} _revision.o $(LDFLAGS) $(if $(MIC:0=),$(SCIF_LINK_FLAGS)) + diff --git a/gnu/packages/patches/psm-repro.patch b/gnu/packages/patches/psm-repro.patch new file mode 100644 index 000000000..12dab1855 --- /dev/null +++ b/gnu/packages/patches/psm-repro.patch @@ -0,0 +1,12 @@ +--- psm-3.3/Makefile~ 1970-01-01 01:00:00.000000000 +0100 ++++ psm-3.3/Makefile 2017-10-22 15:32:11.736949002 +0100 +@@ -326,7 +326,7 @@ + # file around. Generate it such that the ident command can find it + # and strings -a | grep InfiniPath does a reasonable job as well. + ${TARGLIB}.so.${MAJOR}.${MINOR}: ${${TARGLIB}-objs} +- date +'char psmi_infinipath_revision[] ="$$""Date: %F %R ${rpm_extra_description}InfiniPath $$";' > ${lib_build_dir}/_revision.c ++ echo 'char psmi_infinipath_revision[] ="$$""Date: 1970-01-01 00:00 ${rpm_extra_description}InfiniPath $$";' > ${lib_build_dir}/_revision.c + $(CC) -c $(BASECFLAGS) $(INCLUDES) _revision.c -o _revision.o + $(CC) $(LDFLAGS) -o $@ -Wl,-soname=${TARGLIB}.so.${MAJOR} -shared -Wl,--unique='*fastpath*' \ + ${${TARGLIB}-objs} _revision.o -L$(build_dir)/ipath $(LDLIBS) + -- 2.11.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Nov 07 12:02:10 2017 Received: (at 29172-done) by debbugs.gnu.org; 7 Nov 2017 17:02:10 +0000 Received: from localhost ([127.0.0.1]:56816 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eC7GM-0006pa-0I for submit@debbugs.gnu.org; Tue, 07 Nov 2017 12:02:10 -0500 Received: from hera.aquilenet.fr ([141.255.128.1]:38594) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eC7GF-0006pF-6G for 29172-done@debbugs.gnu.org; Tue, 07 Nov 2017 12:02:07 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 0BE3BF76C; Tue, 7 Nov 2017 18:02:04 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Lm-jTrmUDJCP; Tue, 7 Nov 2017 18:02:02 +0100 (CET) Received: from ribbon (unknown [193.50.110.150]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 79F25F030; Tue, 7 Nov 2017 18:02:02 +0100 (CET) From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: Dave Love Subject: Re: [bug#29172] [PATCH] gnu: Add psm. References: <20171106171626.29830-1-fx@gnu.org> <20171106171626.29830-2-fx@gnu.org> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 17 Brumaire an 226 de la =?utf-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Tue, 07 Nov 2017 18:02:00 +0100 In-Reply-To: <20171106171626.29830-2-fx@gnu.org> (Dave Love's message of "Mon, 6 Nov 2017 17:16:26 +0000") Message-ID: <87y3ni3tvb.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: 29172-done Cc: 29172-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.0 (+) Hi Dave, Dave Love skribis: > * gnu/packages/linux.scm (psm): New variable. > (libfabric): Use it. > * gnu/packages/mpi.scm (openmpi)[inputs]: Add psm. > * gnu/packages/patches/psm-arch.patch, > gnu/packages/patches/psm-ldflags.patch, > gnu/packages/patches/psm-repro.patch: New files. > * gnu/local.mk (dist_patch_DATA): Add them. I split it into 3 separate patches (one two add PSM, one to change libfabric, and one for openmpi) and committed. Thanks, Ludo=E2=80=99. From unknown Sat Aug 16 18:44:06 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Wed, 06 Dec 2017 12:24:07 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator