rpms/R-RScaLAPACK/F-11 R-RScaLAPACK.spec,1.31,1.32
Tom Callaway
spot at fedoraproject.org
Wed Jan 13 15:34:57 UTC 2010
- Previous message: rpms/iptables/devel .cvsignore, 1.28, 1.29 iptables-1.4.5-cloexec.patch, 1.1, 1.2 iptables.spec, 1.80, 1.81 sources, 1.28, 1.29
- Next message: rpms/mailman/devel mailman.spec,1.90,1.91
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: spot
Update of /cvs/pkgs/rpms/R-RScaLAPACK/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21343
Modified Files:
R-RScaLAPACK.spec
Log Message:
sync, rebuild
Index: R-RScaLAPACK.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-RScaLAPACK/F-11/R-RScaLAPACK.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- R-RScaLAPACK.spec 23 Feb 2009 22:53:51 -0000 1.31
+++ R-RScaLAPACK.spec 13 Jan 2010 15:34:57 -0000 1.32
@@ -1,24 +1,45 @@
%define packname RScaLAPACK
-%ifarch x86_64 ia64 ppc64 sparc64
-%define bitsize 64
-%else
-%define bitsize 32
-%endif
+# These macros will go away soon. Hopefully.
+%global _openmpi_load \
+ . /etc/profile.d/modules.sh; \
+ module load openmpi-%{_arch}; \
+ export CFLAGS="$CFLAGS";
+%global _openmpi_unload \
+ . /etc/profile.d/modules.sh; \
+ module unload openmpi-%{_arch};
+
+# The blacs packages should probably provide this.
+%global _blacs_openmpi_load \
+ . /etc/profile.d/modules.sh; \
+ module load blacs-openmpi-%{_arch}; \
+ export CFLAGS="$CFLAGS";
+%global _blacs_openmpi_unload \
+ . /etc/profile.d/modules.sh; \
+ module unload blacs-openmpi-%{_arch};
+
+# The scalapack packages should probably provide this.
+%global _scalapack_openmpi_load \
+ . /etc/profile.d/modules.sh; \
+ module load scalapack-openmpi-%{_arch}; \
+ export CFLAGS="$CFLAGS";
+%global _scalapack_openmpi_unload \
+ . /etc/profile.d/modules.sh; \
+ module unload scalapack-openmpi-%{_arch};
Name: R-%{packname}
Version: 0.5.1
-Release: 19%{?dist}
+Release: 22%{?dist}
Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}.tar.gz
License: MIT
-URL: http://cran.r-project.org/contrib
+URL: http://cran.r-project.org/web/packages/RScaLAPACK/index.html
Group: Applications/Engineering
Summary: An interface to perform parallel computation on linear algebra problems using ScaLAPACK
BuildRequires: openmpi-devel, R-devel, tetex-latex, lapack-devel, blas-devel
-BuildRequires: gcc-gfortran, blacs-devel, scalapack-devel, autoconf, automake
-Requires: R, scalapack, openmpi-libs
-Requires(post): R
-Requires(postun): R
+BuildRequires: gcc-gfortran, blacs-openmpi-devel, scalapack-openmpi-devel, autoconf, automake
+Requires: R-core, scalapack-openmpi, openmpi
+Requires(post): R-core
+Requires(postun): R-core
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch0: R-RScaLAPACK-0.5.1-mpi-blacs.patch
Patch1: R-RScaLAPACK-0.5.1-gcc4.patch
@@ -62,9 +83,23 @@ autoconf
%build
%install
-rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_libdir}/R/library
-%{_bindir}/R CMD INSTALL --configure-args="--with-blas=%{_libdir} CC='mpicc' F77='mpif77' CFLAGS='$RPM_OPT_FLAGS -lutil -lmpiblacsCinit -lmpiblacs -lmpi -llapack' FFLAGS='$RPM_OPT_FLAGS -lutil -llapack -lmpi'" -l $RPM_BUILD_ROOT%{_libdir}/R/library %{packname}
+
+# Build OpenMPI version
+export MPI_COMPILER=openmpi
+%{_openmpi_load}
+OPENMPICFLAGS="$CFLAGS"
+OPENMPILDFLAGS="$LDFLAGS"
+%{_blacs_openmpi_load}
+BLACSCFLAGS="$CFLAGS"
+BLACSLDFLAGS="$LDFLAGS"
+%{_scalapack_openmpi_load}
+RPM_OPT_FLAGS="$CFLAGS %{optflags}"
+%{_bindir}/R CMD INSTALL --configure-args="--with-blas=%{_libdir} CC='mpicc' F77='mpif77' CFLAGS='$RPM_OPT_FLAGS $LDFLAGS $BLACSLDFLAGS $OPENMPILDFLAGS -lutil -lmpiblacsCinit -lmpiblacs -lmpi -llapack' FFLAGS='$RPM_OPT_FLAGS $LDFLAGS $BLACSLDFLAGS $OPENMPILDFLAGS -lutil -llapack -lmpi'" -l $RPM_BUILD_ROOT%{_libdir}/R/library %{packname}
+%{_scalapack_openmpi_unload}
+%{_blacs_openmpi_unload}
+%{_openmpi_unload}
+
# Clean up in advance of check
test -d %{packname}/src && (cd %{packname}/src; rm -f *.o *.so)
rm -rf $RPM_BUILD_ROOT%{_libdir}/R/library/R.css
@@ -87,6 +122,15 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/R/library/%{packname}/
%changelog
+* Wed Aug 19 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.5.1-22
+- fix url, drop old bitsize macros
+
+* Thu Aug 6 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.5.1-21
+- Update for new MPI scheme
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.1-20
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.1-19
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
- Previous message: rpms/iptables/devel .cvsignore, 1.28, 1.29 iptables-1.4.5-cloexec.patch, 1.1, 1.2 iptables.spec, 1.80, 1.81 sources, 1.28, 1.29
- Next message: rpms/mailman/devel mailman.spec,1.90,1.91
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list