Browse Source

Fix build without hwloc

Samuel Thibault 6 years ago
parent
commit
ff01a9b1f2
2 changed files with 5 additions and 2 deletions
  1. 3 2
      src/Makefile.am
  2. 2 0
      src/core/sched_policy.c

+ 3 - 2
src/Makefile.am

@@ -291,7 +291,6 @@ libstarpu_@STARPU_EFFECTIVE_VERSION@_la_SOURCES = 		\
 	sched_policies/component_perfmodel_select.c				\
 	sched_policies/component_composed.c				\
 	sched_policies/component_work_stealing.c				\
-	sched_policies/scheduler_maker.c			\
 	sched_policies/modular_eager.c				\
 	sched_policies/modular_eager_prefetching.c				\
 	sched_policies/modular_gemm.c				\
@@ -303,7 +302,6 @@ libstarpu_@STARPU_EFFECTIVE_VERSION@_la_SOURCES = 		\
 	sched_policies/modular_heft_prio.c			\
 	sched_policies/modular_heft2.c				\
 	sched_policies/modular_ws.c				\
-	sched_policies/hierarchical_heft.c			\
 	sched_policies/modular_ez.c
 
 
@@ -352,6 +350,9 @@ endif
 
 
 if STARPU_HAVE_HWLOC
+libstarpu_@STARPU_EFFECTIVE_VERSION@_la_SOURCES += \
+	sched_policies/scheduler_maker.c			\
+	sched_policies/hierarchical_heft.c
 if STARPU_HWLOC_HAVE_TOPOLOGY_DUP
 if STARPU_HAVE_OPENMP
 libstarpu_@STARPU_EFFECTIVE_VERSION@_la_SOURCES += util/starpu_clusters_create.c

+ 2 - 0
src/core/sched_policy.c

@@ -81,7 +81,9 @@ static struct starpu_sched_policy *predefined_policies[] =
 	&_starpu_sched_peager_policy,
 	&_starpu_sched_heteroprio_policy,
 	&_starpu_sched_graph_test_policy,
+#ifdef STARPU_HAVE_HWLOC
 	//&_starpu_sched_tree_heft_hierarchical_policy,
+#endif
 	NULL
 };