Bläddra i källkod

Merge branch 'master' into starpurm

Nathalie Furmento 6 år sedan
förälder
incheckning
8d2d26c374

+ 1 - 1
configure.ac

@@ -470,7 +470,7 @@ AC_SUBST(CC_OR_MPICC, $cc_or_mpicc)
 if test x$use_mpi = xyes -a x$enable_nmad = xyes ; then
     build_nmad_lib=yes
     enable_mpi=no
-    PKG_CHECK_MODULES([NMAD],[nmad pioman tbx])
+    PKG_CHECK_MODULES([NMAD],[nmad])
 else
     build_nmad_lib=no
 fi

+ 1 - 1
examples/basic_examples/task_insert_color.c

@@ -43,7 +43,7 @@ struct starpu_codelet mycodelet_color =
 	.color = 0x0000FF,
 };
 
-int main(int argc, char **argv)
+int main(void)
 {
 	unsigned i;
 	int value=42;

+ 3 - 2
examples/interface/complex_interface.c

@@ -1,8 +1,8 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
  * Copyright (C) 2012-2013                                Inria
- * Copyright (C) 2012-2015,2017                           CNRS
- * Copyright (C) 2013-2015, 2018                                Université de Bordeaux
+ * Copyright (C) 2012-2015,2017,2018                      CNRS
+ * Copyright (C) 2013-2015, 2018                          Université de Bordeaux
  *
  * 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
@@ -22,6 +22,7 @@
 
 static int complex_pointer_is_inside(void *data_interface, unsigned node, void *ptr)
 {
+	(void)node;
 	struct starpu_complex_interface *complex_interface = data_interface;
 
 	return ((char*) ptr >= (char*) &complex_interface->real &&

+ 2 - 0
mpi/src/mpi/starpu_mpi_mpi.c

@@ -132,11 +132,13 @@ void _starpu_mpi_submit_ready_request_inc(struct _starpu_mpi_req *req)
 
 void _starpu_mpi_coop_sends_build_tree(struct _starpu_mpi_coop_sends *coop_sends)
 {
+	(void)coop_sends;
 	/* TODO: turn them into redirects & forwards */
 }
 
 void _starpu_mpi_submit_coop_sends(struct _starpu_mpi_coop_sends *coop_sends, int submit_control, int submit_data)
 {
+	(void)submit_control;
 	unsigned i, n = coop_sends->n;
 
 	/* Note: coop_sends might disappear very very soon after last request is submitted */

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 18 - 2482
tools/dev/valgrind/hwloc.suppr


+ 7 - 20
tools/dev/valgrind/libgomp.suppr

@@ -1,6 +1,6 @@
 # StarPU --- Runtime system for heterogeneous multicore architectures.
 #
-# Copyright (C) 2015-2017                                CNRS
+# Copyright (C) 2015-2018                                CNRS
 #
 # 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
@@ -15,30 +15,17 @@
 #
 
 {
-   gomp1
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   obj:/usr/lib/x86_64-linux-gnu/libgomp.so.1.0.0
-   obj:/usr/lib/x86_64-linux-gnu/libgomp.so.1.0.0
-   obj:/usr/lib/x86_64-linux-gnu/libgomp.so.1.0.0
-   fun:call_init.part.0
-   fun:call_init
-   fun:_dl_init
-   obj:/lib/x86_64-linux-gnu/ld-2.19.so
-}
-
-{
    gomp2
    Memcheck:Leak
    match-leak-kinds: reachable
    fun:malloc
-   obj:/usr/lib/x86_64-linux-gnu/libgomp.so.1.0.0
-   obj:/usr/lib/x86_64-linux-gnu/libgomp.so.1.0.0
-   obj:/usr/lib/x86_64-linux-gnu/libgomp.so.1.0.0
+   fun:gomp_malloc
+   fun:gomp_init_num_threads
+   fun:initialize_env
    fun:call_init.part.0
+   fun:call_init
    fun:_dl_init
-   obj:/lib/x86_64-linux-gnu/ld-2.21.so
+   ...
 }
 
 {
@@ -49,5 +36,5 @@
    obj:/usr/lib/x86_64-linux-gnu/libstdc++.so.6.0.21
    fun:call_init.part.0
    fun:_dl_init
-   obj:/lib/x86_64-linux-gnu/ld-2.21.so
+   ...
 }

+ 22 - 22
tools/dev/valgrind/opencl.suppr

@@ -1,7 +1,7 @@
 # StarPU --- Runtime system for heterogeneous multicore architectures.
 #
 # Copyright (C) 2016-2017                                CNRS
-# Copyright (C) 2016                                     Université de Bordeaux
+# Copyright (C) 2016, 2018                                     Université de Bordeaux
 #
 # 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
@@ -24,7 +24,7 @@
    obj:/usr/lib/x86_64-linux-gnu/libOpenCL.so.1.0.0
    fun:call_init.part.0
    fun:_dl_init
-   obj:/lib/x86_64-linux-gnu/ld-2.21.so
+   ...
 }
 {
    <insert_a_suppression_name_here>
@@ -41,7 +41,7 @@
    obj:/usr/lib/x86_64-linux-gnu/libOpenCL.so.1.0.0
    fun:call_init.part.0
    fun:_dl_init
-   obj:/lib/x86_64-linux-gnu/ld-2.21.so
+   ...
 }
 {
    <insert_a_suppression_name_here>
@@ -83,7 +83,7 @@
    obj:/usr/lib/x86_64-linux-gnu/libOpenCL.so.1.0.0
    fun:call_init.part.0
    fun:_dl_init
-   obj:/lib/x86_64-linux-gnu/ld-2.21.so
+   ...
 }
 
 {
@@ -94,7 +94,7 @@
    obj:/usr/lib/x86_64-linux-gnu/libOpenCL.so.1.0.0
    fun:call_init.part.0
    fun:_dl_init
-   obj:/lib/x86_64-linux-gnu/ld-2.21.so
+   ...
 }
 {
    <insert_a_suppression_name_here>
@@ -111,7 +111,7 @@
    obj:/usr/lib/x86_64-linux-gnu/libOpenCL.so.1.0.0
    fun:call_init.part.0
    fun:_dl_init
-   obj:/lib/x86_64-linux-gnu/ld-2.21.so
+   ...
 }
 {
    <insert_a_suppression_name_here>
@@ -121,7 +121,7 @@
    obj:/usr/lib/x86_64-linux-gnu/libOpenCL.so.1.0.0
    fun:call_init.part.0
    fun:_dl_init
-   obj:/lib/x86_64-linux-gnu/ld-2.21.so
+   ...
 }
 {
    <insert_a_suppression_name_here>
@@ -151,7 +151,7 @@
    obj:/usr/lib/x86_64-linux-gnu/libOpenCL.so.1.0.0
    fun:call_init.part.0
    fun:_dl_init
-   obj:/lib/x86_64-linux-gnu/ld-2.21.so
+   ...
 }
 {
    <insert_a_suppression_name_here>
@@ -168,7 +168,7 @@
    obj:/usr/lib/x86_64-linux-gnu/libOpenCL.so.1.0.0
    fun:call_init.part.0
    fun:_dl_init
-   obj:/lib/x86_64-linux-gnu/ld-2.21.so
+   ...
 }
 {
    <insert_a_suppression_name_here>
@@ -199,7 +199,7 @@
    obj:/usr/lib/x86_64-linux-gnu/libOpenCL.so.1.0.0
    fun:call_init.part.0
    fun:_dl_init
-   obj:/lib/x86_64-linux-gnu/ld-2.21.so
+   ...
 }
 {
    <insert_a_suppression_name_here>
@@ -214,7 +214,7 @@
    obj:/usr/lib/x86_64-linux-gnu/libOpenCL.so.1.0.0
    fun:call_init.part.0
    fun:_dl_init
-   obj:/lib/x86_64-linux-gnu/ld-2.21.so
+   ...
 }
 {
    <insert_a_suppression_name_here>
@@ -230,7 +230,7 @@
    obj:/usr/lib/x86_64-linux-gnu/libOpenCL.so.1.0.0
    fun:call_init.part.0
    fun:_dl_init
-   obj:/lib/x86_64-linux-gnu/ld-2.21.so
+   ...
 }
 {
    <insert_a_suppression_name_here>
@@ -244,7 +244,7 @@
    obj:/usr/lib/x86_64-linux-gnu/libOpenCL.so.1.0.0
    fun:call_init.part.0
    fun:_dl_init
-   obj:/lib/x86_64-linux-gnu/ld-2.21.so
+   ...
 }
 {
    <insert_a_suppression_name_here>
@@ -260,7 +260,7 @@
    obj:/usr/lib/x86_64-linux-gnu/libOpenCL.so.1.0.0
    fun:call_init.part.0
    fun:_dl_init
-   obj:/lib/x86_64-linux-gnu/ld-2.21.so
+   ...
 }
 {
    <insert_a_suppression_name_here>
@@ -307,7 +307,7 @@
    obj:/usr/lib/x86_64-linux-gnu/libOpenCL.so.1.0.0
    fun:call_init.part.0
    fun:_dl_init
-   obj:/lib/x86_64-linux-gnu/ld-2.21.so
+   ...
 }
 {
    <insert_a_suppression_name_here>
@@ -392,7 +392,7 @@
    obj:/usr/lib/x86_64-linux-gnu/libOpenCL.so.1.0.0
    fun:call_init.part.0
    fun:_dl_init
-   obj:/lib/x86_64-linux-gnu/ld-2.21.so
+   ...
 }
 {
    <insert_a_suppression_name_here>
@@ -409,7 +409,7 @@
    obj:/usr/lib/x86_64-linux-gnu/libOpenCL.so.1.0.0
    fun:call_init.part.0
    fun:_dl_init
-   obj:/lib/x86_64-linux-gnu/ld-2.21.so
+   ...
 }
 {
    <insert_a_suppression_name_here>
@@ -426,7 +426,7 @@
    obj:/usr/lib/x86_64-linux-gnu/libOpenCL.so.1.0.0
    fun:call_init.part.0
    fun:_dl_init
-   obj:/lib/x86_64-linux-gnu/ld-2.21.so
+   ...
 }
 {
    <insert_a_suppression_name_here>
@@ -441,7 +441,7 @@
    obj:/usr/lib/x86_64-linux-gnu/libOpenCL.so.1.0.0
    fun:call_init.part.0
    fun:_dl_init
-   obj:/lib/x86_64-linux-gnu/ld-2.21.so
+   ...
 }
 {
    <insert_a_suppression_name_here>
@@ -501,7 +501,7 @@
    obj:/usr/lib/x86_64-linux-gnu/libOpenCL.so.1.0.0
    fun:call_init.part.0
    fun:_dl_init
-   obj:/lib/x86_64-linux-gnu/ld-2.21.so
+   ...
 }
 {
    <insert_a_suppression_name_here>
@@ -548,7 +548,7 @@
    obj:/usr/lib/x86_64-linux-gnu/libOpenCL.so.1.0.0
    fun:call_init.part.0
    fun:_dl_init
-   obj:/lib/x86_64-linux-gnu/ld-2.21.so
+   ...
 }
 {
    <insert_a_suppression_name_here>
@@ -612,7 +612,7 @@
    obj:/usr/lib/x86_64-linux-gnu/libOpenCL.so.1.0.0
    fun:call_init.part.0
    fun:_dl_init
-   obj:/lib/x86_64-linux-gnu/ld-2.21.so
+   ...
 }
 {
    <insert_a_suppression_name_here>

+ 1 - 1
tools/dev/valgrind/padico.suppr

@@ -92,7 +92,7 @@
    fun:puk_mod_builtin_declare
    fun:call_init.part.0
    fun:_dl_init
-   obj:/lib/x86_64-linux-gnu/ld-2.21.so
+   ...
 }
 {
    <insert_a_suppression_name_here>

+ 47 - 1
tools/dev/valgrind/valgrind.suppr

@@ -1,6 +1,6 @@
 # StarPU --- Runtime system for heterogeneous multicore architectures.
 #
-# Copyright (C) 2016-2017                                CNRS
+# Copyright (C) 2016-2018                                CNRS
 # Copyright (C) 2017                                     Inria
 #
 # StarPU is free software; you can redistribute it and/or modify
@@ -35,3 +35,49 @@
    ...
 }
 
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Free
+   fun:free
+   obj:/bin/bash
+   fun:run_unwind_frame
+   fun:parse_and_execute
+   obj:/bin/bash
+   fun:source_file
+   fun:source_builtin
+   obj:/bin/bash
+   obj:/bin/bash
+   fun:execute_command_internal
+   fun:execute_command
+   fun:reader_loop
+   fun:main
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Free
+   fun:free
+   obj:/bin/bash
+   fun:run_unwind_frame
+   fun:parse_and_execute
+   fun:command_substitute
+   obj:/bin/bash
+   obj:/bin/bash
+   fun:expand_string_assignment
+   obj:/bin/bash
+   obj:/bin/bash
+   obj:/bin/bash
+   obj:/bin/bash
+   fun:execute_command_internal
+   fun:parse_and_execute
+   obj:/bin/bash
+   fun:source_file
+   fun:source_builtin
+   obj:/bin/bash
+   obj:/bin/bash
+   fun:execute_command_internal
+   fun:execute_command
+   fun:reader_loop
+   fun:main
+}