Skip to contentSkip to conversation

openmpi: new package

PATCH New Vicente Olivert Riera 2 participants 4 messages May 20, 2016 – Jun 9, 2016

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/2 openmpi: new package

---
Changes v1 -> v2:
- Disable Fortran by default.
- Backport upstream patch into Buildroot.

 package/Config.in                                  |  1 +
 ...-check-if-fgetc-and-fputc-have-been-alrea.patch | 48 ++++++++++++++++++++++
 package/openmpi/Config.in                          | 27 ++++++++++++
 package/openmpi/openmpi.hash                       |  3 ++
 package/openmpi/openmpi.mk                         | 23 +++++++++++
 5 files changed, 102 insertions(+)
 create mode 100644 package/openmpi/0001-vt_iowrap.c-check-if-fgetc-and-fputc-have-been-alrea.patch
 create mode 100644 package/openmpi/Config.in
 create mode 100644 package/openmpi/openmpi.hash
 create mode 100644 package/openmpi/openmpi.mk
package/Config.in +1 -0
index 8668612..0056beb 100644
@@ -1177,6 +1177,7 @@ menu "Networking"
 	source "package/nss-pam-ldapd/Config.in"
 	source "package/omniorb/Config.in"
 	source "package/openldap/Config.in"
+	source "package/openmpi/Config.in"
 	source "package/openpgm/Config.in"
 	source "package/ortp/Config.in"
 	source "package/qdecoder/Config.in"
package/openmpi/0001-vt_iowrap.c-check-if-fgetc-and-fputc-have-been-alrea.patch new file +48 -0

48 lines not on this page · raw message

package/openmpi/Config.in new file +27 -0
new file mode 100644
index 0000000..0307a62
@@ -0,0 +1,27 @@
+comment "openmpi needs a toolchain w/ dynamic library, NPTL, wchar, C++"
+	depends on BR2_USE_MMU
+	depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS_NPTL \
+		|| !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP
+
+config BR2_PACKAGE_OPENMPI
+	bool "openmpi"
+	depends on BR2_USE_MMU # fork()
+	depends on BR2_USE_WCHAR
+	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on !BR2_STATIC_LIBS # dlfcn.h
+	help
+	  A High Performance Message Passing Library.
+
+	  https://www.open-mpi.org/
+
+if BR2_PACKAGE_OPENMPI
+
+config BR2_PACKAGE_OPENMPI_EXTRACONF
+	string "Additional parameters for ./configure"
+	default ""
+	help
+	  Extra parameters that will be appended to openmpi's
+	  ./configure commandline.
+
+endif
package/openmpi/openmpi.hash new file +3 -0
new file mode 100644
index 0000000..92152a2
@@ -0,0 +1,3 @@
+# From: https://www.open-mpi.org/software/ompi/v1.10/
+md5 b2f43d9635d2d52826e5ef9feb97fd4c  openmpi-1.10.2.tar.bz2
+sha1 03934fc0a2dd0d0d2d0459d714a976eabca938fb  openmpi-1.10.2.tar.bz2
package/openmpi/openmpi.mk new file +23 -0
new file mode 100644
index 0000000..7b19631
@@ -0,0 +1,23 @@
+################################################################################
+#
+# openmpi
+#
+################################################################################
+
+OPENMPI_VERSION_MAJOR = 1.10
+OPENMPI_VERSION = $(OPENMPI_VERSION_MAJOR).2
+OPENMPI_SITE = https://www.open-mpi.org/software/ompi/v$(OPENMPI_VERSION_MAJOR)/downloads
+OPENMPI_SOURCE = openmpi-$(OPENMPI_VERSION).tar.bz2
+OPENMPI_LICENSE = BSD
+OPENMPI_LICENSE_FILES = LICENSE
+OPENMPI_INSTALL_STAGING = YES
+
+# Disable fortran by default until we add BR2_TOOLCHAIN_HAS_FORTRAN
+# hidden symbol to our toolchain infrastructure
+OPENMPI_CONF_OPTS += --enable-mpi-fortran=no
+
+# The amount of configure options in openmpi is huge. Let the user to have the
+# posibility to pass the desired options in BR2_PACKAGE_OPENMPI_EXTRACONF.
+OPENMPI_CONF_OPTS += $(call qstrip,$(BR2_PACKAGE_OPENMPI_EXTRACONF))
+
+$(eval $(autotools-package))
Signature · 1 line
2.7.3
#1 lore raw

