浏览代码

Revert commits adding the entry point for the StarPU-DSM layer in the StarPU build system. The layer will not be merged in a foreseeable future.

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

+ 1 - 5
Makefile.am

@@ -39,10 +39,6 @@ if STARPU_USE_MPI
 SUBDIRS += mpi
 endif
 
-if USE_DSM
-SUBDIRS += dsm
-endif
-
 if BUILD_EXAMPLES
 SUBDIRS += examples
 endif
@@ -185,7 +181,7 @@ endif
 txt_DATA = AUTHORS COPYING.LGPL README README.dev STARPU-REVISION
 EXTRA_DIST = autogen.sh AUTHORS COPYING.LGPL README README.dev STARPU-VERSION STARPU-REVISION build-aux/svn2cl.xsl mic-configure
 
-DISTCLEANFILES = STARPU-REVISION dsm/Makefile
+DISTCLEANFILES = STARPU-REVISION
 
 
 include starpu-top/extradist

+ 0 - 1
autogen.sh

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

+ 0 - 34
configure.ac

@@ -476,39 +476,6 @@ AC_MSG_RESULT($build_nmad_lib)
 
 ###############################################################################
 #                                                                             #
-#                                    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
-	mkdir -p dsm
-	echo "dist:" > ./dsm/Makefile
-	echo "distdir:" >> ./dsm/Makefile
-	echo "distclean:" >> ./dsm/Makefile
-        enable_dsm=no
-fi
-
-AM_CONDITIONAL(USE_DSM, [test x$enable_dsm != xno])
-
-###############################################################################
-#                                                                             #
 #                                LIBTOOLS                                     #
 #                                                                             #
 ###############################################################################
@@ -3566,7 +3533,6 @@ AC_MSG_NOTICE([
 	       StarPU MPI(nmad) enabled:                      $build_nmad_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