Log of /branches/windows_from_1431_trunk/SConstruct
Parent Directory
| 
Revision Log
Revision
1387 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Fri Jan 11 07:45:26 2008 UTC
(13 years, 3 months ago)
by
trankine
Original Path:
temp/SConstruct
File length: 31810 byte(s)
Diff to
previous 1384
Restore the trunk that existed before the windows changes were committed to the (now moved to branches) old trunk.
Revision
1360 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Thu Dec 13 05:05:00 2007 UTC
(13 years, 4 months ago)
by
ksteube
Original Path:
trunk/SConstruct
File length: 31400 byte(s)
Diff to
previous 1354
Partial implementation of ReadMeshMPI.
Will eventually replace ReadMesh but for now has a different name.
Revision
1348 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Mon Nov 19 00:21:36 2007 UTC
(13 years, 5 months ago)
by
ksteube
Original Path:
trunk/SConstruct
File length: 31435 byte(s)
Diff to
previous 1343
If using MPI then disable OpenMP, because it doesn't work with both.
Record in trunk/lib what options we compiled with:
OpenMP, MPI, debug, bounds_check
Revision
1343 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Wed Nov 14 02:48:02 2007 UTC
(13 years, 5 months ago)
by
ksteube
Original Path:
trunk/SConstruct
File length: 30720 byte(s)
Diff to
previous 1339
First cut implementation of mesh.dump() using NetCDF. TagMap not
saved yet. The code for Points probably works but has not been tested.
Revision
1339 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Wed Nov 7 01:53:12 2007 UTC
(13 years, 5 months ago)
by
ksteube
Original Path:
trunk/SConstruct
File length: 30807 byte(s)
Diff to
previous 1324
Modified scons target release_src to include lib/ and include/ since
their presence is required for a build. Modified
mydomain.print_mesh_info(True) to include more useful info about a
distributed domain. Added mypde.getOperator().print_matrix_info(True)
to tell about a distributed matrix.
Revision
1312 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Mon Sep 24 06:18:44 2007 UTC
(13 years, 6 months ago)
by
ksteube
Original Path:
trunk/SConstruct
File length: 30717 byte(s)
Diff to
previous 1250
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.
Revision
1248 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Tue Aug 14 05:20:39 2007 UTC
(13 years, 8 months ago)
by
phornby
Original Path:
trunk/SConstruct
File length: 25552 byte(s)
Diff to
previous 1247
Prepend various shareable library locations to PATH rather than appending.
Add (empty) include directory to the repository.
Impact of adding lib, include and esys dirs to repository.
You will need to move these aside in any checked out tree before doing an update.
Revision
1246 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Mon Aug 13 22:09:00 2007 UTC
(13 years, 8 months ago)
by
phornby
Original Path:
trunk/SConstruct
File length: 25288 byte(s)
Diff to
previous 1244
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.
Revision
1243 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Mon Aug 13 06:48:37 2007 UTC
(13 years, 8 months ago)
by
phornby
Original Path:
trunk/SConstruct
File length: 25195 byte(s)
Diff to
previous 1235
build is the default target, and will build a local installation in the source tree.
A new install target will do a build and install in the system directories. The system dierctories are set up for altix/linux systems with a prefix of '/usr'
Revision
1235 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Mon Aug 13 00:25:29 2007 UTC
(13 years, 8 months ago)
by
phornby
Original Path:
trunk/SConstruct
File length: 24426 byte(s)
Diff to
previous 1232
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
(13 years, 8 months ago)
by
phornby
Original Path:
trunk/SConstruct
File length: 24447 byte(s)
Diff to
previous 1217
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
(13 years, 9 months ago)
by
ksteube
Original Path:
trunk/SConstruct
File length: 26417 byte(s)
Diff to
previous 1216
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
(13 years, 9 months ago)
by
ksteube
Original Path:
trunk/SConstruct
File length: 24584 byte(s)
Diff to
previous 1215
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
(13 years, 9 months ago)
by
ksteube
Original Path:
trunk/SConstruct
File length: 24565 byte(s)
Diff to
previous 1185
Repaired all targets for: scons docs
It runs all these targets: release_examples guide_pdf api_epydoc api_doxygen
Revision
1163 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Wed May 23 23:56:39 2007 UTC
(13 years, 11 months ago)
by
gross
Original Path:
trunk/SConstruct
File length: 24151 byte(s)
Diff to
previous 1160
import of DISPLAY environment variable into scons ENV added. This is required to run pyvisi tests under XGL
Revision
1141 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Tue May 15 04:24:51 2007 UTC
(13 years, 11 months ago)
by
gross
Original Path:
trunk/SConstruct
File length: 23618 byte(s)
Diff to
previous 1137
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
(13 years, 11 months ago)
by
gross
Original Path:
trunk/SConstruct
File length: 23266 byte(s)
Diff to
previous 1133
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
(13 years, 11 months ago)
by
gross
Original Path:
trunk/SConstruct
File length: 23267 byte(s)
Diff to
previous 1083
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
1028 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Wed Mar 14 00:15:24 2007 UTC
(14 years, 1 month ago)
by
gross
Original Path:
trunk/SConstruct
File length: 19886 byte(s)
Diff to
previous 1026
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
(14 years, 1 month ago)
by
phornby
Original Path:
trunk/SConstruct
File length: 19423 byte(s)
Diff to
previous 1024
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
1023 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Tue Mar 13 05:43:36 2007 UTC
(14 years, 1 month ago)
by
gross
Original Path:
trunk/SConstruct
File length: 19610 byte(s)
Diff to
previous 1021
netCDF can now be switched off at compilation. Consequently load and dump of data objects is not available then.
Revision
950 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Tue Feb 6 07:01:11 2007 UTC
(14 years, 2 months ago)
by
gross
Original Path:
trunk/SConstruct
File length: 19124 byte(s)
Diff to
previous 898
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
863 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Wed Oct 4 01:01:15 2006 UTC
(14 years, 6 months ago)
by
matt
Original Path:
trunk/SConstruct
File length: 18470 byte(s)
Diff to
previous 817
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
782 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Tue Jul 18 00:47:47 2006 UTC
(14 years, 9 months ago)
by
bcumming
Original Path:
trunk/SConstruct
File length: 16546 byte(s)
Diff to
previous 762
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
759 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Thu Jun 29 01:53:23 2006 UTC
(14 years, 9 months ago)
by
bcumming
Original Path:
trunk/SConstruct
File length: 16546 byte(s)
Diff to
previous 757
- 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
751 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Mon Jun 26 01:46:34 2006 UTC
(14 years, 9 months ago)
by
bcumming
Original Path:
trunk/SConstruct
File length: 15196 byte(s)
Diff to
previous 722
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
700 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Thu Apr 6 00:13:40 2006 UTC
(15 years ago)
by
gross
Original Path:
trunk/SConstruct
File length: 13806 byte(s)
Diff to
previous 694
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
691 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Wed Mar 29 03:43:36 2006 UTC
(15 years ago)
by
robwdcock
Original Path:
trunk/SConstruct
File length: 12366 byte(s)
Diff to
previous 690
+ 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
(15 years ago)
by
robwdcock
Original Path:
trunk/SConstruct
File length: 12360 byte(s)
Diff to
previous 688
+ 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
(15 years ago)
by
robwdcock
Original Path:
trunk/SConstruct
File length: 12332 byte(s)
Diff to
previous 685
+ 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
684 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Mon Mar 27 07:34:07 2006 UTC
(15 years ago)
by
robwdcock
Original Path:
trunk/SConstruct
File length: 12173 byte(s)
Diff to
previous 682
+ 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
(15 years ago)
by
robwdcock
Original Path:
trunk/SConstruct
File length: 12085 byte(s)
Diff to
previous 643
+ 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
425 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Tue Jan 10 04:10:39 2006 UTC
(15 years, 3 months ago)
by
gross
Original Path:
trunk/SConstruct
File length: 647 byte(s)
Diff to
previous 380
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
340 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Mon Dec 12 05:10:45 2005 UTC
(15 years, 4 months ago)
by
jgs
Original Path:
trunk/SConstruct
File length: 1268 byte(s)
Diff to
previous 288
pass in pyinstall value from top-level scons script and add
correct suffix in module level scons scipr
Revision
214 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Thu Nov 24 05:15:26 2005 UTC
(15 years, 4 months ago)
by
jgs
Original Path:
trunk/SConstruct
File length: 996 byte(s)
Diff to
previous 192
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
(15 years, 5 months ago)
by
jgs
Original Path:
trunk/SConstruct
File length: 275 byte(s)
Diff to
previous 189
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
(15 years, 5 months ago)
by
jgs
Original Path:
trunk/SConstruct
File length: 226 byte(s)
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.