PATCH v4 2/2 openblas: new package

---
Changes v3 -> v4:
- Disable Fortran by default. It can be added back in the future when we have a BR2_TOOLCHAIN_HAS_FORTRAN hidden symbol.
- Bump version so we can get rid of the patch.
- Match OpenBLAS target cores with Buildroot target cores as much as possible, and drop the ones unsupported in Buildroot.
- Drop the OpenMP bits in the openblas.mk file. It can be added back in the future when we have a BR2_TOOLCHAIN_HAS_OPENMP hidden symbol.

Changes v2 -> v3:
- Switch version to HEAD of develop branch as it contains support for MIPS32.
- Add a patch to fix build failure of P5600 and I6400 targets.
- Add support for OpenMP when toolchain has NPTL threads.

Changes v1 -> v2:
- Multi-threading is not available for static-only since it uses dlfcn.h, so modify the "ifeq" statement accordingly.

 package/Config.in              |   1 +
 package/openblas/Config.in     | 198 +++++++++++++++++++++++++++++++++++++++++
 package/openblas/openblas.hash |   2 +
 package/openblas/openblas.mk   |  46 ++++++++++
 4 files changed, 247 insertions(+)
 create mode 100644 package/openblas/Config.in
 create mode 100644 package/openblas/openblas.hash
 create mode 100644 package/openblas/openblas.mk
package/Config.in +1 -0
index 0056beb..b59c2f1 100644
@@ -1270,6 +1270,7 @@ endif
 	source "package/msgpack/Config.in"
 	source "package/mtdev2tuio/Config.in"
 	source "package/netbsd-queue/Config.in"
+	source "package/openblas/Config.in"
 	source "package/orc/Config.in"
 	source "package/p11-kit/Config.in"
 	source "package/poco/Config.in"
package/openblas/Config.in new file +198 -0

198 lines not on this page · raw message

package/openblas/openblas.hash new file +2 -0
new file mode 100644
index 0000000..1fdb0ba
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256 fa32d00dfca6b7e7580dbc8696daa5bf8fee4ad7771f52450ab9dc1e9c87fe73  openblas-a8fcd89d6d1666185c8c27ea46672b9897630f21.tar.gz
package/openblas/openblas.mk new file +46 -0

46 lines not on this page · raw message

Signature · 1 line
2.7.3
#2 lore raw

PATCH v4 2/2 openblas: new package

Hello,

