浏览代码

add hook for building INTERTWinE's StarPU-DSM module as part of the StarPU build process

Olivier Aumage 7 年之前
父节点
当前提交
f8356fcc0b
共有 3 个文件被更改,包括 35 次插入0 次删除
  1. 4 0
      Makefile.am
  2. 1 0
      autogen.sh
  3. 30 0
      configure.ac

+ 4 - 0
Makefile.am

@@ -39,6 +39,10 @@ if USE_MPI
 SUBDIRS += mpi
 endif
 
+if USE_DSM
+SUBDIRS += dsm
+endif
+
 if BUILD_EXAMPLES
 SUBDIRS += examples
 endif

+ 1 - 0
autogen.sh

@@ -28,5 +28,6 @@ then
 		export LIBTOOLIZE=glibtoolize
 	fi
 fi
+mkdir -p dsm
 autoreconf -ivf -I m4
 

+ 30 - 0
configure.ac

@@ -398,6 +398,35 @@ AC_DEFINE_UNQUOTED(STARPU_MAXMPIDEVS, [$nmaxmpidev], [maximum number of MPI devi
 
 ###############################################################################
 #                                                                             #
+#                                    DSM                                      #
+#                                                                             #
+###############################################################################
+
+AC_ARG_ENABLE(dsm, [AS_HELP_STRING([--enable-dsm],
+                              [Enable StarPU DSM library generation])],
+            [enable_dsm=$enableval],
+            [enable_dsm=no])
+
+if test x$enable_dsm = xyes; then
+        # rule out StarPU DSM + StarPU MPI for now
+        if test x$build_mpi_lib = xyes; then
+                AC_MSG_ERROR(StarPU DSM library generation is incompatible with StarPU MPI lib generation)
+        fi
+fi
+
+dsm_included=no
+sinclude(dsm/config-inc.ac)
+if test x$dsm_included != xyes; then
+        if test x$enable_dsm = xyes; then
+                AC_MSG_ERROR(StarPU DSM library generation needs DSM source in STARPU/dsm subdirectory)
+        fi
+        enable_dsm=no
+fi
+
+AM_CONDITIONAL(USE_DSM, [test x$enable_dsm != xno])
+
+###############################################################################
+#                                                                             #
 #                                LIBTOOLS                                     #
 #                                                                             #
 ###############################################################################
@@ -3403,6 +3432,7 @@ AC_MSG_NOTICE([
 	       StarPU MPI enabled:                            $build_mpi_lib
 	       MPI test suite:                                $running_mpi_check
 	       Master-Slave MPI enabled:                      $use_mpi_master_slave
+	       StarPU DSM enabled:                            $enable_dsm
 	       FFT Support:                                   $fft_support
 	       GCC plug-in:                                   $build_gcc_plugin
 	       GCC plug-in test suite (requires GNU Guile):   $run_gcc_plugin_test_suite