ソースを参照

mlr: fixing make check and showcheck, warning about compilation on windows

Luka Stanisic 8 年 前
コミット
f90ad889a6
共有3 個のファイルを変更した5 個の追加3 個の削除を含む
  1. 1 1
      configure.ac
  2. 3 1
      min-dgels/Makefile.in
  3. 1 1
      src/core/perfmodel/multiple_regression.c

+ 1 - 1
configure.ac

@@ -1136,7 +1136,7 @@ AC_ARG_ENABLE(mlr, [AS_HELP_STRING([--disable-mlr],
 			enable_mlr=$enableval, enable_mlr=yes)
 
 AC_MSG_CHECKING(whether multiple linear regression models are disabled)
-if test x$enable_mlr = xyes; then
+if test x$enable_mlr = xyes -a "$starpu_windows" != "yes" ; then
    	AC_MSG_RESULT(no)
 	install_min_dgels=no
    	STARPU_SEARCH_LIBS(LAPACK,[dgels_],[lapack],use_system_lapack=yes,,)

+ 3 - 1
min-dgels/Makefile.in

@@ -24,5 +24,7 @@ distdir:
 	cp -fRp $(STARPU_SRCDIR)/* $(distdir)
 	cd $(distdir) && cp Makefile.in Makefile && make clean && rm -rf Makefile
 
-check: install
+check:
 	echo "No checks are implemented for min-dgels"
+
+showcheck: check

+ 1 - 1
src/core/perfmodel/multiple_regression.c

@@ -259,7 +259,7 @@ int _starpu_multiple_regression(struct starpu_perfmodel_history_list *ptr, doubl
         long i;
 	unsigned j;
 #ifndef STARPU_MLR_MODEL
-	_STARPU_DISP("Warning: StarPU was compiled with '--disable-mlr' option, thus multiple linear regression model will not be computed.\n");
+	_STARPU_DISP("Warning: StarPU was compiled with '--disable-mlr' option or on Windows machine, thus multiple linear regression model will not be computed.\n");
 	for(i=0; i<ncoeff; i++)
 		coeff[i] = 0.;
 	return 1;