Quoted 118 lines · Vicente Olivert Riera
package/openblas/Config.in new file +118 -0
+config BR2_PACKAGE_OPENBLAS_TARGET_P2
+	bool "P2"
+	depends on BR2_x86_pentium2
+config BR2_PACKAGE_OPENBLAS_TARGET_KATMAI
+	bool "KATMAI"
+	depends on BR2_x86_pentium3
+config BR2_PACKAGE_OPENBLAS_TARGET_COPPERMINE
+	bool "COPPERMINE"
+	depends on BR2_x86_pentium3
+config BR2_PACKAGE_OPENBLAS_TARGET_NORTHWOOD
+	bool "NORTHWOOD"
+	depends on BR2_x86_pentium4
+config BR2_PACKAGE_OPENBLAS_TARGET_PRESCOTT
+	bool "PRESCOTT"
+	depends on BR2_x86_prescott
+config BR2_PACKAGE_OPENBLAS_TARGET_BANIAS
+	bool "BANIAS"
+	depends on BR2_x86_pentium_m
+config BR2_PACKAGE_OPENBLAS_TARGET_YONAH
+	bool "YONAH"
+	depends on BR2_x86_pentium_m
+config BR2_PACKAGE_OPENBLAS_TARGET_CORE2
+	bool "CORE2"
+	depends on BR2_x86_core2
+config BR2_PACKAGE_OPENBLAS_TARGET_PENRYN
+	bool "PENRYN"
+	depends on BR2_x86_core2
+config BR2_PACKAGE_OPENBLAS_TARGET_DUNNINGTON
+	bool "DUNNINGTON"
+	depends on BR2_x86_core2
+config BR2_PACKAGE_OPENBLAS_TARGET_NEHALEM
+	bool "NEHALEM"
+	depends on BR2_x86_corei7
+config BR2_PACKAGE_OPENBLAS_TARGET_SANDYBRIDGE
+	bool "SANDYBRIDGE"
+	depends on BR2_x86_corei7_avx
+config BR2_PACKAGE_OPENBLAS_TARGET_HASWELL
+	bool "HASWELL"
+	depends on BR2_x86_core_avx2
+config BR2_PACKAGE_OPENBLAS_TARGET_ATOM
+	bool "ATOM"
+	depends on BR2_x86_atom
+config BR2_PACKAGE_OPENBLAS_TARGET_ATHLON
+	bool "ATHLON"
+	depends on BR2_x86_athlon || BR2_x86_athlon_4
+config BR2_PACKAGE_OPENBLAS_TARGET_OPTERON
+	bool "OPTERON"
+	depends on BR2_x86_opteron
+config BR2_PACKAGE_OPENBLAS_TARGET_OPTERON_SSE3
+	bool "OPTERON_SSE3"
+	depends on BR2_x86_opteron_sse3
+config BR2_PACKAGE_OPENBLAS_TARGET_BARCELONA
+	bool "BARCELONA"
+	depends on BR2_x86_barcelona
+config BR2_PACKAGE_OPENBLAS_TARGET_STEAMROLLER
+	bool "STEAMROLLER"
+	depends on BR2_x86_steamroller
+config BR2_PACKAGE_OPENBLAS_TARGET_SSE_GENERIC
+	bool "SSE_GENERIC"
+	depends on BR2_i386 || BR2_x86_64
+config BR2_PACKAGE_OPENBLAS_TARGET_VIAC3
+	bool "VIAC3"
+	depends on BR2_x86_c3 || BR2_x86_c32
+config BR2_PACKAGE_OPENBLAS_TARGET_POWER4
+	bool "POWER4"
+	depends on BR2_powerpc_power4
+config BR2_PACKAGE_OPENBLAS_TARGET_POWER5
+	bool "POWER5"
+	depends on BR2_powerpc_power5
+config BR2_PACKAGE_OPENBLAS_TARGET_POWER6
+	bool "POWER6"
+	depends on BR2_powerpc_power6
+config BR2_PACKAGE_OPENBLAS_TARGET_POWER7
+	bool "POWER7"
+	depends on BR2_powerpc_power7
+config BR2_PACKAGE_OPENBLAS_TARGET_POWER8
+	bool "POWER8"
+	depends on BR2_powerpc_power8
+config BR2_PACKAGE_OPENBLAS_TARGET_PPCG4
+	bool "PPCG4"
+	depends on BR2_powerpc_7400 || BR2_powerpc_7450
+config BR2_PACKAGE_OPENBLAS_TARGET_PPC970
+	bool "PPC970"
+	depends on BR2_powerpc_970
+config BR2_PACKAGE_OPENBLAS_TARGET_PPC440
+	bool "PPC440"
+	depends on BR2_powerpc_440
+config BR2_PACKAGE_OPENBLAS_TARGET_PPC440FP2
+	bool "PPC440FP2"
+	depends on BR2_powerpc_440fp
+config BR2_PACKAGE_OPENBLAS_TARGET_P5600
+	bool "P5600"
+	depends on BR2_mips_32r2
+config BR2_PACKAGE_OPENBLAS_TARGET_SICORTEX
+	bool "SICORTEX"
+	depends on BR2_mips_64
+config BR2_PACKAGE_OPENBLAS_TARGET_LOONGSON3A
+	bool "LOONGSON3A"
+	depends on BR2_mips_64
+config BR2_PACKAGE_OPENBLAS_TARGET_LOONGSON3B
+	bool "LOONGSON3B"
+	depends on BR2_mips_64
+config BR2_PACKAGE_OPENBLAS_TARGET_I6400
+	bool "I6400"
+	depends on BR2_mips_64r6
+config BR2_PACKAGE_OPENBLAS_TARGET_SPARC
+	bool "SPARC"
+	depends on BR2_sparc
+config BR2_PACKAGE_OPENBLAS_TARGET_SPARCV7
+	bool "SPARCV7"
+	depends on BR2_sparc
+config BR2_PACKAGE_OPENBLAS_TARGET_CORTEXA15
+	bool "CORTEXA15"
+	depends on BR2_cortex_a15
+config BR2_PACKAGE_OPENBLAS_TARGET_CORTEXA9
+	bool "CORTEXA9"
+	depends on BR2_cortex_a9
+config BR2_PACKAGE_OPENBLAS_TARGET_ARMV7

