Skip to content

Commit e63d4af

Browse files
author
rhc54
committed
Merge pull request open-mpi#5 from benmcclelland/master
Intel sync - IPMI, build scritps
2 parents fa13428 + a6dfe20 commit e63d4af

16 files changed

+13031
-11
lines changed

‎MANIFEST

+4,958
Large diffs are not rendered by default.

‎contrib/platform/intel/hillsboro/orcm-nightly-build

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
enable_mpi=no
2+
enable_oshmem=no
3+
enable_sensors=yes
4+
enable_orterun_prefix_by_default=yes
5+
enable_mpi_thread_multiple=yes
6+
enable_mem_debug=no
7+
enable_mem_profile=no
8+
enable_debug_symbols=yes
9+
enable_binaries=yes
10+
enable_heterogeneous=no
11+
enable_picky=yes
12+
enable_debug=yes
13+
enable_shared=yes
14+
enable_static=no
15+
enable_memchecker=no
16+
enable_ipv6=yes
17+
enable_mpi_fortran=no
18+
enable_mpi_cxx=no
19+
enable_mpi_cxx_seek=no
20+
enable_cxx_exceptions=no
21+
enable_mpi_java=yes
22+
enable_io_romio=no
23+
enable_vt=no
24+
enable_mca_no_build=crs,memchecker,snapc,crcp,rml-ftrm
25+
enable_contrib_no_build=libnbc,vt
26+
with_memory_manager=no
27+
with_tm=no
28+
with_devel_headers=yes
29+
with_portals=no
30+
with_valgrind=no
31+
with_sqlite3=no
32+
with_sigar=no
33+
with_coretemp=yes
34+
with_freq=yes
35+
with_pwr=yes
36+
with_postgres=no
37+
with_slurm=no
38+
with_ipmi=no

‎contrib/platform/intel/hillsboro/orcm-nightly-build.xml

+47
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
<?xml version="1.0"?>
2+
<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
3+
4+
<!-- orcm configuration file. -->
5+
6+
<configuration>
7+
8+
<orcm-aggregators>
9+
<nodes>
10+
<value>hostname</value>
11+
</nodes>
12+
<port>
13+
<value>55805</value>
14+
</port>
15+
<mca-params>
16+
<value>sensor_base_sample_rate=5,sensor_heartbeat_rate=10,sensor_base_log_samples=1,db_print_file=+</value>
17+
</mca-params>
18+
</orcm-aggregators>
19+
20+
<orcm-daemons>
21+
<port>
22+
<value>55810</value>
23+
</port>
24+
<cores>
25+
<value>0,1</value>
26+
</cores>
27+
<mca-params>
28+
<value>sensor_base_sample_rate=5,sensor_heartbeat_rate=10,sensor_base_log_samples=1</value>
29+
</mca-params>
30+
</orcm-daemons>
31+
32+
<orcm-schedulers>
33+
<description>Identify the node that houses the ORCM scheduler. Only
34+
one allowed at this time</description>
35+
<nodes>
36+
<value>hostname</value>
37+
</nodes>
38+
<port>
39+
<value>55820</value>
40+
<description>Port used by orcm scheduler</description>
41+
</port>
42+
<mca-params>
43+
<description>List of MCA params to be used by scheduler</description>
44+
</mca-params>
45+
</orcm-schedulers>
46+
47+
</configuration>

‎make.spec

