rpms/R-RScaLAPACK/devel R-RScaLAPACK-0.5.1-blacsfix.patch, NONE, 1.1 R-RScaLAPACK-0.5.1-configurefix.patch, NONE, 1.1 R-RScaLAPACK-0.5.1-gcc4.patch, NONE, 1.1 R-RScaLAPACK.spec, 1.11, 1.12
Tom Callaway (spot)
fedora-extras-commits at redhat.com
Thu Mar 9 14:51:56 UTC 2006
Author: spot
Update of /cvs/extras/rpms/R-RScaLAPACK/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32271/devel
Modified Files:
R-RScaLAPACK.spec
Added Files:
R-RScaLAPACK-0.5.1-blacsfix.patch
R-RScaLAPACK-0.5.1-configurefix.patch
R-RScaLAPACK-0.5.1-gcc4.patch
Log Message:
With scalapack finally working, we can get this thing going as well.
R-RScaLAPACK-0.5.1-blacsfix.patch:
--- NEW FILE R-RScaLAPACK-0.5.1-blacsfix.patch ---
--- R-RScaLAPACK-0.5.1/RScaLAPACK/src/CRscalapack.c.BAD 2006-02-26 11:14:18.000000000 -0600
+++ R-RScaLAPACK-0.5.1/RScaLAPACK/src/CRscalapack.c 2006-02-26 11:14:42.000000000 -0600
@@ -113,7 +113,7 @@
* the function is sla.gridExit, so exit.
*/
if (ipGridAndDims[8] == 0 && rel_flag == 1){
- F77_CALL(blacs_exit_)(&exitTemp);
+ F77_CALL(blacs_exit)(&exitTemp);
printf ("Exiting BLACS ... rank = %d\n",iMyRank);
return AsInt(1);
}
@@ -127,7 +127,7 @@
/* Uses BLACS call to perform MPI_Init */
int CR_InitializeEnv(int *ipMyRank, int *ipNumProcs) {
- F77_CALL(blacs_pinfo_)(ipMyRank, ipNumProcs);
+ F77_CALL(blacs_pinfo)(ipMyRank, ipNumProcs);
return 0;
}
@@ -534,7 +534,7 @@
D_Rprintf ((" Process 0 ... in cntrl statement ..after init \n"));
- F77_CALL(blacs_get_)(&temp1, &temp2, &ictxt);
+ F77_CALL(blacs_get)(&temp1, &temp2, &ictxt);
/* Calculate the value for WATOBD */
D_Rprintf ((" Process 0 ... in cntrl statement ..1 \n"));
R-RScaLAPACK-0.5.1-configurefix.patch:
--- NEW FILE R-RScaLAPACK-0.5.1-configurefix.patch ---
--- R-RScaLAPACK-0.5.1/RScaLAPACK/configure.in.BAD 2006-02-26 10:06:00.000000000 -0600
+++ R-RScaLAPACK-0.5.1/RScaLAPACK/configure.in 2006-02-26 10:16:03.000000000 -0600
@@ -135,7 +135,7 @@
AC_MSG_NOTICE(LAM-libmpi.a not found)
MPI_LAM=no
])
- AC_CHECK_LIB(lamf77mpi, mpi_comm_create__,[
+ AC_CHECK_LIB(lamf77mpi, mpi_comm_create_,[
LIBS="-llamf77mpi ${LIBS}"
MPI_LAM=yes
],[
@@ -258,8 +258,8 @@
else
AC_LANG_PUSH(Fortran 77)
AC_CHECK_LIB(blas, ztrsm,[
- LIBS="-lf77blas ${LIBS}"], [
- AC_MSG_ERROR(libf77blas.a not found,-1)
+ LIBS="-lblas ${LIBS}"], [
+ AC_MSG_ERROR(libblas.a not found,-1)
])
AC_LANG_POP(Fortran 77)
fi
@@ -297,16 +297,16 @@
AC_MSG_ERROR(libcblacsF77init.a not found,-1)
fi
else
- AC_CHECK_LIB(blacs, Cblacs_gridexit,[], [
- AC_MSG_ERROR(libblacs.a not found,-1)
+ AC_CHECK_LIB(mpiblacs, Cblacs_gridexit,[], [
+ AC_MSG_ERROR(libmpiblacs.a not found,-1)
])
- AC_CHECK_LIB(blacsCinit, Cblacs_pinfo,[],[
- AC_MSG_ERROR(libblacsCinit.a not found,-1)
+ AC_CHECK_LIB(mpiblacsCinit, Cblacs_pinfo,[],[
+ AC_MSG_ERROR(libmpiblacsCinit.a not found,-1)
])
- AC_CHECK_LIB(blacsF77init, blacs_pinfo__,[],[
- AC_MSG_ERROR(libblacsF77init.a not found,-1)
+ AC_CHECK_LIB(mpiblacsF77init, blacs_pinfo_,[],[
+ AC_MSG_ERROR(libmpiblacsF77init.a not found,-1)
])
fi
R-RScaLAPACK-0.5.1-gcc4.patch:
--- NEW FILE R-RScaLAPACK-0.5.1-gcc4.patch ---
--- R-RScaLAPACK-0.5.1/RScaLAPACK/src/Makefile.BAD 2006-02-25 10:23:29.000000000 -0600
+++ R-RScaLAPACK-0.5.1/RScaLAPACK/src/Makefile 2006-02-25 10:23:41.000000000 -0600
@@ -16,10 +16,10 @@
all: CRDriver RScaLAPACK.so
RScaLAPACK.so: $(PA_OBJECTS)
- $(SHLIB_LINK) $(PA_OBJECTS) $(CFLAGS) -lg2c $(LDFLAGS) $(PALIBS) -o $@
+ $(SHLIB_LINK) $(PA_OBJECTS) $(CFLAGS) -lgfortran $(LDFLAGS) $(PALIBS) -o $@
CRDriver: CRDriver.o $(CR_OBJECTS)
- $(CC) CRDriver.o $(CR_OBJECTS) $(LDFLAGS) $(LIBS) $(CFLAGS) -lg2c -o $@
+ $(CC) CRDriver.o $(CR_OBJECTS) $(LDFLAGS) $(LIBS) $(CFLAGS) -lgfortran -o $@
cp CRDriver $(exec_dir)
clean:
--- R-RScaLAPACK-0.5.1/RScaLAPACK/src/Makefile.in.BAD 2006-02-26 11:12:04.000000000 -0600
+++ R-RScaLAPACK-0.5.1/RScaLAPACK/src/Makefile.in 2006-02-26 11:12:13.000000000 -0600
@@ -16,10 +16,10 @@
all: CRDriver RScaLAPACK.so
RScaLAPACK.so: $(PA_OBJECTS)
- $(SHLIB_LINK) $(PA_OBJECTS) $(CFLAGS) -lg2c $(LDFLAGS) $(PALIBS) -o $@
+ $(SHLIB_LINK) $(PA_OBJECTS) $(CFLAGS) -lgfortran $(LDFLAGS) $(PALIBS) -o $@
CRDriver: CRDriver.o $(CR_OBJECTS)
- $(CC) CRDriver.o $(CR_OBJECTS) $(LDFLAGS) $(LIBS) $(CFLAGS) -lg2c -o $@
+ $(CC) CRDriver.o $(CR_OBJECTS) $(LDFLAGS) $(LIBS) $(CFLAGS) -lgfortran -o $@
cp CRDriver $(exec_dir)
clean:
Index: R-RScaLAPACK.spec
===================================================================
RCS file: /cvs/extras/rpms/R-RScaLAPACK/devel/R-RScaLAPACK.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- R-RScaLAPACK.spec 13 Jun 2005 04:17:39 -0000 1.11
+++ R-RScaLAPACK.spec 9 Mar 2006 14:51:55 -0000 1.12
@@ -1,25 +1,23 @@
%define packname RScaLAPACK
+%define lamdir %{_libdir}/lam
Name: R-%{packname}
-Version: 0.4.0
-Release: 12%{?dist}
+Version: 0.5.1
+Release: 2%{?dist}
Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}.tar.gz
License: Freely distributable
URL: http://cran.r-project.org/contrib
Group: Applications/Engineering
Summary: An interface to perform parallel computation on linear algebra problems using ScaLAPACK
-BuildRequires: R-devel, tetex-latex
-BuildRequires: gcc-gfortran, lam, blacs, scalapack
+BuildRequires: R-devel, tetex-latex, lapack-devel
+BuildRequires: gcc-gfortran, lam, blacs-devel, scalapack-devel, autoconf
Requires: R, scalapack
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch0: R-RScaLAPACK-0.4.0-lam-mpi-blacs.patch
-Patch1: R-RScaLAPACK-0.4.0-gcc4.patch
+Patch1: R-RScaLAPACK-0.5.1-gcc4.patch
Patch2: R-RScaLAPACK-0.4.0-lam-mpi-blacs64.patch
-#
-# Normally, this is bad form, but we need to do this.
-# lam needs to be built with -fPIC for x86_64 to work.
-#
-ExcludeArch: x86_64
+Patch3: R-RScaLAPACK-0.5.1-configurefix.patch
+Patch4: R-RScaLAPACK-0.5.1-blacsfix.patch
%description
R package:
@@ -35,14 +33,19 @@
%patch0 -p1
%endif
%patch1 -p1
+%patch3 -p1
+%patch4 -p1
%build
+cd RScaLAPACK
+autoconf
+cd ..
cp %{packname}/DESCRIPTION .
%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_libdir}/R/library
-%{_bindir}/R CMD INSTALL -l $RPM_BUILD_ROOT%{_libdir}/R/library %{packname}
+%{_bindir}/R CMD INSTALL --configure-args="CFLAGS='$RPM_OPT_FLAGS -I%{_includedir}/lam/ -L%{lamdir} -lutil -lmpiblacsCinit -lmpiblacs -llam -llamf77mpi -lmpi -llapack' FFLAGS='$RPM_OPT_FLAGS -I%{_includedir}/lam/ -L%{lamdir} -lutil -llapack'" -l $RPM_BUILD_ROOT%{_libdir}/R/library %{packname}
# %{_bindir}/R CMD check %{packname}
test -d %{packname}/src && (cd %{packname}/src; rm -f *.o *.so)
rm -rf $RPM_BUILD_ROOT%{_libdir}/R/library/R.css
@@ -51,19 +54,23 @@
rm -rf $RPM_BUILD_ROOT
%post
-%{_bindir}/R CMD perl %{_libdir}/R/share/perl/build-help.pl --htmllists
cat %{_libdir}/R/library/*/CONTENTS > %{_libdir}/R/doc/html/search/index.txt
%postun
-%{_bindir}/R CMD perl %{_libdir}/R/share/perl/build-help.pl --htmllists
cat %{_libdir}/R/library/*/CONTENTS > %{_libdir}/R/doc/html/search/index.txt
%files
%defattr(-,root,root,-)
%doc DESCRIPTION
-%{_libdir}/R/library/%{packname}
+%{_libdir}/R/library/%{packname}/
%changelog
+* Sun Feb 26 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.5.1-2
+- get this thing working again
+
+* Mon Jan 9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.5.1-1
+- bump to 0.5.1
+
* Mon May 16 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.4.0-9
- test fails unless you are running it on a lam cluster,
so don't run it here
More information about the scm-commits
mailing list