reproducibility

commit 0d915f2262a3155cbf1d59131a0a0ab55a0368f2
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date:   Sun Nov 4 01:35:40 2018 +0100

    Avoid exposing STARPU_BUILD_DIR in installed files

    (cherry picked from commit 66846a66ec363332bbfe4883e7bee402848c414f)

commit 66846a66ec363332bbfe4883e7bee402848c414f (HEAD -> master, origin/master, origin/HEAD)
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date:   Sun Nov 4 01:35:40 2018 +0100

    Avoid exposing STARPU_BUILD_DIR in installed files

commit 6195855544e1ae7f97b60ecfc3e3a74fdff479e4
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date:   Sat Nov 10 14:02:13 2018 +0100

    Avoid getting $BASH from the shell (/bin/sh, typically), we prefer to use /bin/bash for reproducibility

Gbp-Pq: Name reproducibility

diff --git a/configure.ac b/configure.ac
index 3de5ea054f35d9b970ebf54beed26b5d0141bf18..7f748856fda11f7faf4fbf8eb94c9481179a0cdd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -99,7 +99,7 @@ AC_HEADER_STDC
 AC_C_RESTRICT
 
 # Check if bash is available
-AC_CHECK_PROGS([BASH], [bash])
+AC_PATH_PROG([REALBASH], [bash], , [/bin:$PATH])
 
 # Record git version
 AC_PATH_PROG(gitcommand, git)

diff --git a/examples/ppm_downscaler/yuv_downscaler.c b/examples/ppm_downscaler/yuv_downscaler.c
index c72c710f48e95c517880f4d7042e2018e2378bf7..1d95176166a33b288ba040ac76f188562e597704 100644 (file)
--- a/examples/ppm_downscaler/yuv_downscaler.c
+++ b/examples/ppm_downscaler/yuv_downscaler.c
@@ -47,11 +47,6 @@ void parse_args(int argc, char **argv)
                strncpy(filename_in, argv[1], 1023);
                strncpy(filename_out, argv[2], 1023);
        }
-       else
-       {
-               snprintf(filename_in, 1024, "%s/examples/ppm_downscaler/%s", STARPU_BUILD_DIR, filename_in_default);
-               snprintf(filename_out, 1024, "%s/examples/ppm_downscaler/%s", STARPU_BUILD_DIR, filename_out_default);
-       }
 }
 
 #define FRAMESIZE      sizeof(struct yuv_frame)

diff --git a/include/starpu_config.h.in b/include/starpu_config.h.in
index 74f950de1db9e302819126113952ebb4b2e386d5..6571d60f001737187a31f774a13daf41d1f788ea 100644 (file)
--- a/include/starpu_config.h.in
+++ b/include/starpu_config.h.in
@@ -58,7 +58,6 @@
 #undef STARPU_MKL
 #undef STARPU_SYSTEM_BLAS
 
-#undef STARPU_BUILD_DIR
 #undef STARPU_OPENCL_DATADIR
 #undef STARPU_HAVE_MAGMA
 

diff --git a/src/drivers/opencl/driver_opencl_utils.c b/src/drivers/opencl/driver_opencl_utils.c
index a9f724766dbc36293a3282b4b069867ca92ccba5..0ed496cfb0391cc5256ac929e539b1f563f63b97 100644 (file)
--- a/src/drivers/opencl/driver_opencl_utils.c
+++ b/src/drivers/opencl/driver_opencl_utils.c
@@ -68,15 +68,6 @@ int _starpu_opencl_locate_file(const char *source_file_name, char **located_file
                        ret = EXIT_SUCCESS;
        }
 
-       if (ret == EXIT_FAILURE)
-       {
-               _STARPU_CALLOC(*located_file_name, 1, strlen(STARPU_SRC_DIR)+1+strlen(source_file_name)+1);
-               sprintf(*located_file_name, "%s/%s", STARPU_SRC_DIR, source_file_name);
-               _STARPU_DEBUG("Trying to locate <%s>\n", *located_file_name);
-               if (access(*located_file_name, R_OK) == 0)
-                       ret = EXIT_SUCCESS;
-       }
-
        if (ret == EXIT_FAILURE)
        {
                _STARPU_CALLOC(*located_file_name, 1, strlen(_STARPU_STRINGIFY(STARPU_OPENCL_DATADIR))+1+strlen(source_file_name)+1);

diff --git a/tests/loader.c b/tests/loader.c
index 542e01d387651d5951b9771f080a9011275283b7..725e9dfaee7f149edd6f64b73e83b39df6a7092d 100644 (file)
--- a/tests/loader.c
+++ b/tests/loader.c
@@ -262,6 +262,8 @@ int main(int argc, char *argv[])
        if (timeout <= 0)
                timeout = DEFAULT_TIMEOUT;
 
+       setenv("STARPU_OPENCL_PROGRAM_DIR", STARPU_SRC_DIR, 1);
+
        /* set SIGALARM handler */
        sa.sa_flags = 0;
        sigemptyset(&sa.sa_mask);

diff --git a/tools/starpu_codelet_profile.in b/tools/starpu_codelet_profile.in
index 86856b50726af8ddac6e120cbe7cab084b9d259a..b4f679e99352bd5251893fc352200ace4fa9edeb 100755 (executable)
--- a/tools/starpu_codelet_profile.in
+++ b/tools/starpu_codelet_profile.in
@@ -1,4 +1,4 @@
-#!@BASH@
+#!@REALBASH@
 # StarPU --- Runtime system for heterogeneous multicore architectures.
 #
 # Copyright (C) 2008-2011,2013-2014                      Université de Bordeaux