/[escript]/trunk/SConstruct
ViewVC logotype

Log of /trunk/SConstruct

Parent Directory Parent Directory | Revision Log Revision Log


Links to HEAD: (view) (annotate)
Sticky Revision:

Revision 1235 - (view) (annotate) - [select for diffs]
Modified Mon Aug 13 00:25:29 2007 UTC (12 years, 4 months ago) by phornby
File length: 24426 byte(s)
Diff to previous 1232 , to selected 784
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.

Revision 1232 - (view) (annotate) - [select for diffs]
Modified Fri Aug 10 06:44:04 2007 UTC (12 years, 4 months ago) by phornby
File length: 24447 byte(s)
Diff to previous 1217 , to selected 784
Reduce the number of IS_WINDOWS_PLATFORM references in SConstruct.
Change path to boost etc in windows_mscv71_options.py 
Some of these changes are present in windows_mscv71_options.py, more changes needed once I get the mscv71 build going properly.

Revision 1217 - (view) (annotate) - [select for diffs]
Modified Wed Jul 18 00:47:01 2007 UTC (12 years, 4 months ago) by ksteube
File length: 26417 byte(s)
Diff to previous 1216 , to selected 784
Can now install into /usr with scons prefix=/usr and get a typical
python package install. Setting PYTHONPATH and LD_LIBRARY_PATH is
not necessary.


Revision 1216 - (view) (annotate) - [select for diffs]
Modified Thu Jul 12 06:20:08 2007 UTC (12 years, 5 months ago) by ksteube
File length: 24584 byte(s)
Diff to previous 1215 , to selected 784
Build now works on systems where doxygen is not available.
Repaired target scons guide_html_index to create HTML user guide.


Revision 1215 - (view) (annotate) - [select for diffs]
Modified Thu Jul 12 01:14:55 2007 UTC (12 years, 5 months ago) by ksteube
File length: 24565 byte(s)
Diff to previous 1185 , to selected 784
Repaired all targets for: scons docs
It runs all these targets: release_examples guide_pdf api_epydoc api_doxygen


Revision 1185 - (view) (annotate) - [select for diffs]
Modified Thu May 31 04:33:31 2007 UTC (12 years, 6 months ago) by gross
File length: 24206 byte(s)
Diff to previous 1164 , to selected 784
once again: some changes to get the tests passed on windows.

Revision 1164 - (view) (annotate) - [select for diffs]
Modified Thu May 24 00:38:40 2007 UTC (12 years, 6 months ago) by jongui
File length: 24206 byte(s)
Diff to previous 1163 , to selected 784
As it turned out XAUTHORITY has to be imported into scons, too.



Revision 1163 - (view) (annotate) - [select for diffs]
Modified Wed May 23 23:56:39 2007 UTC (12 years, 6 months ago) by gross
File length: 24151 byte(s)
Diff to previous 1160 , to selected 784
import of DISPLAY environment variable into scons ENV added. This is required to run pyvisi tests under XGL

Revision 1160 - (view) (annotate) - [select for diffs]
Modified Wed May 23 00:44:01 2007 UTC (12 years, 6 months ago) by gross
File length: 24071 byte(s)
Diff to previous 1149 , to selected 784
The OMP_NUM_THREADS environment variable is now imported into the scons evironment.

Revision 1149 - (view) (annotate) - [select for diffs]
Modified Thu May 17 00:30:15 2007 UTC (12 years, 6 months ago) by gross
File length: 23926 byte(s)
Diff to previous 1141 , to selected 784
some fixes from the windows version

Revision 1141 - (view) (annotate) - [select for diffs]
Modified Tue May 15 04:24:51 2007 UTC (12 years, 7 months ago) by gross
File length: 23618 byte(s)
Diff to previous 1137 , to selected 784
Some changes to make things run on windows. There is still a problem with netcdf an long file names on windows but there is the suspicion that this is a bigger problem related to boost (compiler options). In fact runs with large numbers of iteration/time steps tend to create seg faults. 