+61
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
define make_spec
2+
3+
Summary: Open Resilency Cluster Management implementation.
4+
Name: orcm
5+
Version: $(version)
6+
Release: $(release)
7+
License: See COPYING
8+
Group: System Environment/Libraries
9+
Vendor: Intel Corporation
10+
URL: https://bitbucket.org/rhc/orcm/
11+
Source0: %{name}-%{version}.tar.gz
12+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
13+
Prefix: /usr
14+
15+
%{!?configure_flags: %define configure_flags ""}
16+
17+
%description
18+
orcm is a opensource resilency cluster management software implementation.
19+
20+
%prep
21+
%setup -q -c -T -a 0
22+
23+
%build
24+
./autogen.pl
25+
mkdir -p obj
26+
cd obj
27+
pwd
28+
cp ../contrib/platform/intel/bend/linux-orcm-intel* .
29+
sed -e s/hostname/${HOSTNAME}/g ../contrib/platform/intel/bend/linux-orcm-intel.xml > linux-orcm-intel.xml
30+
../configure %{configure_flags} --prefix=/usr --libdir=/usr/lib --with-platform=linux-orcm-intel
31+
exit
32+
$(make_prefix) $(MAKE) $(make_postfix)
33+
#$(MAKE) build_doc
34+
35+
%install
36+
cd obj
37+
make DESTDIR=%{buildroot} install
38+
$(extra_install)
39+
40+
%clean
41+
42+
%files
43+
%defattr(-,root,root,-)
44+
/usr/etc/orcm-site.xml
45+
/usr/etc/openmpi-default-hostfile
46+
/usr/etc/openmpi-mca-params.conf
47+
/usr/bin/*
48+
/usr/lib/*
49+
/usr/include/openmpi/*
50+
%doc /usr/share/open-rcm/*
51+
%doc /usr/share/openmpi/*
52+
%doc /usr/share/man/man1/*
53+
%doc /usr/share/man/man7/*
54+
$(extra_files)
55+
56+
%changelog
57+
* Mon Mar 10 2014 mic <mic@localhost> -
58+
- Initial build.
59+
endef
60+
61+
export make_spec

‎make_rpm.mk

+45
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
name = orcm
2+
arch = $(shell uname -p)
3+
version = 0.0.0
4+
#$(shell git describe | sed 's|[^0-9]*\([0-9]*\.[0-9]*\.[0-9]*\).*|\1|')
5+
release = 1
6+
#$(shell git describe | sed 's|[^0-9]*[0-9]*\.[0-9]*\.[0-9]*-\([0-9]*\).*|\1|')
7+
8+
src = $(shell cat MANIFEST)
9+
10+
topdir = $(HOME)/rpmbuild
11+
rpm = $(topdir)/RPMS/$(arch)/$(name)-$(version)-$(release).$(arch).rpm
12+
srpm = $(topdir)/SRPMS/$(name)-$(version)-$(release).src.rpm
13+
specfile = $(topdir)/SPECS/$(name)-$(version).spec
14+
source_tar = $(topdir)/SOURCES/$(name)-$(version).tar.gz
15+
16+
rpmbuild_flags = -E '%define _topdir $(topdir)' -E '%define configure_flags $(configure_flags)'
17+
rpmclean_flags = $(rpmbuild_flags) --clean --rmsource --rmspec
18+
19+
configure_flags = --enable-autogen --with-orcm-prefix=orcm_
20+
21+
include make.spec
22+
23+
all: $(rpm)
24+
25+
$(rpm): $(specfile) $(source_tar)
26+
rpmbuild $(rpmbuild_flags) $(specfile) -ba
27+
28+
$(source_tar): $(topdir) $(specfile)
29+
if [ -n "$(revision)" ]; then \
30+
git archive $(revision) -o $@; \
31+
else \
32+
tar -c -z -v -T MANIFEST -f $@; \
33+
fi ; \
34+
rpmbuild $(rpmbuild_flags) $(specfile) -bp
35+
36+
$(specfile): $(topdir) make.spec
37+
@echo "$$make_spec" > $@
38+
39+
$(topdir):
40+
mkdir -p $@/{BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS}
41+
42+
clean:
43+
-rpmbuild $(rpmclean_flags) $(specfile)
44+
45+
.PHONY: all clean

‎orcm/mca/sensor/ipmi/Makefile.am

+4
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@
1111
dist_orcmdata_DATA = help-orcm-sensor-ipmi.txt
1212

1313
sources = \
14+
ipmiutil-2.9.3/util/ievents.c \
15+
ipmiutil-2.9.3/util/ievents.h \
16+
ipmiutil-2.9.3/util/isensor.c \
17+
ipmiutil-2.9.3/util/isensor.h \
1418
sensor_ipmi.c \
1519
sensor_ipmi.h \
1620
sensor_ipmi_component.c

‎orcm/mca/sensor/ipmi/configure.m4

+18
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,24 @@ AC_DEFUN([MCA_orcm_sensor_ipmi_CONFIG], [
1919
[], with_ipmi=no)
2020

2121
# do not build if support not requested
22+
AS_IF([test "$with_ipmi" != "no"],
23+
[AS_IF([test ! -z "$with_ipmi" -a "$with_ipmi" != "yes"],
24+
[orcm_check_ipmi_dir="$with_ipmi"])
25+
26+
OPAL_CHECK_PACKAGE([sensor_ipmi],
27+
[ipmicmd.h],
28+
[ipmiutil],
29+
[ipmi_cmd_mc],
30+
[-lcrypto],
31+
[$orcm_check_ipmi_dir],
32+
[],
33+
[$1],
34+
[AC_MSG_WARN([IPMI SENSOR SUPPORT REQUESTED])
35+
AC_MSG_WARN([BUT REQUIRED LIBRARY OR HEADER NOT FOUND])
36+
AC_MSG_ERROR([CANNOT CONTINUE])
37+
$2])],
38+
[$2])
39+
# do not build if support not requested
2240
AS_IF([test "1" = "1"],
2341
[$1],
2442
[$2])

0 commit comments

Comments
 (0)