ソースを参照

- makes vector data handle ABI independent of the use or not of the OpenMP runtime support

Olivier Aumage 10 年 前
コミット
40f0f06422
共有2 個のファイルを変更した2 個の追加8 個の削除を含む
  1. 2 4
      include/starpu_data_interfaces.h
  2. 0 4
      src/datawizard/interfaces/vector_interface.c

+ 2 - 4
include/starpu_data_interfaces.h

@@ -248,9 +248,9 @@ struct starpu_vector_interface
 	size_t offset;
 	uint32_t nx;
 	size_t elemsize;
-#ifdef STARPU_OPENMP
+
+	/* vector slice base, used by the StarPU OpenMP runtime support */
 	uint32_t slice_base;
-#endif /* STARPU_OPENMP */
 };
 
 void starpu_vector_data_register(starpu_data_handle_t *handle, unsigned home_node, uintptr_t ptr, uint32_t nx, size_t elemsize);
@@ -264,9 +264,7 @@ uintptr_t starpu_vector_get_local_ptr(starpu_data_handle_t handle);
 #define STARPU_VECTOR_GET_OFFSET(interface)	(((struct starpu_vector_interface *)(interface))->offset)
 #define STARPU_VECTOR_GET_NX(interface)	(((struct starpu_vector_interface *)(interface))->nx)
 #define STARPU_VECTOR_GET_ELEMSIZE(interface)	(((struct starpu_vector_interface *)(interface))->elemsize)
-#ifdef STARPU_OPENMP
 #define STARPU_VECTOR_GET_SLICE_BASE(interface)	(((struct starpu_vector_interface *)(interface))->slice_base)
-#endif /* STARPU_OPENMP */
 
 struct starpu_variable_interface
 {

+ 0 - 4
src/datawizard/interfaces/vector_interface.c

@@ -100,9 +100,7 @@ static void register_vector_handle(starpu_data_handle_t handle, unsigned home_no
 		local_interface->id = vector_interface->id;
 		local_interface->nx = vector_interface->nx;
 		local_interface->elemsize = vector_interface->elemsize;
-#ifdef STARPU_OPENMP
 		local_interface->slice_base = vector_interface->slice_base;
-#endif /* STARPU_OPENMP */
 	}
 }
 
@@ -117,9 +115,7 @@ void starpu_vector_data_register(starpu_data_handle_t *handleptr, unsigned home_
 		.nx = nx,
 		.elemsize = elemsize,
                 .dev_handle = ptr,
-#ifdef STARPU_OPENMP
 		.slice_base = 0,
-#endif /* STARPU_OPENMP */
                 .offset = 0
 	};