new commit

.gitignore

@@ -24,6 +24,7 @@
 .dirstamp
 .tramp_history
 *.pc
+*.vim
 stamp-h[0-9]*
 starpu.log
 /tests/datawizard/handle_to_pointer

Makefile.am

@@ -109,7 +109,9 @@ versinclude_HEADERS = 				\
 	include/starpu_simgrid_wrap.h		\
 	include/starpu_mod.f90			\
 	include/fstarpu_mod.f90			\
-	include/starpu_clusters.h
+	include/starpu_clusters.h		\
+	include/starpu_perf_monitoring.h	\
+	include/starpu_perf_steering.h
 
 nodist_versinclude_HEADERS = 			\
 	include/starpu_config.h

build_starpu/config.status

@@ -432,7 +432,11 @@ $config_commands
 Report bugs to <starpu-devel@lists.gforge.inria.fr>.
 StarPU home page: <http://runtime.bordeaux.inria.fr/StarPU/>."
 
+<<<<<<< HEAD
 ac_cs_config="'--prefix=/home/jusers/makni1/jumax/makni1/starpu.git/build_starpu/../install' '--with-fpga' '--disable-link-with-riffa' '--disable-build-doc'"
+=======
+ac_cs_config="'--prefix=/home/jusers/makni1/jumax/makni1/starpu.git/build_starpu/../install' '--with-fpga' '--disable-link-with-riffa' '--disable-build-doc' '--with-hwloc=/home/jusers/makni1/jumax/hwloc-2.0.3/install'"
+>>>>>>> 8e2d401663e25038bae3c01c68fb544e638ec51c
 ac_cs_version="\
 StarPU config.status 1.3.99
 configured by ../configure, generated by GNU Autoconf 2.69,
@@ -524,7 +528,11 @@ if $ac_cs_silent; then
 fi
 
 if $ac_cs_recheck; then
+<<<<<<< HEAD
   set X /bin/sh '../configure'  '--prefix=/home/jusers/makni1/jumax/makni1/starpu.git/build_starpu/../install' '--with-fpga' '--disable-link-with-riffa' '--disable-build-doc' $ac_configure_extra_args --no-create --no-recursion
+=======
+  set X /bin/sh '../configure'  '--prefix=/home/jusers/makni1/jumax/makni1/starpu.git/build_starpu/../install' '--with-fpga' '--disable-link-with-riffa' '--disable-build-doc' '--with-hwloc=/home/jusers/makni1/jumax/hwloc-2.0.3/install' $ac_configure_extra_args --no-create --no-recursion
+>>>>>>> 8e2d401663e25038bae3c01c68fb544e638ec51c
   shift
   $as_echo "running CONFIG_SHELL=/bin/sh $*" >&6
   CONFIG_SHELL='/bin/sh'
@@ -1060,7 +1068,11 @@ S["STARPU_SANITIZE_TRUE"]="#"
 S["SOCL_VENDORS"]="vendors/install/socl.icd"
 S["STARPU_EXPORTED_LIBS"]=""
 S["LIBSTARPU_LINK"]="libstarpu-1.3.la"
+<<<<<<< HEAD
 S["LIBSTARPU_LDFLAGS"]="  -lhwloc             -lblas   "
+=======
+S["LIBSTARPU_LDFLAGS"]="  -L/home/jusers/makni1/jumax/hwloc-2.0.3/install/lib -lhwloc             -lblas   "
+>>>>>>> 8e2d401663e25038bae3c01c68fb544e638ec51c
 S["AVAILABLE_DOC_FALSE"]=""
 S["AVAILABLE_DOC_TRUE"]="#"
 S["BUILD_DOC_FALSE"]=""
@@ -1093,8 +1105,13 @@ S["STARPU_HWLOC_HAVE_TOPOLOGY_DUP_TRUE"]=""
 S["STARPU_HAVE_HWLOC"]="1"
 S["STARPU_HAVE_HWLOC_FALSE"]="#"
 S["STARPU_HAVE_HWLOC_TRUE"]=""
+<<<<<<< HEAD
 S["HWLOC_LIBS"]="-lhwloc  "
 S["HWLOC_CFLAGS"]=" "
+=======
+S["HWLOC_LIBS"]="-L/home/jusers/makni1/jumax/hwloc-2.0.3/install/lib -lhwloc  "
+S["HWLOC_CFLAGS"]="-I/home/jusers/makni1/jumax/hwloc-2.0.3/install/include  "
+>>>>>>> 8e2d401663e25038bae3c01c68fb544e638ec51c
 S["BUILD_STARPUFFT_EXAMPLES_FALSE"]=""
 S["BUILD_STARPUFFT_EXAMPLES_TRUE"]="#"
 S["BUILD_STARPUFFT_FALSE"]="#"