package/openblas/Config.in line 149

Quoted 10 lines
package/openblas/Config.in new file +10 -0
+	bool "ARMV7"
+	depends on BR2_cortex_a5 || BR2_cortex_a7 || BR2_cortex_a8 || \
+		BR2_cortex_a9 || BR2_cortex_a12 || BR2_cortex_a15 || \
+		BR2_cortex_a17
+config BR2_PACKAGE_OPENBLAS_TARGET_ARMV8
+	bool "ARMV8"
+	depends on BR2_aarch64 || BR2_aarch64_be
+config BR2_PACKAGE_OPENBLAS_TARGET_CORTEXA57
+	bool "CORTEXA57"
+	depends on BR2_aarch64 || BR2_aarch64_be

As discussed on IRC with Yann, we really don't want this additional choice. Just use the existing options in arch/Config.in* instead. When there is no direct match, just don't support the platform, or use a lower common denominator.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#3 lore raw

PATCH v2 1/2 openmpi: new package

In reply to Vicente Olivert Riera

Hello Vicente,

package/openmpi/0001-vt_iowrap.c-check-if-fgetc-and-fputc-have-been-alrea.patch line 5

Quoted 11 lines · Vicente Olivert Riera
package/openmpi/0001-vt_iowrap.c-check-if-fgetc-and-fputc-have-been-alrea.patch new file +5 -0
new file mode 100644
index 0000000..00562d0
@@ -0,0 +1,48 @@
+From 56a27e5dce8fc78941f26ccb0e688f331fb0641e Mon Sep 17 00:00:00 2001
+From: Vicente Olivert Riera <[email protected]>
+Date: Tue, 17 May 2016 20:46:11 +0100
+Subject: [PATCH] vt_iowrap.c: check if fgetc and fputc have been already
+ defined

This patch is only needed to make the "Vampirtrace" stuff build, and this is just in the "contrib" part of OpenMPI. So instead of adding a patch, I've disabled VampirTrace by passing --disable-vt. Let me know if you really needed VampirTrace. In the mean time, feel free to submit your patch upstream so that we can re-enable the feature later on.

package/openmpi/0001-vt_iowrap.c-check-if-fgetc-and-fputc-have-been-alrea.patch line 11

Quoted 6 lines
package/openmpi/0001-vt_iowrap.c-check-if-fgetc-and-fputc-have-been-alrea.patch new file +6 -0
+config BR2_PACKAGE_OPENMPI_EXTRACONF
+	string "Additional parameters for ./configure"
+	default ""
+	help
+	  Extra parameters that will be appended to openmpi's
+	  ./configure commandline.

I really don't like this thing, since many of the configure options imply a dependency on another package, which needs to be expressed in the .mk file. So I've dropped this option, and I prefer to see additional options being added gradually, depending on the needs. There are indeed lots of options, but I am not sure we will actually have a sub-option for each of them in Buildroot.

package/openmpi/0001-vt_iowrap.c-check-if-fgetc-and-fputc-have-been-alrea.patch line 16

Quoted 5 lines
package/openmpi/0001-vt_iowrap.c-check-if-fgetc-and-fputc-have-been-alrea.patch new file +5 -0
+OPENMPI_VERSION_MAJOR = 1.10
+OPENMPI_VERSION = $(OPENMPI_VERSION_MAJOR).2
+OPENMPI_SITE = https://www.open-mpi.org/software/ompi/v$(OPENMPI_VERSION_MAJOR)/downloads
+OPENMPI_SOURCE = openmpi-$(OPENMPI_VERSION).tar.bz2
+OPENMPI_LICENSE = BSD

BSD is never a correct value. The right value here was BSD-3c.

Applied with those changes, thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com