Revision 1137 - (view) (annotate) - [select for diffs]
Modified Thu May 10 08:11:31 2007 UTC (12 years, 7 months ago) by gross
File length: 23266 byte(s)
Diff to previous 1133 , to selected 784
This version passes the tests on windows except for 

   * vtk
   * netCDF

The version needs to be tested on altix and linux

Revision 1133 - (view) (annotate) - [select for diffs]
Modified Tue May 8 07:19:33 2007 UTC (12 years, 7 months ago) by gross
File length: 23267 byte(s)
Diff to previous 1083 , to selected 784
Changes needed for windows. This still does not work on and has not run on linux and the altix. 
 
There are a few changes in names in the scons script, in particular _libs is used rather than _lib and _libs is always a list. By default on windows MSVC is used. The location of python is at C:\Program Files\python<version>, boost at C:\Program Files\boost and netcdf at C:\Program Files\netcdf. 

 

Revision 1083 - (view) (annotate) - [select for diffs]
Modified Thu Apr 12 01:15:01 2007 UTC (12 years, 8 months ago) by ksteube
File length: 20021 byte(s)
Diff to previous 1039 , to selected 784
Install prefix: can now use

	scons prefix=/some/dir

to build and install into another directory.


Revision 1039 - (view) (annotate) - [select for diffs]
Modified Fri Mar 16 08:42:17 2007 UTC (12 years, 9 months ago) by phornby
File length: 19955 byte(s)
Diff to previous 1028 , to selected 784
Just trying to get the intelc version going.



Revision 1028 - (view) (annotate) - [select for diffs]
Modified Wed Mar 14 00:15:24 2007 UTC (12 years, 9 months ago) by gross
File length: 19886 byte(s)
Diff to previous 1026 , to selected 784
modifications to be compliant with _WIN32. The substitutes for asinh, acosh, atanh are still missing (erf will through an exception)

Revision 1026 - (view) (annotate) - [select for diffs]
Modified Tue Mar 13 08:25:00 2007 UTC (12 years, 9 months ago) by phornby
File length: 19423 byte(s)
Diff to previous 1024 , to selected 784
Data.cpp - indefed out the erf & inv. hyperbolics on windows.
DataAlgorithmAdapterTestCase & DataTestCase - Fix the ifndef on _WIN32 & _INTEL_COMPILER
SConstruct - chamges to the PATH so windows can find DLLs.



Revision 1024 - (view) (annotate) - [select for diffs]
Modified Tue Mar 13 06:31:50 2007 UTC (12 years, 9 months ago) by gross
File length: 19446 byte(s)
Diff to previous 1023 , to selected 784
import of PATH

Revision 1023 - (view) (annotate) - [select for diffs]
Modified Tue Mar 13 05:43:36 2007 UTC (12 years, 9 months ago) by gross
File length: 19610 byte(s)
Diff to previous 1021 , to selected 784
netCDF can now be switched off at compilation. Consequently load and dump of data objects is not available then.

Revision 1021 - (view) (annotate) - [select for diffs]
Modified Tue Mar 13 02:06:30 2007 UTC (12 years, 9 months ago) by gross
File length: 19207 byte(s)
Diff to previous 965 , to selected 784
some changes to make things run with python 2.3

Revision 965 - (view) (annotate) - [select for diffs]
Modified Tue Feb 13 05:38:45 2007 UTC (12 years, 10 months ago) by gross
File length: 19185 byte(s)
Diff to previous 961 , to selected 784
johns local setting removed.

Revision 961 - (view) (annotate) - [select for diffs]
Modified Tue Feb 13 01:58:48 2007 UTC (12 years, 10 months ago) by jongui
File length: 19241 byte(s)
Diff to previous 958 , to selected 784
Tidied up some codes

