Une MAJ de sécurité est nécessaire sur notre version actuelle. Elle sera effectuée lundi 02/08 entre 12h30 et 13h. L'interruption de service devrait durer quelques minutes (probablement moins de 5 minutes).

Commit 1f79c2a7 authored by Mathieu Faverge's avatar Mathieu Faverge
Browse files

Merge branch 'update_morse_cmake' into 'master'

Update morse cmake

and clean env used with the new docker image

See merge request solverstack/chameleon!107
parents 4ec66541 5edf3056
......@@ -5,17 +5,20 @@
# these paths may depend on the runner used, please be careful and add
# the necessary if blocks depending on the machine
. /etc/profile.d/spack.sh
export QUARK_DIR=/builds/install/quark
export PARSEC_DIR=/builds/install/parsec
export STARPU_DIR=/builds/install/starpu
# too noisy
export STARPU_SILENT=1
# if simgrid change the default starpu dir to use
if [ "$1" == "simu" ]; then
export STARPU_DIR=/builds/install/starpu-simgrid
export SIMGRID_DIR=/builds/install/simgrid
export STARPU_DIR=$STARPUSIMGRID_DIR
fi
# for build: better to rely on pkg-config than to guess libraries with the env. var.
export PKG_CONFIG_PATH=$PARSEC_DIR/lib/pkgconfig:$PKG_CONFIG_PATH
export PKG_CONFIG_PATH=$STARPU_DIR/lib/pkgconfig:$PKG_CONFIG_PATH
# for ctest: we need this at runtime
export LD_LIBRARY_PATH=$PARSEC_DIR/lib:$LD_LIBRARY_PATH
export LD_LIBRARY_PATH=$QUARK_DIR/lib:$LD_LIBRARY_PATH
export LD_LIBRARY_PATH=$STARPU_DIR/lib:$LD_LIBRARY_PATH
export LD_LIBRARY_PATH=$SIMGRID_DIR/lib:$LD_LIBRARY_PATH
......@@ -130,6 +130,7 @@ test_starpu_master:
test_starpu_simgrid_branches:
<<: *test_script
variables:
SIMU: simu
TESTS_RESTRICTION: "-R simu"
VERSION: starpu_simgrid
dependencies:
......@@ -149,6 +150,7 @@ test_starpu_simgrid_branches:
test_starpu_simgrid_master:
<<: *test_script
variables:
SIMU: simu
TESTS_RESTRICTION: "-R simu"
VERSION: starpu_simgrid
dependencies:
......
......@@ -430,6 +430,14 @@ if(NOT CHAMELEON_SIMULATION)
endif (CUDA_FOUND)
list(APPEND EXTRA_LIBRARIES ${EXTRA_LIBRARIES_CUDA})
foreach (_lib ${EXTRA_LIBRARIES_CUDA})
if (EXISTS ${_lib})
get_filename_component(libdir ${_lib} PATH)
if (EXISTS ${libdir})
list(APPEND CMAKE_INSTALL_RPATH "${libdir}")
endif()
endif()
endforeach()
endif(CHAMELEON_USE_CUDA)
......@@ -463,6 +471,15 @@ if(NOT CHAMELEON_SIMULATION)
endif()
endif (MPI_C_FOUND)
foreach (_lib ${MPI_C_LIBRARIES})
if (EXISTS ${_lib})
get_filename_component(libdir ${_lib} PATH)
if (EXISTS ${libdir})
list(APPEND CMAKE_INSTALL_RPATH "${libdir}")
endif()
endif()
endforeach()
endif (CHAMELEON_USE_MPI)
else (NOT CHAMELEON_SIMULATION)
......@@ -569,6 +586,15 @@ else (NOT CHAMELEON_SIMULATION)
endif (CHAMELEON_USE_MPI)
foreach (_lib ${SIMGRID_LIBRARIES} ${MPI_C_LIBRARIES})
if (EXISTS ${_lib})
get_filename_component(libdir ${_lib} PATH)
if (EXISTS ${libdir})
list(APPEND CMAKE_INSTALL_RPATH "${libdir}")
endif()
endif()
endforeach()
endif(NOT CHAMELEON_SIMULATION)
......
Subproject commit dd40b792c7f27bd8644e7837b17dbc876f92eec7
Subproject commit f99bada1af8f986d91f651eb9748d0ac6367ef5e
......@@ -4,7 +4,7 @@
*
* @copyright 2009-2015 The University of Tennessee and The University of
* Tennessee Research Foundation. All rights reserved.
* @copyright 2012-2017 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
* @copyright 2012-2018 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
* Univ. Bordeaux. All rights reserved.
*
***
......@@ -21,7 +21,7 @@
#define _CHAMELEON_PARSEC_H_
#include <parsec.h>
#include <parsec/insert_function.h>
#include <parsec/interfaces/superscalar/insert_function.h>
#include <parsec/data_dist/matrix/matrix.h>
/* Undefined PaRSEC definition of BLKLDD */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment