starpupy: move files and install python examples

  files src/starpu/* are now in src/
  rename tests folder in examples
  install python examples in prefix/lib/starpu/python
  update bin/starpu_env to set variable PYTHONPATH

configure.ac

@@ -3552,8 +3552,8 @@ AC_CONFIG_COMMANDS([executable-scripts], [
   test -e tools/starpu_paje_state_stats.R || ln -sf $ac_abs_top_srcdir/tools/starpu_paje_state_stats.R tools/starpu_paje_state_stats.R
   test -e tools/starpu_trace_state_stats.py || ln -sf $ac_abs_top_srcdir/tools/starpu_trace_state_stats.py tools/starpu_trace_state_stats.py
   chmod +x tools/starpu_trace_state_stats.py
-  chmod +x starpupy/tests/execute.sh
-  for x in starpupy/tests/starpu_py.sh starpupy/tests/starpu_py_parallel.sh; do
+  chmod +x starpupy/examples/execute.sh
+  for x in starpupy/examples/starpu_py.sh starpupy/examples/starpu_py_parallel.sh; do
       test -e $x || mkdir -p $(dirname $x) && ln -sf $ac_abs_top_srcdir/$x $(dirname $x)
   done
   chmod +x julia/examples/execute.sh
@@ -3629,8 +3629,8 @@ AC_OUTPUT([
 	starpupy/src/setup.py
 	starpupy/Makefile
 	starpupy/src/Makefile
-	starpupy/tests/Makefile
-	starpupy/tests/execute.sh
+	starpupy/examples/Makefile
+	starpupy/examples/execute.sh
 	examples/Makefile
 	examples/stencil/Makefile
 	tests/Makefile

starpupy/Makefile.am

@@ -17,5 +17,5 @@
 include $(top_srcdir)/starpu-subdirtests.mk
 
 SUBDIRS  = src
-SUBDIRS += tests
+SUBDIRS += examples
 

starpupy/tests/Makefile.am

@@ -17,8 +17,6 @@ SUBDIRS =
 
 CLEANFILES = *.gcno *.gcda *.linkinfo
 
-examplebindir = $(libdir)/starpupy/examples
-
 TESTS	=
 TESTS	+=	starpu_py.sh
 TESTS	+=	starpu_py_parallel.sh
@@ -28,3 +26,9 @@ EXTRA_DIST	=		\
 	starpu_py_parallel.sh	\
 	starpu_py.py		\
 	starpu_py.sh
+
+python_sourcesdir = $(libdir)/starpu/python
+dist_python_sources_DATA	=	\
+	starpu_py_parallel.py	\
+	starpu_py.py
+

starpupy/tests/execute.sh.in

@@ -17,18 +17,18 @@
 
 set -x
 
-tstdir=@STARPU_SRC_DIR@/starpupy/tests
+exampledir=@STARPU_SRC_DIR@/starpupy/examples
 
 modpath=@STARPU_BUILD_DIR@/src/.libs:
 pypath=@STARPU_BUILD_DIR@/starpupy/src/build:$PYTHONPATH
 
-tstfile=$1
-if test ! -f $tstdir/$tstfile
+examplefile=$1
+if test ! -f $exampledir/$examplefile
 then
-    echo "Error. File $tstdir/$tstfile not found"
+    echo "Error. File $exampledir/$examplefile not found"
     exit 1
 fi
 shift
 
-PYTHONPATH=$pypath LD_LIBRARY_PATH=$modpath @PYTHON@ $tstdir/$tstfile $*
+PYTHONPATH=$pypath LD_LIBRARY_PATH=$modpath @PYTHON@ $exampledir/$examplefile $*
 

starpupy/src/Makefile.am

@@ -16,10 +16,20 @@
 
 SUBDIRS =
 
-all:
+PYTHON_PY_SRC	=	$(wildcard $(top_srcdir)/starpupy/src/*py)
+PYTHON_PY_BUILD	=	$(addprefix $(top_builddir)/starpupy/src/starpu/,$(notdir $(PYTHON_PY_SRC)))
+
+PYTHON_C_SRC	=	$(wildcard $(top_srcdir)/starpupy/src/*c)
+PYTHON_C_BUILD	=	$(addprefix $(top_builddir)/starpupy/src/starpu/,$(notdir $(PYTHON_C_SRC)))
+
+$(top_builddir)/starpupy/src/starpu/%.py: $(abs_top_srcdir)/starpupy/src/%.py
 	$(MKDIR_P) starpu
-	for f in $(top_srcdir)/starpupy/src/starpu/*py ; do cp $$f starpu ; done
-	for f in $(top_srcdir)/starpupy/src/starpu/*c ; do cp $$f starpu ; done
+	$(V_ln) $(LN_S) $< $@
+$(top_builddir)/starpupy/src/starpu/%.c: $(abs_top_srcdir)/starpupy/src/%.c
+	@$(MKDIR_P) starpu
+	$(V_ln) $(LN_S) $< $@
+
+all: $(PYTHON_PY_BUILD) $(PYTHON_C_BUILD)
 	$(PYTHON) setup.py build
 
 install:
@@ -42,9 +52,8 @@ uninstall:
 	rm -rf $(prefix)/lib/python*/site-packages/tmp/starpu*
 
 EXTRA_DIST	=		\
-	starpu/delay.py		\
-	starpu/__init__.py	\
-	starpu/intermedia.py	\
-	starpu/joblib.py	\
-	starpu/starpu_task_wrapper.c
-
+	delay.py		\
+	__init__.py	\
+	intermedia.py	\
+	joblib.py	\
+	starpu_task_wrapper.c

tools/starpu_env.in

@@ -45,6 +45,7 @@ else
 	export LD_LIBRARY_PATH=$starpu_prefix/lib:$LD_LIBRARY_PATH
 	export PATH=$starpu_prefix/bin:$PATH
 	export MANPATH=$starpu_prefix/share/man:$MANPATH
+	for d in $starpu_prefix/lib/@PYTHON@* ; do export PYTHONPATH=$d/site-packages:$PYTHONPATH ; done
     else
 	echo "[Error] $starpu_prefix is not a valid StarPU installation directory"
     fi