Revision 958 - (view) (annotate) - [select for diffs]
Modified Tue Feb 13 01:08:39 2007 UTC (12 years, 10 months ago) by gross
File length: 19186 byte(s)
Diff to previous 950 , to selected 784
bruce is switched off for now as it doesn't really do anything useful yet.

Revision 950 - (view) (annotate) - [select for diffs]
Modified Tue Feb 6 07:01:11 2007 UTC (12 years, 10 months ago) by gross
File length: 19124 byte(s)
Diff to previous 898 , to selected 784
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. 



Revision 898 - (view) (annotate) - [select for diffs]
Modified Sun Nov 12 23:56:26 2006 UTC (13 years, 1 month ago) by gross
File length: 18558 byte(s)
Diff to previous 863 , to selected 784
first checkin of pycad (gmsh pythoin wrapper)

Revision 863 - (view) (annotate) - [select for diffs]
Modified Wed Oct 4 01:01:15 2006 UTC (13 years, 2 months ago) by matt
File length: 18470 byte(s)
Diff to previous 817 , to selected 784
Added serial execution build options for running on the altix. In doing so, a
minor bug in SConstruct was found and fixed. The correct libraries still need
to be sorted after consulting Lutz and/or Ken.


Revision 817 - (view) (annotate) - [select for diffs]
Modified Sat Aug 26 03:08:52 2006 UTC (13 years, 3 months ago) by ksteube
File length: 18751 byte(s)
Diff to previous 807 , to selected 784
Can now compile and run with MPI on shake71



Revision 807 - (view) (annotate) - [select for diffs]
Modified Thu Aug 10 22:12:23 2006 UTC (13 years, 4 months ago) by gross
File length: 18635 byte(s)
Diff to previous 806 , to selected 784
new target for users guide

Revision 806 - (view) (annotate) - [select for diffs]
Modified Thu Aug 10 11:58:52 2006 UTC (13 years, 4 months ago) by gross
File length: 18599 byte(s)
Diff to previous 805 , to selected 784
Interface to the direct solver library UMLPACK is no implemented.



Revision 805 - (view) (annotate) - [select for diffs]
Modified Thu Aug 10 06:09:02 2006 UTC (13 years, 4 months ago) by gross
File length: 17934 byte(s)
Diff to previous 792 , to selected 784
first steps toward UMFPACK

Revision 792 - (view) (annotate) - [select for diffs]
Modified Fri Jul 28 10:37:16 2006 UTC (13 years, 4 months ago) by gross
File length: 16547 byte(s)
Diff to previous 786 , to selected 784
frame for pyvisi set up

Revision 786 - (view) (annotate) - [select for diffs]
Modified Tue Jul 25 04:58:05 2006 UTC (13 years, 4 months ago) by gross
File length: 16549 byte(s)
Diff to previous 784
switched off pyvisi

Revision 784 - (view) (annotate) - [selected]
Modified Wed Jul 19 05:38:14 2006 UTC (13 years, 4 months ago) by bcumming
File length: 16547 byte(s)
Diff to previous 782
removed personal testing code from SConscript



Revision 782 - (view) (annotate) - [select for diffs]
Modified Tue Jul 18 00:47:47 2006 UTC (13 years, 4 months ago) by bcumming
File length: 16546 byte(s)
Diff to previous 762 , to selected 784
Large number of changes to Finley for meshing in MPI.

- optimisation and neatening up of rectcanglular mesh generation code
- first and second order 1D, 2D and 3D rectangular meshes are now
  available in finley and escript using MPI.
- reduced meshes now generated in MPI, and interpolation to and from 
  reduced data types now supported.  


Revision 762 - (view) (annotate) - [select for diffs]
Modified Fri Jun 30 00:09:19 2006 UTC (13 years, 5 months ago) by bcumming
File length: 16547 byte(s)
Diff to previous 759 , to selected 784
- small change to SConstruct to remove my testing code


