Add new modulefile in mpi directory to make sorting out mpi modules
easier and to allow for conflicts between mpi stacks. Bug #651074 Signed-off-by: Doug Ledford <dledford@redhat.com>
This commit is contained in:
parent
6e7bd70b19
commit
b010d4ac98
@ -1,7 +1,8 @@
|
|||||||
#%Module 1.0
|
#%Module 1.0
|
||||||
#
|
#
|
||||||
# OpenMPI module for use with 'environment-modules' package:
|
# OpenMPI module for use with 'environment-modules' package:
|
||||||
#
|
#
|
||||||
|
conflict mpi
|
||||||
prepend-path PATH @LIBDIR@/bin
|
prepend-path PATH @LIBDIR@/bin
|
||||||
prepend-path LD_LIBRARY_PATH @LIBDIR@/lib
|
prepend-path LD_LIBRARY_PATH @LIBDIR@/lib
|
||||||
prepend-path PYTHONPATH @PYSITEARCH@
|
prepend-path PYTHONPATH @PYSITEARCH@
|
||||||
|
13
openmpi.spec
13
openmpi.spec
@ -19,7 +19,7 @@
|
|||||||
|
|
||||||
Name: openmpi%{?_cc_name_suffix}
|
Name: openmpi%{?_cc_name_suffix}
|
||||||
Version: 1.5.4
|
Version: 1.5.4
|
||||||
Release: 2%{?dist}
|
Release: 3%{?dist}
|
||||||
Summary: Open Message Passing Interface
|
Summary: Open Message Passing Interface
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
License: BSD, MIT and Romio
|
License: BSD, MIT and Romio
|
||||||
@ -167,9 +167,10 @@ rm -f %{buildroot}%{_libdir}/%{name}/share/vampirtrace/doc/opari/lacsi01.ps.gz
|
|||||||
mkdir %{buildroot}%{_mandir}/%{namearch}/man{2,4,5,6,8,9,n}
|
mkdir %{buildroot}%{_mandir}/%{namearch}/man{2,4,5,6,8,9,n}
|
||||||
|
|
||||||
# Make the environment-modules file
|
# Make the environment-modules file
|
||||||
mkdir -p %{buildroot}%{_sysconfdir}/modulefiles
|
mkdir -p %{buildroot}%{_sysconfdir}/modulefiles/mpi
|
||||||
# Since we're doing our own substitution here, use our own definitions.
|
# Since we're doing our own substitution here, use our own definitions.
|
||||||
sed 's#@LIBDIR@#'%{_libdir}/%{name}'#g;s#@ETCDIR@#'%{_sysconfdir}/%{namearch}'#g;s#@FMODDIR@#'%{_fmoddir}/%{namearch}'#g;s#@INCDIR@#'%{_includedir}/%{namearch}'#g;s#@MANDIR@#'%{_mandir}/%{namearch}'#g;s#@PYSITEARCH@#'%{python_sitearch}/%{name}'#g;s#@COMPILER@#openmpi-'%{_arch}%{?_cc_name_suffix}'#g;s#@SUFFIX@#'%{?_cc_name_suffix}'_openmpi#g' < %SOURCE1 > %{buildroot}%{_sysconfdir}/modulefiles/%{namearch}
|
sed 's#@LIBDIR@#'%{_libdir}/%{name}'#g;s#@ETCDIR@#'%{_sysconfdir}/%{namearch}'#g;s#@FMODDIR@#'%{_fmoddir}/%{namearch}'#g;s#@INCDIR@#'%{_includedir}/%{namearch}'#g;s#@MANDIR@#'%{_mandir}/%{namearch}'#g;s#@PYSITEARCH@#'%{python_sitearch}/%{name}'#g;s#@COMPILER@#openmpi-'%{_arch}%{?_cc_name_suffix}'#g;s#@SUFFIX@#'%{?_cc_name_suffix}'_openmpi#g' < %SOURCE1 > %{buildroot}%{_sysconfdir}/modulefiles/mpi/%{namearch}
|
||||||
|
cp %{buildroot}%{_sysconfdir}/modulefiles/mpi/* %{buildroot}%{_sysconfdir}/modulefiles/
|
||||||
# make the rpm config file
|
# make the rpm config file
|
||||||
mkdir -p %{buildroot}/%{_sysconfdir}/rpm
|
mkdir -p %{buildroot}/%{_sysconfdir}/rpm
|
||||||
cp %SOURCE2 %{buildroot}/%{_sysconfdir}/rpm/macros.%{namearch}
|
cp %SOURCE2 %{buildroot}/%{_sysconfdir}/rpm/macros.%{namearch}
|
||||||
@ -205,6 +206,8 @@ rm -rf %{buildroot}
|
|||||||
%{_mandir}/%{namearch}/man7/ompi*
|
%{_mandir}/%{namearch}/man7/ompi*
|
||||||
%{_mandir}/%{namearch}/man7/orte*
|
%{_mandir}/%{namearch}/man7/orte*
|
||||||
%{_libdir}/%{name}/lib/openmpi/*
|
%{_libdir}/%{name}/lib/openmpi/*
|
||||||
|
%dir %{_sysconfdir}/modulefiles/mpi
|
||||||
|
%{_sysconfdir}/modulefiles/mpi/%{namearch}
|
||||||
%{_sysconfdir}/modulefiles/%{namearch}
|
%{_sysconfdir}/modulefiles/%{namearch}
|
||||||
#%files common
|
#%files common
|
||||||
%dir %{_libdir}/%{name}/share
|
%dir %{_libdir}/%{name}/share
|
||||||
@ -236,6 +239,10 @@ rm -rf %{buildroot}
|
|||||||
%{_sysconfdir}/rpm/macros.%{namearch}
|
%{_sysconfdir}/rpm/macros.%{namearch}
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Jan 20 2012 Doug Ledford <dledford@redhat.com> - 1.5.4-3
|
||||||
|
- Move modules file to mpi directory and make it conflict with any other
|
||||||
|
mpi module (bug #651074)
|
||||||
|
|
||||||
* Sun Jan 8 2012 Orion Poplawski <orion@cora.nwra.com> 1.5.4-2
|
* Sun Jan 8 2012 Orion Poplawski <orion@cora.nwra.com> 1.5.4-2
|
||||||
- Rebuild with gcc 4.7 (bug #772443)
|
- Rebuild with gcc 4.7 (bug #772443)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user