build_starpu/doc/doxygen/doxygen-config.cfg

@@ -26,7 +26,10 @@ INPUT                  = ../../../doc/doxygen/chapters \
 	 		 ../../../include/starpu_clusters.h \
 			 ../../../include/starpu_cusparse.h \
 			 ../../../include/starpu_cublas.h \
+<<<<<<< HEAD
 			 ../../../include/starpu_cublas_v2.h \
+=======
+>>>>>>> 8e2d401663e25038bae3c01c68fb544e638ec51c
 			 ../../../include/starpu_cuda.h \
 			 ../../../include/starpu_data_filters.h \
 			 ../../../include/starpu_data.h \
@@ -40,12 +43,18 @@ INPUT                  = ../../../doc/doxygen/chapters \
 			 ../../../include/starpu_hash.h \
 			 ../../../include/starpu_helper.h \
 			 ../../../include/starpu_mic.h \
+<<<<<<< HEAD
 			 ../../../include/starpu_mpi_ms.h \
 			 ../../../include/starpu_mod.f90 \
 			 ../../../include/starpu_opencl.h \
 			 ../../../include/starpu_openmp.h \
 			 ../../../include/starpu_perf_monitoring.h \
 			 ../../../include/starpu_perf_steering.h \
+=======
+			 ../../../include/starpu_mod.f90 \
+			 ../../../include/starpu_opencl.h \
+			 ../../../include/starpu_openmp.h \
+>>>>>>> 8e2d401663e25038bae3c01c68fb544e638ec51c
 			 ../../../include/starpu_perfmodel.h \
 			 ../../../include/starpu_profiling.h \
 			 ../../../include/starpu_rand.h \
@@ -73,6 +82,7 @@ INPUT                  = ../../../doc/doxygen/chapters \
 			 ../../../mpi/include/fstarpu_mpi_mod.f90 \
 			 ../../../starpufft/include/starpufft.h \
 			 ../../../sc_hypervisor/include \
+<<<<<<< HEAD
 			 ../../../sc_hypervisor/include/sc_hypervisor_config.h \
 			 ../../../sc_hypervisor/include/sc_hypervisor_policy.h \
 			 ../../../sc_hypervisor/include/sc_hypervisor_lp.h  \
@@ -80,6 +90,9 @@ INPUT                  = ../../../doc/doxygen/chapters \
 			 ../../../sc_hypervisor/include/sc_hypervisor_monitoring.h \
 			 ../../../starpurm/include/starpurm.h \
 			 ../../../include/schedulers/starpu_heteroprio.h
+=======
+			 ../../../starpurm/include/starpurm.h
+>>>>>>> 8e2d401663e25038bae3c01c68fb544e638ec51c
 
 EXAMPLE_PATH           = ../../../doc/doxygen \
 		       	 ../../../doc/doxygen/chapters \

build_starpu/include/starpu_config.h

@@ -2,7 +2,11 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
  * Copyright (C) 2011,2012,2014,2016,2017                 Inria
+<<<<<<< HEAD
  * Copyright (C) 2009-2019                                Université de Bordeaux
+=======
+ * Copyright (C) 2009-2018                                Université de Bordeaux
+>>>>>>> 8e2d401663e25038bae3c01c68fb544e638ec51c
  * Copyright (C) 2010-2017,2019                           CNRS
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -44,11 +48,14 @@
 /* #undef STARPU_SIMGRID_MC */
 /* #undef STARPU_SIMGRID_HAVE_XBT_BARRIER_INIT */
 /* #undef STARPU_HAVE_SIMGRID_MSG_H */
+<<<<<<< HEAD
 /* #undef STARPU_HAVE_SIMGRID_ACTOR_H */
 /* #undef STARPU_HAVE_SIMGRID_SEMAPHORE_H */
 /* #undef STARPU_HAVE_SIMGRID_MUTEX_H */
 /* #undef STARPU_HAVE_SIMGRID_COND_H */
 /* #undef STARPU_HAVE_SIMGRID_BARRIER_H */
+=======
+>>>>>>> 8e2d401663e25038bae3c01c68fb544e638ec51c
 /* #undef STARPU_HAVE_XBT_SYNCHRO_H */
 /* #undef STARPU_HAVE_VALGRIND_H */
 /* #undef STARPU_HAVE_MEMCHECK_H */