Revision 759 - (view) (annotate) - [select for diffs]
Modified Thu Jun 29 01:53:23 2006 UTC (13 years, 5 months ago) by bcumming
File length: 16546 byte(s)
Diff to previous 757 , to selected 784
- added directory pythonMPI to the source tree. this directory contains
  the c++ wrapper that is used to run python scripts in parallel for the
  MPI version of escript/finley
- updated the SConstruct and ./scons/ess_options.py for conditional MPI
  compilation. To compile the MPI version on ESS uncomment the #define
  PASO_MPI in ./paso/src/Paso.h and add the command line option
  useMPI=yes when running scons.
- fixed a compile time error in the MPI build in  
  finley/src/CPPAdapter/MeshAdapterFactory.cpp 
     


Revision 757 - (view) (annotate) - [select for diffs]
Modified Mon Jun 26 13:12:56 2006 UTC (13 years, 5 months ago) by woo409
File length: 15099 byte(s)
Diff to previous 751 , to selected 784
+ Merge of intelc_win32 branch (revision 741:755) with trunk. Tested on iVEC altix (run_tests and py_tests all pass)


Revision 751 - (view) (annotate) - [select for diffs]
Modified Mon Jun 26 01:46:34 2006 UTC (13 years, 5 months ago) by bcumming
File length: 15196 byte(s)
Diff to previous 722 , to selected 784
Changes relating to the MPI version of escript
The standard OpenMP version of escript is unchanged

- updated data types (Finley_Mesh, Finley_NodeFile, etc) to store meshes
  over multiple MPI processes.
- added CommBuffer code in Paso for communication of Data associated
  with distributed meshes
- updates in Finley and Escript to support distributed data and operations
  on distributed data (such as interpolation).
- construction of RHS in MPI, so that simple explicit schemes (such as
  /docs/examples/wave.py without IO and the Locator) can run in MPI.
- updated mesh generation for first order line, rectangle and brick
  meshes and second order line meshes in MPI.        
- small changes to trunk/SConstruct and trunk/scons/ess_options.py to
  build the MPI version, these changes are turned off by default.


Revision 722 - (view) (annotate) - [select for diffs]
Modified Mon May 1 11:49:18 2006 UTC (13 years, 7 months ago) by gross
File length: 15078 byte(s)
Diff to previous 720 , to selected 784
abstract added in users guide added

Revision 720 - (view) (annotate) - [select for diffs]
Modified Thu Apr 27 10:16:05 2006 UTC (13 years, 7 months ago) by gross
File length: 15270 byte(s)
Diff to previous 712 , to selected 784
formatting errors in epydoc tags fixed

Revision 712 - (view) (annotate) - [select for diffs]
Modified Thu Apr 27 02:08:50 2006 UTC (13 years, 7 months ago) by elspeth
File length: 15254 byte(s)
Diff to previous 707 , to selected 784
Fixed build of epydoc documentation. Now builds html in relase/doc/epydoc .


Revision 707 - (view) (annotate) - [select for diffs]
Modified Wed Apr 12 23:58:02 2006 UTC (13 years, 8 months ago) by gross
File length: 15036 byte(s)
Diff to previous 706 , to selected 784
latex build documentation is working now

Revision 706 - (view) (annotate) - [select for diffs]
Modified Sat Apr 8 16:13:02 2006 UTC (13 years, 8 months ago) by gross
File length: 14072 byte(s)
Diff to previous 705 , to selected 784
python tests compile and run but there is still a problem with dependencies'


Revision 705 - (view) (annotate) - [select for diffs]
Modified Fri Apr 7 17:57:37 2006 UTC (13 years, 8 months ago) by gross
File length: 13972 byte(s)
Diff to previous 700 , to selected 784
python tests are allmost working

Revision 700 - (view) (annotate) - [select for diffs]
Modified Thu Apr 6 00:13:40 2006 UTC (13 years, 8 months ago) by gross
File length: 13806 byte(s)
Diff to previous 694 , to selected 784
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.



