Parent Directory
| 
Revision Log
| Links to HEAD: | (view) (annotate) |
| Sticky Revision: |
Fixed InstallAs target for Windows (removed escriptcpp.pyd since this file is not created). Added new config variable cc_extra to add some C/C++ options without having to change everything.
scons-dev branch now works under MacOS using Artak's latest environment. Use of -pedantic-errors can be turned off (for MacOS) with scons usepedantic=no.
Cleaned up cloning of environments
Now detecting and using UMFPACK, MKL
Improved handling of scons 0.98 versus 0.96
Cleanup
New scons scripts now work with scons-98 as well as scons-96...only had to use env.Clone() instead of env.Copy(). Added copyright to each scons file.
New SConstruct uses Configure() to determine which libraries/headers are available. Now using targets for each library instead of a target for the lib directory...this gives better control over what gets built. Source files are explicitly listed instead of discovered using glob. This is not ready for use just yet.
Branch for scons development
Merge changes from windows port branch to test build on *nix not broken.
And get the *(&(*&(* name right
Restore the trunk that existed before the windows changes were committed to the (now moved to branches) old trunk.
Make a temp copy of the trunk before checking in the windows changes
The MPI branch is hereby closed. All future work should be in trunk. Previously in revision 1295 I merged the latest changes to trunk into trunk-mpi-branch. In this revision I copied all files from trunk-mpi-branch over the corresponding trunk files. I did not use 'svn merge', it was a copy.
Add the esys and lib directories to the repository. Remove the IS_WINDOWS_PLATFORM from the SConscripts, and do the logic once in SConstruct. SConstruct now includes example options files if the hostname_options file is not present. This needs some more work for the altix. The tests now depend upon the build target. This is important it seems, as there appears to be the possibility of calling linking different libraries against incompatible versions of sub-libraries. This addressed most of the exceptions we were getting on windows. All the useNetCDF logic is now done by SConstruct. Made the init_target part of the build alias so that __ini__.py is created on a fresh checkout. py_tests mostly pass on windows, only need to track down the exception in run_tests.
Started the removal of IS_WINDOWS_PLATFORM, and now insis that the windows options file be kept up to date, and be complete. boost_libs -> boost_lib.
Finished renaming of boost_lib to boost_libs and boost_lib_path to boost_libs_path.
netcdf c++ interface removed
test for creation of reduced function spaces added. tests for dumping data on reduced function spaces added. This showed a small bug with compilation setting for compilation with netCDF which is fixed
netCDF can now be switched off at compilation. Consequently load and dump of data objects is not available then.
escript data objects can now be saved to netCDF files, see http://www.unidata.ucar.edu/software/netcdf/. Currently only constant data are implemented with expanded and tagged data to follow. There are two new functions to dump a data object s=Data(...) s.dump(<filename>) and to recover it s=load(<filename>, domain) Notice that the function space of s is recovered but domain is still need. dump and load will replace archive and extract. The installation needs now the netCDF installed.
+ Merge of intelc_win32 branch (revision 741:755) with trunk. Tested on iVEC altix (run_tests and py_tests all pass)
A few changes in the build mechanism and the file structure so scons can build release tar files:
* paso/src/Solver has been moved to paso/src
* all test_.py are now run_.py files and are assumed to be passing python tests. they can run by
scons py_tests and are part of the release test set
* escript/py_src/test_ are moved to escript/test/python and are installed in to the build directory
(rather then the PYTHONPATH).
* all py files in test/python which don't start with run_ or test_ are now 'local_py_tests'. they are installed i
by not run automatically.
* CppUnitTest is now treated as a escript module (against previous decisions).
* scons realse builds nor tar/zip files with relvant source code (src and tests in seperate files)
the python tests don't pass yet due to path problems.
+ NEW BUILD SYSTEM
This commit contains the new build system with cross-platform support.
Most things work are before though you can have more control.
ENVIRONMENT settings have changed:
+ You no longer require LD_LIBRARY_PATH or PYTHONPATH to point to the
esysroot for building and testing performed via scons
+ ACcESS altix users: It is recommended you change your modules to load
the latest intel compiler and other libraries required by boost to match
the setup in svn (you can override). The correct modules are as follows
module load intel_cc.9.0.026
export
MODULEPATH=${MODULEPATH}:/data/raid2/toolspp4/modulefiles/gcc-3.3.6
module load boost/1.33.0/python-2.4.1
module load python/2.4.1
module load numarray/1.3.3
installation of new inc file
add remainder of includes to SConscript includes install
add mechanism to install .h files to inc directories (still need to specify full lists of .h files to install)
restructure escript source tree move src/Data/* -> src remove inc modify #includes and cpppath settings accordingly
reorganised esysUtils to remove inc directory
Utils added for compilation
turns out Install() targets should also be made Default() targets if you want them to actually reliably work!
now automatically build unit tests as required based on dependencies between unit tests and libraries
explicitly define dependencies between modules
pass in cc/cxx settings from config file
pass in top level install directory for finley/escript/bruce/paso libraries when building via top level scons script
push platform dependent compiler flags and include directories up to library level scons files - these will eventually be brought in from external config files
pass in value for esysroot and use this to determine include file locations
explicitly add -fpic option to all compiler options lists to ensure relocatable code is generated
first draft of config/construct scripts for escript library
This form allows you to request diffs between any two revisions of this file. For each of the two "sides" of the diff, enter a numeric revision.
| ViewVC Help | |
| Powered by ViewVC 1.1.26 |