Browse Source

Add missing fxt flags when fxt is not in the system search path

Samuel Thibault 4 years ago
parent
commit
edd025cde1
2 changed files with 36 additions and 2 deletions
  1. 3 1
      mpi/tests/Makefile.am
  2. 33 1
      tests/Makefile.am

+ 3 - 1
mpi/tests/Makefile.am

@@ -1,6 +1,6 @@
 # StarPU --- Runtime system for heterogeneous multicore architectures.
 #
-# Copyright (C) 2009-2020  Université de Bordeaux, CNRS (LaBRI UMR 5800), Inria
+# Copyright (C) 2009-2021  Université de Bordeaux, CNRS (LaBRI UMR 5800), Inria
 # Copyright (C) 2013       Thibaut Lambert
 #
 # StarPU is free software; you can redistribute it and/or modify
@@ -261,3 +261,5 @@ mpi_earlyrecv2_SOURCES = mpi_earlyrecv2.c
 mpi_earlyrecv2_SOURCES += ../../examples/interface/complex_interface.c
 mpi_earlyrecv2_sync_SOURCES = mpi_earlyrecv2_sync.c
 mpi_earlyrecv2_sync_SOURCES += ../../examples/interface/complex_interface.c
+
+early_stuff_CFLAGS = $(AM_CFLAGS) $(FXT_CFLAGS)

+ 33 - 1
tests/Makefile.am

@@ -1,6 +1,6 @@
 # StarPU --- Runtime system for heterogeneous multicore architectures.
 #
-# Copyright (C) 2009-2020  Université de Bordeaux, CNRS (LaBRI UMR 5800), Inria
+# Copyright (C) 2009-2021  Université de Bordeaux, CNRS (LaBRI UMR 5800), Inria
 #
 # StarPU is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
@@ -651,6 +651,8 @@ endif
 datawizard_test_arbiter_SOURCES =	\
 	datawizard/test_arbiter.cpp
 
+main_starpu_worker_exists_CFLAGS = $(AM_CFLAGS) $(FXT_CFLAGS)
+
 main_deprecated_func_CFLAGS = $(AM_CFLAGS) -Wno-deprecated-declarations
 
 main_insert_task_where_SOURCES =		\
@@ -828,6 +830,10 @@ helper_starpu_data_dup_ro_SOURCES +=		\
 	main/increment.cu
 endif
 
+datawizard_interfaces_copy_interfaces_CFLAGS = $(AM_CFLAGS) $(FXT_CFLAGS)
+
+datawizard_data_register_CFLAGS = $(AM_CFLAGS) $(FXT_CFLAGS)
+
 ###################
 # Block interface #
 ###################
@@ -835,6 +841,8 @@ datawizard_interfaces_block_block_interface_SOURCES= \
 	datawizard/interfaces/test_interfaces.c  \
 	datawizard/interfaces/block/block_interface.c
 
+datawizard_interfaces_block_block_interface_CFLAGS = $(AM_CFLAGS) $(FXT_CFLAGS)
+
 if STARPU_USE_CUDA
 datawizard_interfaces_block_block_interface_SOURCES+= \
 	datawizard/interfaces/block/block_cuda.cu
@@ -854,6 +862,8 @@ datawizard_interfaces_tensor_tensor_interface_SOURCES= \
 	datawizard/interfaces/test_interfaces.c  \
 	datawizard/interfaces/tensor/tensor_interface.c
 
+datawizard_interfaces_tensor_tensor_interface_CFLAGS = $(AM_CFLAGS) $(FXT_CFLAGS)
+
 if STARPU_USE_CUDA
 datawizard_interfaces_tensor_tensor_interface_SOURCES+= \
 	datawizard/interfaces/tensor/tensor_cuda.cu
@@ -873,6 +883,8 @@ datawizard_interfaces_bcsr_bcsr_interface_SOURCES= \
 	datawizard/interfaces/test_interfaces.c \
 	datawizard/interfaces/bcsr/bcsr_interface.c
 
+datawizard_interfaces_bcsr_bcsr_interface_CFLAGS = $(AM_CFLAGS) $(FXT_CFLAGS)
+
 if STARPU_USE_CUDA
 datawizard_interfaces_bcsr_bcsr_interface_SOURCES+= \
 	datawizard/interfaces/bcsr/bcsr_cuda.cu
@@ -892,6 +904,8 @@ datawizard_interfaces_coo_coo_interface_SOURCES= \
 	datawizard/interfaces/test_interfaces.c \
 	datawizard/interfaces/coo/coo_interface.c
 
+datawizard_interfaces_coo_coo_interface_CFLAGS = $(AM_CFLAGS) $(FXT_CFLAGS)
+
 if STARPU_USE_CUDA
 datawizard_interfaces_coo_coo_interface_SOURCES+= \
 	datawizard/interfaces/coo/coo_cuda.cu
@@ -911,6 +925,8 @@ datawizard_interfaces_csr_csr_interface_SOURCES= \
 	datawizard/interfaces/test_interfaces.c  \
 	datawizard/interfaces/csr/csr_interface.c
 
+datawizard_interfaces_csr_csr_interface_CFLAGS = $(AM_CFLAGS) $(FXT_CFLAGS)
+
 if STARPU_USE_CUDA
 datawizard_interfaces_csr_csr_interface_SOURCES+= \
 	datawizard/interfaces/csr/csr_cuda.cu
@@ -924,10 +940,15 @@ nobase_STARPU_OPENCL_DATA_DATA += \
 endif
 
 
+####################
+# Vector interface #
+####################
 datawizard_interfaces_vector_vector_interface_SOURCES =               \
 	datawizard/interfaces/vector/vector_interface.c               \
 	datawizard/interfaces/test_interfaces.c
 
+datawizard_interfaces_vector_vector_interface_CFLAGS = $(AM_CFLAGS) $(FXT_CFLAGS)
+
 if STARPU_USE_CUDA
 datawizard_interfaces_vector_vector_interface_SOURCES +=               \
 	datawizard/interfaces/vector/vector_cuda.cu
@@ -947,6 +968,8 @@ datawizard_interfaces_matrix_matrix_interface_SOURCES= \
 	datawizard/interfaces/test_interfaces.c        \
 	datawizard/interfaces/matrix/matrix_interface.c
 
+datawizard_interfaces_matrix_matrix_interface_CFLAGS = $(AM_CFLAGS) $(FXT_CFLAGS)
+
 if STARPU_USE_CUDA
 datawizard_interfaces_matrix_matrix_interface_SOURCES+= \
 	datawizard/interfaces/matrix/matrix_cuda.cu
@@ -968,6 +991,8 @@ datawizard_interfaces_multiformat_multiformat_interface_SOURCES =           \
 	datawizard/interfaces/multiformat/multiformat_interface.c           \
 	datawizard/interfaces/multiformat/multiformat_conversion_codelets.c
 
+datawizard_interfaces_multiformat_multiformat_interface_CFLAGS = $(AM_CFLAGS) $(FXT_CFLAGS)
+
 if STARPU_USE_CUDA
 datawizard_interfaces_multiformat_multiformat_interface_SOURCES+=                  \
 	datawizard/interfaces/multiformat/multiformat_cuda.cu                      \
@@ -1004,10 +1029,15 @@ datawizard_interfaces_multiformat_advanced_same_handle_SOURCES= \
 	datawizard/interfaces/multiformat/advanced/same_handle.c
 
 
+######################
+# Variable interface #
+######################
 datawizard_interfaces_variable_variable_interface_SOURCES=   \
 	datawizard/interfaces/test_interfaces.c              \
 	datawizard/interfaces/variable/variable_interface.c
 
+datawizard_interfaces_variable_variable_interface_CFLAGS = $(AM_CFLAGS) $(FXT_CFLAGS)
+
 if STARPU_USE_CUDA
 datawizard_interfaces_variable_variable_interface_SOURCES+= \
 	datawizard/interfaces/variable/variable_cuda.cu
@@ -1027,6 +1057,7 @@ datawizard_interfaces_void_void_interface_SOURCES=\
 	datawizard/interfaces/test_interfaces.c        \
 	datawizard/interfaces/void/void_interface.c
 
+datawizard_interfaces_void_void_interface_CFLAGS = $(AM_CFLAGS) $(FXT_CFLAGS)
 
 overlap_gpu_concurrency_SOURCES=\
 	overlap/gpu_concurrency.c
@@ -1097,6 +1128,7 @@ perfmodels_feed_SOURCES=\
 	perfmodels/feed.c
 
 sched_policies_execute_all_tasks_LDFLAGS = $(AM_LDFLAGS) -lm
+sched_policies_execute_all_tasks_CFLAGS = $(AM_LDFLAGS) $(FXT_CFLAGS)
 
 # Fortran90 tests