Revision 694 - (view) (annotate) - [select for diffs]
Modified Thu Mar 30 11:35:55 2006 UTC (13 years, 8 months ago) by gross
File length: 12456 byte(s)
Diff to previous 691 , to selected 784
pyvisi builds now. tests still to be fixed.

Revision 691 - (view) (annotate) - [select for diffs]
Modified Wed Mar 29 03:43:36 2006 UTC (13 years, 8 months ago) by robwdcock
File length: 12366 byte(s)
Diff to previous 690 , to selected 784
+ Fixed incorrect target path in SConstruct file
+ cognac now links with g++ compiled boost rather than intelc compiled boost due to compilation errors with intel c. (Finley will still compile and work with intel c though) - this is the same configuration as the access altix


Revision 690 - (view) (annotate) - [select for diffs]
Modified Tue Mar 28 07:18:51 2006 UTC (13 years, 8 months ago) by robwdcock
File length: 12360 byte(s)
Diff to previous 688 , to selected 784
+ Added basic_py_tests target which will run the basic set of python tests. The list of python tests was taken from autoscons


Revision 688 - (view) (annotate) - [select for diffs]
Modified Tue Mar 28 01:56:24 2006 UTC (13 years, 8 months ago) by robwdcock
File length: 12332 byte(s)
Diff to previous 685 , to selected 784
+ Modified the env (environment) creation for the ia64 platform to include PATH so it no longer complains about not being able to locate the intel compiler. This is related to the previous fix for windows. Seems it is a scons intelc.py bug.


Revision 685 - (view) (annotate) - [select for diffs]
Modified Mon Mar 27 22:16:33 2006 UTC (13 years, 8 months ago) by gross
File length: 12311 byte(s)
Diff to previous 684 , to selected 784
compilation uses python version scons is running under now

Revision 684 - (view) (annotate) - [select for diffs]
Modified Mon Mar 27 07:34:07 2006 UTC (13 years, 8 months ago) by robwdcock
File length: 12173 byte(s)
Diff to previous 682 , to selected 784
+ Minor modification to how the ENV external environment is initialised. Originally this was done as part of the env = Environment( ENV = ...) construction. Unfortunately this doesn't work properly on windows as it clobbers the path edits performed by the tools = 'intelc'. The end result is icl is not found. Now the env is initialised without the ENV = and they are added in after construction.
I suspect this is a bug in scons itself on the windows platform.

Revision 682 - (view) (annotate) - [select for diffs]
Modified Mon Mar 27 02:43:09 2006 UTC (13 years, 8 months ago) by robwdcock
File length: 12085 byte(s)
Diff to previous 643 , to selected 784
+ 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



Revision 643 - (view) (annotate) - [select for diffs]
Modified Fri Mar 24 00:28:41 2006 UTC (13 years, 8 months ago) by elspeth
File length: 1105 byte(s)
Diff to previous 618 , to selected 784
More copyright info added.


Revision 618 - (view) (annotate) - [select for diffs]
Modified Wed Mar 22 04:02:38 2006 UTC (13 years, 8 months ago) by gross
File length: 683 byte(s)
Diff to previous 603 , to selected 784
mmio moced to paso

Revision 603 - (view) (annotate) - [select for diffs]
Modified Mon Mar 20 01:49:39 2006 UTC (13 years, 8 months ago) by gross
File length: 726 byte(s)
Diff to previous 602 , to selected 784
pyvisi compiles now

Revision 602 - (view) (annotate) - [select for diffs]
Modified Fri Mar 17 06:57:46 2006 UTC (13 years, 8 months ago) by gross
File length: 728 byte(s)
Diff to previous 584 , to selected 784
more work on pyvisi integration

