[Rsiena-commits] r309 - pkg/RSienaTest

Fri Sep 1 15:02:31 CEST 2017

Author: fschoenen
Date: 2017-09-01 15:02:30 +0200 (Fri, 01 Sep 2017)
New Revision: 309

Modified:
   pkg/RSienaTest/ChangeLog
   pkg/RSienaTest/DESCRIPTION
   pkg/RSienaTest/configure
   pkg/RSienaTest/configure.ac
Log:
don't compile with openmpi if orted if missing


Modified: pkg/RSienaTest/ChangeLog
===================================================================

--- pkg/RSienaTest/ChangeLog	2017-08-30 14:02:25 UTC (rev 308)
+++ pkg/RSienaTest/ChangeLog	2017-09-01 13:02:30 UTC (rev 309)
@@ -4,6 +4,10 @@
      in the algorithm object. This required only a change in 
      NetworkVariable::checkAlterAgreement; documented in Siena_algorithms.
 
+2017-09-01 R-Forge Revision 309
+Changes in RSienaTest:
+   * configure.ac: don't compile with openmpi if orted if missing
+
 2017-08-30 R-Forge Revision 308
 Changes in RSienaTest:
    * effects.r: remove hard coded number of types of interactions

Modified: pkg/RSienaTest/DESCRIPTION
===================================================================
--- pkg/RSienaTest/DESCRIPTION	2017-08-30 14:02:25 UTC (rev 308)
+++ pkg/RSienaTest/DESCRIPTION	2017-09-01 13:02:30 UTC (rev 309)
@@ -1,8 +1,8 @@
 Package: RSienaTest
 Type: Package
 Title: Siena - Simulation Investigation for Empirical Network Analysis
-Version: 1.1-307
-Date: 2017-05-12
+Version: 1.1-309
+Date: 2017-09-01
 Author: Ruth Ripley, Krists Boitmanis, Tom A.B. Snijders, Felix Schoenenberger
 Depends: R (>= 2.15.0), utils
 Imports: Matrix, tcltk, lattice, parallel, MASS, RUnit, methods

Modified: pkg/RSienaTest/configure
===================================================================
--- pkg/RSienaTest/configure	2017-08-30 14:02:25 UTC (rev 308)
+++ pkg/RSienaTest/configure	2017-09-01 13:02:30 UTC (rev 309)
@@ -657,6 +657,7 @@
 docdir
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -734,6 +735,7 @@
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -986,6 +988,15 @@
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
+  -runstatedir | --runstatedir | --runstatedi | --runstated \
+  | --runstate | --runstat | --runsta | --runst | --runs \
+  | --run | --ru | --r)
+    ac_prev=runstatedir ;;
+  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+  | --run=* | --ru=* | --r=*)
+    runstatedir=$ac_optarg ;;
+
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1123,7 +1134,7 @@
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
+		libdir localedir mandir runstatedir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1276,6 +1287,7 @@
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@@ -4468,8 +4480,9 @@
 
 
   if test "$ORTED" = no ; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Cannot find orted. Rmpi needs orted to run." >&5
-$as_echo "$as_me: Cannot find orted. Rmpi needs orted to run." >&6;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Cannot find orted. RSiena needs orted to run." >&5
+$as_echo "$as_me: Cannot find orted. RSiena needs orted to run." >&6;}
+    MPI=no
   fi
 fi
 
@@ -4607,13 +4620,16 @@
 if test "$MPI_TYPE" = "OPENMPI" -o "$MPI_TYPE" = "LAM" -o "$MPI_TYPE" = "MPICH2"; then
   MPI_DEFS="$MPI_DEFS -DMPI2"
 fi
+
 OSTYPE="`uname`"
 if test "$OSTYPE" = "Darwin"; then
   MPI_DEFS="$MPI_DEFS -DMAC"
 fi
 
-PKG_CPPFLAGS="$MPI_INCLUDES $MPI_DEFS"
 if test "$MPI" = "yes" ; then
+
+  PKG_CPPFLAGS="$MPI_INCLUDES $MPI_DEFS"
+
   case "$MPI_TYPE" in
     OPENMPI) PKG_LIBS="-lmpi_cxx -lmpi ${MPI_LIBS}";;
     LAM)     PKG_LIBS="-lmpi_cxx -llam ${MPI_LIBS}";;

Modified: pkg/RSienaTest/configure.ac
===================================================================
--- pkg/RSienaTest/configure.ac	2017-08-30 14:02:25 UTC (rev 308)
+++ pkg/RSienaTest/configure.ac	2017-09-01 13:02:30 UTC (rev 309)
@@ -3,17 +3,17 @@
 # Based on the autoconf.ac from the Rmpi package
 # <http://www.stats.uwo.ca/faculty/yu/Rmpi/>. Run `autoconf` to produce the
 # 'configure' script.
-
+#
 # - Run with automatic detection: `R CMD INSTALL {pkg}`
-
+#
 # - Run with a prefix folder. Subfolders will be searched for binarys.
 #   `R CMD INSTALL {pkg} --configure-args=--with-mpi=/path/to/location`
-
+#
 # - Fully specify paths and type.
 #   `R CMD INSTALL {pkg} --configure-args="        \\
-#    --with-Rmpi-include=/path/to/mpi_include_dir  \\
-#    --with-Rmpi-libpath=/path/to/mpi_lib_dir      \\
-#    --with-Rmpi-type={OPENMPI,MPICH,MPICH2,LAM}"`
+#    --with-mpi-include=/path/to/mpi_include_dir  \\
+#    --with-mpi-libpath=/path/to/mpi_lib_dir      \\
+#    --with-mpi-type={OPENMPI,MPICH,MPICH2,LAM}"`
 
 AC_PREREQ([2.69])
 AC_INIT([RSienaTest], 1.1-289)
@@ -233,7 +233,8 @@
 if test "$MPI_TYPE" = "OPENMPI" ; then
   AC_CHECK_PROG(ORTED, orted, yes, no)
   if test "$ORTED" = no ; then
-    AC_MSG_NOTICE([Cannot find orted. Rmpi needs orted to run.])
+    AC_MSG_NOTICE([Cannot find orted. RSiena needs orted to run.])
+    MPI=no
   fi
 fi
 
@@ -266,13 +267,16 @@
 if test "$MPI_TYPE" = "OPENMPI" -o "$MPI_TYPE" = "LAM" -o "$MPI_TYPE" = "MPICH2"; then
   MPI_DEFS="$MPI_DEFS -DMPI2"
 fi
+
 OSTYPE="`uname`"
 if test "$OSTYPE" = "Darwin"; then
   MPI_DEFS="$MPI_DEFS -DMAC"
 fi
 
-PKG_CPPFLAGS="$MPI_INCLUDES $MPI_DEFS"
 if test "$MPI" = "yes" ; then
+
+  PKG_CPPFLAGS="$MPI_INCLUDES $MPI_DEFS"
+
   case "$MPI_TYPE" in
     OPENMPI) PKG_LIBS="-lmpi_cxx -lmpi ${MPI_LIBS}";;
     LAM)     PKG_LIBS="-lmpi_cxx -llam ${MPI_LIBS}";;

