diff --git a/CMakeLists.txt b/CMakeLists.txt index b5ea70886363d9129ec67bc51367e725ce85ac57..aea450b727ce0b3ef95481a143956100d2c44952 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1121,9 +1121,18 @@ generate_pkgconfig_file() ################## set(CPACK_SOURCE_GENERATOR "TGZ") set(CPACK_PACKAGE_NAME "chameleon") -set(CPACK_PACKAGE_VERSION "${CHAMELEON_VERSION_MAJOR}.${CHAMELEON_VERSION_MINOR}.${CHAMELEON_VERSION_MICRO}") +set(CPACK_PACKAGE_DESCRIPTION_FILE ${CMAKE_CURRENT_SOURCE_DIR}/README.md) +set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Chameleon is a C library providing parallel algorithms to perform BLAS/LAPACK " + " operations exploiting fully modern architectures.") +set(CHAMELEON_VERSION_PATCH ${CHAMELEON_VERSION_MICRO}) +set(CPACK_PACKAGE_VERSION "${CHAMELEON_VERSION_MAJOR}.${CHAMELEON_VERSION_MINOR}.${CHAMELEON_VERSION_PATCH}") set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}") -set(CPACK_SOURCE_IGNORE_FILES "build;.cproject;.dir-locals.el;.project;.pydevproject;.svn") +set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}") +set(CPACK_PACKAGE_VENDOR "Inria") +set(CPACK_PACKAGE_CONTACT "morse-devel@lists.gforge.inria.fr") +set(CPACK_RESOURCE_FILE_README ${CMAKE_CURRENT_SOURCE_DIR}/README.md) +set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_CURRENT_SOURCE_DIR}/LICENCE.txt) +set(CPACK_SOURCE_IGNORE_FILES "plasma-conversion;build;.cproject;.settings;.dir-locals.el;.project;.pydevproject;.svn;.git;.gitmodules;.gitlab-ci.yml") include(CPack) ############################################################################### diff --git a/INSTALL.txt b/INSTALL.txt index c119fe9c8526cf70dbc72de0d2963bd253b04ebc..9470afb3ccb637bdbd7f873e39d610116cf23c5f 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -1,6 +1,6 @@ -********************************************** - Some instructions about CHAMELEON usage -********************************************** +**************************************************** + Some instructions about CHAMELEON installation +**************************************************** This is a brief discussion about CHAMELEON usage. For more information, please read the document users_guide. @@ -31,12 +31,11 @@ example : cmake /home/toto/chameleon -DCMAKE_INSTALL_PREFIX=/home/toto/install threads : pthread -blas : refblas (http://www.netlib.org/blas/) or intel mkl -cblas : refblas (http://www.netlib.org/blas/#_cblas) or intel mkl -lapack : refblas (http://www.netlib.org/lapack/) or intel mkl -lapacke : refblas (http://www.netlib.org/lapack/#_standard_c_language_apis_for_lapack) - or the lapacke compiled in PLASMA project (http://icl.cs.utk.edu/plasma/) -tmg : refblas (contained in lapack) or intel mkl +blas : netlib, openblas, eigen or intel mkl +cblas : netlib, openblas or intel mkl +lapack : netlib, openblas, eigen or intel mkl +lapacke : netlib, openblas or intel mkl +tmg : netlib, openblas or intel mkl runtime : quark (http://icl.cs.utk.edu/quark/) or starpu (http://runtime.bordeaux.inria.fr/StarPU/) @@ -47,10 +46,12 @@ optional libraries cuda : (https://developer.nvidia.com/cuda-downloads) cublas : comes with cuda (http://docs.nvidia.com/cuda/cublas/) -magma : (http://icl.cs.utk.edu/magma/) +magma : (http://icl.cs.utk.edu/magma/) (version 1.6.2 recommended) mpi : openmpi (http://www.open-mpi.org/) FxT : linux package (libfxt) or releases here http://download.savannah.gnu.org/releases/fkt/ +These packages must be installed on the system before trying to configure/build chameleon. +Please look at the distrib/ directory which gives some hints for the installation of dependencies for Unix systems. ----------------------------------------- diff --git a/distrib/spack/install_dependencies.sh b/distrib/spack/install_dependencies.sh index 42964ff4708bb9b47afbadbd4ad52a7ebf6cfa2a..4286fca1e68b18a799a3fe3748b05e4f38f6695f 100755 --- a/distrib/spack/install_dependencies.sh +++ b/distrib/spack/install_dependencies.sh @@ -1,10 +1,8 @@ #!/bin/sh -git clone https://github.com/fpruvost/spack.git -cd spack -export SPACK_ROOT=$PWD -. $SPACK_ROOT/share/spack/setup-env.sh -cd - +# Please follow http://morse.gforge.inria.fr/spack/spack.html for further instructions +git clone https://github.com/solverstack/spack.git +. spack/share/spack/setup-env.sh spack install -v openblas spack install -v starpu spack load openblas