Revision 584 - (view) (annotate) - [select for diffs]
Modified Thu Mar 9 23:03:38 2006 UTC (13 years, 9 months ago) by gross
File length: 685 byte(s)
Diff to previous 498 , to selected 784
eigenvalues: compiles and passes tests on altix now

Revision 498 - (view) (annotate) - [select for diffs]
Modified Tue Feb 7 01:53:47 2006 UTC (13 years, 10 months ago) by jgs
File length: 647 byte(s)
Diff to previous 455 , to selected 784
can now specify target "build_docs" in order to build
epydoc and doxygen documentation


Revision 455 - (view) (annotate) - [select for diffs]
Modified Tue Jan 24 04:36:54 2006 UTC (13 years, 10 months ago) by jgs
File length: 649 byte(s)
Diff to previous 425 , to selected 784
minor comment and formatting changes


Revision 425 - (view) (annotate) - [select for diffs]
Modified Tue Jan 10 04:10:39 2006 UTC (13 years, 11 months ago) by gross
File length: 647 byte(s)
Diff to previous 380 , to selected 784
The sparse solver can be called by paso now. 

the building has been change to reduce some code redundancy:
now all scons SCscripts are importing scons/esys_options.py which
imports platform specific settings. 




Revision 380 - (view) (annotate) - [select for diffs]
Modified Mon Dec 19 01:54:51 2005 UTC (13 years, 11 months ago) by gross
File length: 1306 byte(s)
Diff to previous 370 , to selected 784
the documenation build does not work at all except on our altix. has been switcehed of for now

Revision 370 - (view) (annotate) - [select for diffs]
Modified Fri Dec 16 00:52:34 2005 UTC (13 years, 11 months ago) by cochrane
File length: 1304 byte(s)
Diff to previous 340 , to selected 784
Updated to allow for building of API documentation.


Revision 340 - (view) (annotate) - [select for diffs]
Modified Mon Dec 12 05:10:45 2005 UTC (14 years ago) by jgs
File length: 1268 byte(s)
Diff to previous 288 , to selected 784
pass in pyinstall value from top-level scons script and add
correct suffix in module level scons scipr


Revision 288 - (view) (annotate) - [select for diffs]
Modified Fri Dec 2 01:55:04 2005 UTC (14 years ago) by jgs
File length: 1144 byte(s)
Diff to previous 268 , to selected 784
now automatically build unit tests as required based on dependencies
between unit tests and libraries


Revision 268 - (view) (annotate) - [select for diffs]
Modified Wed Nov 30 01:39:47 2005 UTC (14 years ago) by jgs
File length: 1151 byte(s)
Diff to previous 246 , to selected 784
setup scons configuration to make and install python code


Revision 246 - (view) (annotate) - [select for diffs]
Modified Tue Nov 29 04:27:00 2005 UTC (14 years ago) by jgs
File length: 1110 byte(s)
Diff to previous 214 , to selected 784
allow compile options to be loaded from a config
file specified on the command line to scons


Revision 214 - (view) (annotate) - [select for diffs]
Modified Thu Nov 24 05:15:26 2005 UTC (14 years ago) by jgs
File length: 996 byte(s)
Diff to previous 192 , to selected 784
collect all information needed to determine build
configuration (ie: debug/nodebug, host, platform etc)


Revision 192 - (view) (annotate) - [select for diffs]
Modified Mon Nov 21 04:52:14 2005 UTC (14 years ago) by jgs
File length: 275 byte(s)
Diff to previous 189 , to selected 784
pass in top level install directory for finley/escript/bruce/paso
libraries when building via top level scons script


Revision 189 - (view) (annotate) - [select for diffs]
Added Mon Nov 21 03:26:46 2005 UTC (14 years ago) by jgs
File length: 226 byte(s)
Diff to selected 784
add top level SConstruct file to enable coordinated building of all esys libraries

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.

  Diffs between and
  Type of Diff should be a

  ViewVC Help
Powered by ViewVC 1.1.26