Merge authors: Alexander Eulitz [Eugen] (kubeu) Anton Gladky (gladky-anton) ------------------------------------------------------------ revno: 3830 [merge] committer: Christian Jakob <[email protected]> timestamp: Fri 2014-02-28 17:31:13 +0100 message: Merge branch 'master' of github.com:yade/trunk modified: cMake/FindOpenBlas.cmake doc/sphinx/installation.rst lib/base/Logging.hpp py/config.py.in
-- lp:yade https://code.launchpad.net/~yade-pkg/yade/git-trunk Your team Yade developers is subscribed to branch lp:yade. To unsubscribe from this branch go to https://code.launchpad.net/~yade-pkg/yade/git-trunk/+edit-subscription
=== modified file 'cMake/FindOpenBlas.cmake' --- cMake/FindOpenBlas.cmake 2013-06-26 18:15:55 +0000 +++ cMake/FindOpenBlas.cmake 2014-02-28 09:40:54 +0000 @@ -1,10 +1,10 @@ # - Find OpenBlas library # # This module defines -# OPENBLAS_LIBRARY, libraries to link against to use GL2PS. -# OPENBLAS_FOUND, If false, do not try to use GL2PS. +# OPENBLAS_LIBRARY, libraries to link against to use Openblas. +# OPENBLAS_FOUND, If false, do not try to use Openblas. -FIND_LIBRARY(OPENBLAS_LIBRARY NAMES openblas PATHS /usr/lib/openblas-base ) +FIND_LIBRARY(OPENBLAS_LIBRARY NAMES openblas blas PATHS /usr/lib/openblas-base ) # handle the QUIETLY and REQUIRED arguments and set LOKI_FOUND to TRUE if # all listed variables are TRUE === modified file 'doc/sphinx/installation.rst' --- doc/sphinx/installation.rst 2014-02-03 16:11:58 +0000 +++ doc/sphinx/installation.rst 2014-02-28 13:03:16 +0000 @@ -22,9 +22,10 @@ sudo bash -c 'echo "deb http://www.yade-dem.org/packages/ precise/" >> /etc/apt/sources.list' wget -O - http://www.yade-dem.org/packages/yadedev_pub.gpg | sudo apt-key add - + sudo apt-get update sudo apt-get install yadedaily -If you have another distribution, not Ubuntu Precise, be sure to use the +If you have another distribution, not Ubuntu Precise (Version 12.04), be sure to use the correct name in the first line (for instance, jessie, trusty or wheezy). After that you can normally start Yade using "yadedaily" or "yadedaily-batch" command. @@ -178,11 +179,21 @@ ^^^^^^^^^^^ You should create a separate build-place-folder, where Yade will be configured -and where the source code will be compiled. Then inside this build-directory you -should start cmake to configure the compilation process:: +and where the source code will be compiled. Here is an example for a folderstructure: + + myYade/ ## base directory + trunk/ ## folder for sourcecode in which you use github + build/ ## folder in which sources will be compiled; build-directory; use cmake here + install/ ## installfolder + +Then inside this build-directory you should start cmake to configure the compilation process:: cmake -DINSTALL_PREFIX=/path/to/installfolder /path/to/sources +For the folder structure given above call the following command in folder "build": + + cmake -DINSTALL_PREFIX=../install ../trunk + Additional options can be configured in the same line with the following syntax:: @@ -228,7 +239,11 @@ and split the compilation on many cores. For example, on 4-core machines it would be reasonable to set the parameter ``-j4``. Note, the Yade requires approximately 2GB/core for compilation, otherwise the swap-file will be used -and a compilation time dramatically increases. +and a compilation time dramatically increases. After compilation finished successfully +the new built can be started by navigating to /path/to/installfolder/bin and calling yade via (based on version yade-2014-02-20.git-a7048f4):: + + cd /path/to/installfolder/bin + ./yade-2014-02-20.git-a7048f4 For building the documentation you should at first execute the command "make install" and then "make doc" to build it. The generated files will be stored in your current === modified file 'lib/base/Logging.hpp' --- lib/base/Logging.hpp 2012-04-13 16:27:00 +0000 +++ lib/base/Logging.hpp 2014-02-28 11:14:59 +0000 @@ -16,9 +16,18 @@ # define _POOR_MANS_LOG(level,msg) {std::cerr<<level " "<<_LOG_HEAD<<msg<<std::endl;} # define _LOG_HEAD __FILE__ ":"<<__LINE__<<" "<<__FUNCTION__<<": " -# define LOG_TRACE(msg) // _POOR_MANS_LOG("TRACE",msg) -# define LOG_DEBUG(msg) // _POOR_MANS_LOG("DEBUG",msg) -# define LOG_INFO(msg) // _POOR_MANS_LOG("INFO ",msg) + +#ifdef YADE_DEBUG + # define LOG_TRACE(msg) _POOR_MANS_LOG("TRACE",msg) + # define LOG_INFO(msg) _POOR_MANS_LOG("INFO ",msg) + # define LOG_DEBUG(msg) _POOR_MANS_LOG("DEBUG",msg) +#else + # define LOG_TRACE(msg) // _POOR_MANS_LOG("TRACE",msg) + # define LOG_INFO(msg) // _POOR_MANS_LOG("INFO ",msg) + # define LOG_DEBUG(msg) // _POOR_MANS_LOG("DEBUG",msg) +#endif + + # define LOG_WARN(msg) _POOR_MANS_LOG("WARN ",msg) # define LOG_ERROR(msg) _POOR_MANS_LOG("ERROR",msg) # define LOG_FATAL(msg) _POOR_MANS_LOG("FATAL",msg) === modified file 'py/config.py.in' --- py/config.py.in 2012-07-18 05:33:52 +0000 +++ py/config.py.in 2014-02-28 08:22:32 +0000 @@ -2,7 +2,7 @@ """ Compile-time configuration for yade. -Template file is processed by scons to create the actual configuration at build-time. +Template file is processed by cmake to create the actual configuration at build-time. """ import os,datetime,os.path prefix='${runtimePREFIX}' if not os.environ.has_key('YADE_PREFIX') else os.environ['YADE_PREFIX'] @@ -14,7 +14,7 @@ libDir=os.path.abspath(prefix+'/'+libPATH+'/yade${SUFFIX}') confDir=os.environ['HOME']+'/.yade${SUFFIX}' libstdcxx='${libstdcxx}' -features='${features}'.split(',') +features='${features}'.split(' ') revision='${realVersion}' version='${version}' sourceRoot='${sourceRoot}'
_______________________________________________ Mailing list: https://launchpad.net/~yade-dev Post to : [email protected] Unsubscribe : https://launchpad.net/~yade-dev More help : https://help.launchpad.net/ListHelp
