From patchwork Thu Mar 7 11:14:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Wurmus X-Patchwork-Id: 1359 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 4F69216D3F; Thu, 7 Mar 2019 11:15:18 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 949FB16D31 for ; Thu, 7 Mar 2019 11:15:16 +0000 (GMT) Received: from localhost ([127.0.0.1]:49366 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1qzb-0007bR-KT for patchwork@mira.cbaines.net; Thu, 07 Mar 2019 06:15:15 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58459) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1qzS-0007bI-P5 for guix-patches@gnu.org; Thu, 07 Mar 2019 06:15:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1qzP-0000Mp-S8 for guix-patches@gnu.org; Thu, 07 Mar 2019 06:15:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:49685) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h1qzO-0000Kt-9o for guix-patches@gnu.org; Thu, 07 Mar 2019 06:15:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1h1qzN-0001nw-Vd for guix-patches@gnu.org; Thu, 07 Mar 2019 06:15:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#34780] [PATCH] gnu: openmpi: Add Java support. References: <877edbufh8.fsf@mdc-berlin.de> In-Reply-To: <877edbufh8.fsf@mdc-berlin.de> Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 07 Mar 2019 11:15:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 34780 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 34780@debbugs.gnu.org Received: via spool by 34780-submit@debbugs.gnu.org id=B34780.15519572996912 (code B ref 34780); Thu, 07 Mar 2019 11:15:01 +0000 Received: (at 34780) by debbugs.gnu.org; 7 Mar 2019 11:14:59 +0000 Received: from localhost ([127.0.0.1]:34996 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1h1qzK-0001nQ-ML for submit@debbugs.gnu.org; Thu, 07 Mar 2019 06:14:58 -0500 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21141) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1h1qzG-0001nB-Bt for 34780@debbugs.gnu.org; Thu, 07 Mar 2019 06:14:57 -0500 ARC-Seal: i=1; a=rsa-sha256; t=1551957278; cv=none; d=zoho.com; s=zohoarc; b=I2QqfAwGqJ53gLys4jU4GIJD8ALBrtW+9jfXNDP/+j4O06Tv3pnzFEJ4I3MRqKFzARs/AQAFeAmDa9LiBVIZW7U9q5O+oyzChaogSVCp6Z8/MrEQziFFm14aAXqO+JX5Je59YvFaMXOdujtKtaGJTv4UUwSuqO1oRNc4FVRwIG8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1551957278; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:MIME-Version:Message-ID:Subject:To:ARC-Authentication-Results; bh=baWkCPBwQICTjeOXQp2UXR6ccLiK7+gWWPWx8OxcSdc=; b=RJ6YLYhFVOSu1W6G34wmSSSqxgyWQ3KW8TLqXVxMhKLHJysAACCyc5XYQlr2OF3EHYP8oG5VqSVmFINBJSWNrvZw9j8fsNXxLeFrY/Eom4VoZMVCqiFZdumlgwVjSx9PRryRsUMHdpumInhdz2rLZxq+J2DO89zXTHkVkV0ok9U= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass header.i=elephly.net; spf=pass smtp.mailfrom=rekado@elephly.net; dmarc=pass header.from= header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1551957278; s=zoho; d=elephly.net; i=rekado@elephly.net; h=From:To:Cc:Message-ID:Subject:Date:MIME-Version:Content-Transfer-Encoding:Content-Type; l=2954; bh=baWkCPBwQICTjeOXQp2UXR6ccLiK7+gWWPWx8OxcSdc=; b=dXEBG3xQPeTJTdYC1jsElr7SBFy4MkHUG8dULc4mA/qjonxFxbSsAh/TwK4SxBJH WtPcwSYtwJXH3mf7UjRLnQ7VFeoCoNYEodzDH2iufdeyU30Qy9FDhW4fOyI+N4xq4yj I64cZPPMwbk16juodyIUVPmy0bvxjEm4kMn1LY0M= Received: from localhost (141.80.247.169 [141.80.247.169]) by mx.zohomail.com with SMTPS id 1551957275140113.12146746197004; Thu, 7 Mar 2019 03:14:35 -0800 (PST) From: Ricardo Wurmus Message-ID: <20190307111422.12381-1-rekado@elephly.net> Date: Thu, 7 Mar 2019 12:14:22 +0100 X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-ZohoMailClient: External X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: ericbavier@centurylink.net Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/mpi.scm (openmpi)[native-inputs]: Add openjdk11. [outputs]: Add "java". [arguments]: Add "--enable-mpi-java" to configure flags; add build phases "set-JAVA_HOME" and "move-java". --- gnu/packages/mpi.scm | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index 10de6dee5b..316b2a5cd8 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -35,6 +35,7 @@ #:use-module (gnu packages) #:use-module (gnu packages fabric-management) #:use-module (gnu packages gcc) + #:use-module (gnu packages java) #:use-module (gnu packages libevent) #:use-module (gnu packages linux) #:use-module (gnu packages pciutils) @@ -190,8 +191,9 @@ bind processes, and much more.") ("slurm" ,slurm))) ;for PMI support (launching via "srun") (native-inputs `(("pkg-config" ,pkg-config) - ("perl" ,perl))) - (outputs '("out" "debug")) + ("perl" ,perl) + ("jdk" ,openjdk11 "jdk"))) + (outputs '("out" "debug" "java")) (arguments `(#:configure-flags `("--enable-mpi-ext=affinity" ;cr doesn't work "--enable-memchecker" @@ -200,6 +202,8 @@ bind processes, and much more.") "--with-hwloc=external" "--with-libevent" + "--enable-mpi-java" + ;; InfiniBand support "--enable-openib-control-hdr-padding" "--enable-openib-dynamic-sl" @@ -224,6 +228,14 @@ bind processes, and much more.") "/include/infiniband/:" (getenv "CPLUS_INCLUDE_PATH"))) #t)) + ;; We could provide the location of the JDK in the configure + ;; flags, but since the configure flags are embedded in the + ;; info binaries that would leave a reference to the JDK in + ;; the "out" output. To avoid this we set JAVA_HOME. + (add-after 'unpack 'set-JAVA_HOME + (lambda* (#:key inputs #:allow-other-keys) + (setenv "JAVA_HOME" (assoc-ref inputs "jdk")) + #t)) (add-before 'build 'remove-absolute (lambda _ ;; Remove compiler absolute file names (OPAL_FC_ABSOLUTE @@ -252,6 +264,26 @@ bind processes, and much more.") (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) (for-each delete-file (find-files out "config.log")) + #t))) + (add-after 'install 'move-java + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (java (assoc-ref outputs "java"))) + (for-each (lambda (item) + (let ((source (string-append out item)) + (target (string-append java item))) + (mkdir-p (dirname target)) + (rename-file source target))) + '("/share/man/man1/mpijavac.1" + "/share/doc/openmpi/javadoc-openmpi" + "/lib/mpi.jar" + "/lib/libmpi_java.la" + "/lib/libmpi_java.so.40.20.0" + "/lib/libmpi_java.so.40" + "/lib/libmpi_java.so" + "/bin/mpijavac.pl" + "/bin/mpijavac" + "/include/openmpi/ompi/mpi/java")) #t)))))) (home-page "http://www.open-mpi.org") (synopsis "MPI-3 implementation")