Refactoring of check if built with support for OpenMP

DESCRIPTION

@@ -35,7 +35,7 @@ Imports:
     stats,
     utils,
     Matrix
-Collate:
+Collate: 
     'AllGenerics.R'
     'check_arguments.R'
     'scheduled_events.R'
@@ -48,7 +48,6 @@ Collate:
     'SISe_sp.R'
     'SimInf.R'
     'demo_model.R'
-    'dependencies.R'
     'distance.R'
     'run_outer.R'
 RoxygenNote: 6.0.1

R/SimInf.R

@@ -1,7 +1,7 @@
 ## SimInf, a framework for stochastic disease spread simulations
 ## Copyright (C) 2015  Pavol Bauer
-## Copyright (C) 2015 - 2016  Stefan Engblom
-## Copyright (C) 2015 - 2016  Stefan Widgren
+## Copyright (C) 2015 - 2017  Stefan Engblom
+## Copyright (C) 2015 - 2017  Stefan Widgren
 ##
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -34,6 +34,16 @@ NULL
     library.dynam.unload("SimInf", libpath)
 }
 
+##' Is OpenMP available
+##'
+##' @return TRUE if SimInf was built with support for OpenMP, else
+##'     FALSE.
+##' @keywords internal
+have_openmp <- function()
+{
+    .Call("siminf_have_openmp", PACKAGE = "SimInf")
+}
+
 ##' Scheduled events example data
 ##'
 ##' Synthetic scheduled events data to demonstrate the \code{SISe3}

configure

@@ -591,7 +591,6 @@ MODELS_OBJ
 PKG_LIBS
 PKG_CFLAGS
 PKG_CPPFLAGS
-SIMINF_HAVE_OPENMP
 OPENMP_CFLAGS
 OBJEXT
 EXEEXT
@@ -619,6 +618,7 @@ infodir
 docdir
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -691,6 +691,7 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -943,6 +944,15 @@ do
   | -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=* \
@@ -1080,7 +1090,7 @@ fi
 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.
@@ -1233,6 +1243,7 @@ Fine tuning of the installation directories:
   --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]
@@ -2707,11 +2718,8 @@ _ACEOF
 $as_echo "${ac_pkg_openmp}" >&6; }
 fi
 
-if test "x${ac_pkg_openmp}" = xyes; then
-    SIMINF_HAVE_OPENMP=TRUE
-else
+if test "x${ac_pkg_openmp}" = xno; then
     OPENMP_CFLAGS=''
-    SIMINF_HAVE_OPENMP=FALSE
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
   -----------------------------------------------
    Unable to find OpenMP on this system.
@@ -2858,7 +2866,6 @@ fi
 # List all model files to compile
 MODELS_OBJ=`"${RSCRIPT}" -e "cat(paste0('models/', sub('c$', 'o', list.files('src/models', '.c$')), collapse=' '))"`
 
-
 PKG_CPPFLAGS="-I. -Icore -Imisc -Imodels ${OPENMP_CFLAGS} ${CPPFLAGS}"
 
 PKG_CFLAGS="${OPENMP_CFLAGS}"
@@ -2867,7 +2874,7 @@ PKG_LIBS="${OPENMP_CFLAGS} ${LIBS}"
 
 
 
-ac_config_files="$ac_config_files R/dependencies.R src/Makevars"
+ac_config_files="$ac_config_files src/Makevars"
 
 
 cat >confcache <<\_ACEOF
@@ -3575,7 +3582,6 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 for ac_config_target in $ac_config_targets
 do
   case $ac_config_target in
-    "R/dependencies.R") CONFIG_FILES="$CONFIG_FILES R/dependencies.R" ;;
     "src/Makevars") CONFIG_FILES="$CONFIG_FILES src/Makevars" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;

configure.ac

@@ -1,7 +1,7 @@
 # SimInf, a framework for stochastic disease spread simulations
 # Copyright (C) 2015  Pavol Bauer
-# Copyright (C) 2015 - 2016  Stefan Engblom
-# Copyright (C) 2015 - 2016  Stefan Widgren
+# Copyright (C) 2015 - 2017  Stefan Engblom
+# Copyright (C) 2015 - 2017  Stefan Widgren
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -65,11 +65,8 @@ if test -n "${OPENMP_CFLAGS}"; then
     AC_MSG_RESULT([${ac_pkg_openmp}])
 fi
 
-if test "x${ac_pkg_openmp}" = xyes; then
-    SIMINF_HAVE_OPENMP=TRUE
-else
+if test "x${ac_pkg_openmp}" = xno; then
     OPENMP_CFLAGS=''
-    SIMINF_HAVE_OPENMP=FALSE
     AC_MSG_WARN([
   -----------------------------------------------
    Unable to find OpenMP on this system.
@@ -116,12 +113,11 @@ fi
 # List all model files to compile
 MODELS_OBJ=`"${RSCRIPT}" -e "cat(paste0('models/', sub('c$', 'o', list.files('src/models', '[.]c$')), collapse=' '))"`
 
-AC_SUBST(SIMINF_HAVE_OPENMP)
 AC_SUBST([PKG_CPPFLAGS], ["-I. -Icore -Imisc -Imodels ${OPENMP_CFLAGS} ${CPPFLAGS}"])
 AC_SUBST([PKG_CFLAGS], ["${OPENMP_CFLAGS}"])
 AC_SUBST([PKG_LIBS], ["${OPENMP_CFLAGS} ${LIBS}"])
 AC_SUBST(MODELS_OBJ)
 
-AC_CONFIG_FILES([R/dependencies.R src/Makevars])
+AC_CONFIG_FILES([src/Makevars])
 
 AC_OUTPUT

src/siminf.c

@@ -134,3 +134,17 @@ SEXP siminf_run(
 
     return trajectory;
 }
+
+/**
+ * Is OpenMP available
+ */
+SEXP siminf_have_openmp()
+{
+    return Rf_ScalarLogical(
+#ifdef _OPENMP
+        1
+#else
+        0
+#endif
+        );
+}