/[escript]/trunk/escript/src/SConscript
ViewVC logotype

Log of /trunk/escript/src/SConscript

Parent Directory Parent Directory | Revision Log Revision Log


Sticky Revision:
(Current path doesn't exist after revision 4507)

Revision 2032 - (view) (annotate) - [select for diffs]
Modified Wed Nov 12 08:11:19 2008 UTC (11 years ago) by phornby
File length: 3771 byte(s)
Diff to previous 2031 , to selected 2005
Missed an extra additional CPPDEFINES for the py_wrapper_local_env.



Revision 2031 - (view) (annotate) - [select for diffs]
Modified Wed Nov 12 08:02:33 2008 UTC (11 years ago) by phornby
File length: 3702 byte(s)
Diff to previous 2027 , to selected 2005
Need finer control than INTERFACE_STATIC_LIB could exert. Now there is a
XXX_STATIC_LIB for each lib.



Revision 2027 - (view) (annotate) - [select for diffs]
Modified Tue Nov 11 02:52:24 2008 UTC (11 years ago) by phornby
File length: 3645 byte(s)
Diff to previous 2005
Ensure ESCRIPT_EXPORTS is defined only while compiling escript on windows.
A similar comment applies to FINLEY_EXPORTS.

SConstruct:
Fixed a comment.
reformatted the Export() call, and added IS_WINDOWS_PLATFORM to the exports.

Revision 2005 - (view) (annotate) - [selected]
Modified Mon Nov 10 01:21:39 2008 UTC (11 years ago) by jfenwick
File length: 3565 byte(s)
Diff to previous 1897
Bringing all changes across from schroedinger.
(Note this does not mean development is done, just that it will happen
on the trunk for now).
If anyone notices any problems please contact me.



Revision 1897 - (view) (annotate) - [select for diffs]
Modified Mon Oct 20 00:32:30 2008 UTC (11 years, 1 month ago) by jfenwick
File length: 3511 byte(s)
Diff to previous 1872 , to selected 2005
Modified Data::toString() so it doesn't throw on DataEmpty.
Added setEscriptParamInt and getEscriptParamInt as free functions.
At the moment all they do is allow you to set the param TOO_MANY_LINES.
This is used to determine when printing a Data object will show you the 
points and when it will print a summary.

I've set the default value back to 80 lines.
If you need to see more lines use (in python):

setEscriptParamInt("TOO_MANY_LINES",80000)



Revision 1872 - (view) (annotate) - [select for diffs]
Modified Mon Oct 13 00:18:55 2008 UTC (11 years, 1 month ago) by jfenwick
File length: 3475 byte(s)
Diff to previous 1847 , to selected 2005
Closing the moreshared branch


Revision 1847 - (view) (annotate) - [select for diffs]
Modified Fri Oct 3 06:45:34 2008 UTC (11 years, 1 month ago) by phornby
File length: 3463 byte(s)
Diff to previous 1845 , to selected 2005
OK, these get the blahcpp.so names correct now.



Revision 1845 - (view) (annotate) - [select for diffs]
Modified Fri Oct 3 05:23:47 2008 UTC (11 years, 1 month ago) by gross
File length: 3410 byte(s)
Diff to previous 1840 , to selected 2005
some naming problem for the installation of escriptcpp and finleycpp. Apparently this came is trough some mofifications in windows

Revision 1840 - (view) (annotate) - [select for diffs]
Modified Fri Oct 3 03:16:11 2008 UTC (11 years, 1 month ago) by phornby
File length: 3453 byte(s)
Diff to previous 1837 , to selected 2005
These now install the correct .pyd files on windows.

Revision 1837 - (view) (annotate) - [select for diffs]
Modified Fri Oct 3 02:03:07 2008 UTC (11 years, 1 month ago) by phornby
File length: 3285 byte(s)
Diff to previous 1811 , to selected 2005
Just getting run_tests going. I now recall that windows python will look for a .pyd
and not a .dll. So somehow we must install the python wrapper .dlls as a .pyds
I'll get to that later.

Revision 1811 - (view) (annotate) - [select for diffs]
Modified Thu Sep 25 23:11:13 2008 UTC (11 years, 1 month ago) by ksteube
File length: 3325 byte(s)
Diff to previous 1796 , to selected 2005
Copyright updated in all files


Revision 1796 - (view) (annotate) - [select for diffs]
Modified Wed Sep 17 01:45:46 2008 UTC (11 years, 2 months ago) by jfenwick
File length: 3348 byte(s)
Diff to previous 1705 , to selected 2005
Merged noarrayview branch onto trunk.



Revision 1705 - (view) (annotate) - [select for diffs]
Modified Thu Aug 14 05:56:40 2008 UTC (11 years, 3 months ago) by ksteube
File length: 3328 byte(s)
Diff to previous 1664 , to selected 2005
Branch scons-dev is hereby closed.
Some parts of scons scripts have been re-written.


Revision 1664 - (view) (annotate) - [select for diffs]
Modified Tue Jul 22 03:41:38 2008 UTC (11 years, 4 months ago) by ksteube
File length: 3071 byte(s)
Diff to previous 1662 , to selected 2005
Install() on Mac OS was naming shared libs file.dylib...not OK for our
libraries for python calling C++ (escriptcpp.so and finleycpp.so).
This is because python's dlopen() calls only look for .so files.


Revision 1662 - (view) (annotate) - [select for diffs]
Modified Tue Jul 22 01:49:21 2008 UTC (11 years, 4 months ago) by ksteube
File length: 3055 byte(s)
Diff to previous 1428 , to selected 2005
Ran a simple Escript program on Mac OS Darwin. Still much to do.


Revision 1428 - (view) (annotate) - [select for diffs]
Modified Wed Feb 27 08:07:11 2008 UTC (11 years, 8 months ago) by trankine
File length: 3025 byte(s)
Diff to previous 1388 , to selected 2005
Merge changes from windows port branch to test build on *nix not broken.

Revision 1388 - (view) (annotate) - [select for diffs]
Modified Fri Jan 11 07:45:58 2008 UTC (11 years, 10 months ago) by trankine
File length: 2632 byte(s)
Diff to previous 1387 , to selected 2005
And get the *(&(*&(* name right

Revision 1387 - (view) (annotate) - [select for diffs]
Modified Fri Jan 11 07:45:26 2008 UTC (11 years, 10 months ago) by trankine
Original Path: temp/escript/src/SConscript
File length: 2632 byte(s)
Diff to previous 1384 , to selected 2005
Restore the trunk that existed before the windows changes were committed to the (now moved to branches) old trunk.

Revision 1384 - (view) (annotate) - [select for diffs]
Modified Fri Jan 11 02:29:38 2008 UTC (11 years, 10 months ago) by phornby
Original Path: temp_trunk_copy/escript/src/SConscript
File length: 2632 byte(s)
Diff to previous 1312 , to selected 2005
Make a temp copy of the trunk before checking in the windows changes



Revision 1312 - (view) (annotate) - [select for diffs]
Modified Mon Sep 24 06:18:44 2007 UTC (12 years, 1 month ago) by ksteube
File length: 2632 byte(s)
Diff to previous 1246 , to selected 2005
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 1246 - (view) (annotate) - [select for diffs]
Modified Mon Aug 13 22:09:00 2007 UTC (12 years, 3 months ago) by phornby
File length: 2225 byte(s)
Diff to previous 1235 , to selected 2005
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 1235 - (view) (annotate) - [select for diffs]
Modified Mon Aug 13 00:25:29 2007 UTC (12 years, 3 months ago) by phornby
File length: 2456 byte(s)
Diff to previous 1139 , to selected 2005
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 1139 - (view) (annotate) - [select for diffs]
Modified Mon May 14 05:12:53 2007 UTC (12 years, 6 months ago) by ksteube
File length: 2541 byte(s)
Diff to previous 1131 , to selected 2005
Finished renaming of boost_lib to boost_libs and boost_lib_path to boost_libs_path.


Revision 1131 - (view) (annotate) - [select for diffs]
Modified Tue May 8 05:52:21 2007 UTC (12 years, 6 months ago) by gross
File length: 2537 byte(s)
Diff to previous 1063 , to selected 2005
netcdf c++ interface removed

Revision 1063 - (view) (annotate) - [select for diffs]
Modified Mon Mar 26 08:29:18 2007 UTC (12 years, 7 months ago) by gross
File length: 2426 byte(s)
Diff to previous 1023 , to selected 2005
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



Revision 1023 - (view) (annotate) - [select for diffs]
Modified Tue Mar 13 05:43:36 2007 UTC (12 years, 8 months ago) by gross
File length: 2426 byte(s)
Diff to previous 950 , to selected 2005
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 (12 years, 9 months ago) by gross
File length: 2217 byte(s)
Diff to previous 757 , to selected 2005
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 757 - (view) (annotate) - [select for diffs]
Modified Mon Jun 26 13:12:56 2006 UTC (13 years, 4 months ago) by woo409
File length: 2181 byte(s)
Diff to previous 700 , to selected 2005
+ Merge of intelc_win32 branch (revision 741:755) with trunk. Tested on iVEC altix (run_tests and py_tests all pass)


Revision 700 - (view) (annotate) - [select for diffs]
Modified Thu Apr 6 00:13:40 2006 UTC (13 years, 7 months ago) by gross
File length: 2131 byte(s)
Diff to previous 682 , to selected 2005
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 682 - (view) (annotate) - [select for diffs]
Modified Mon Mar 27 02:43:09 2006 UTC (13 years, 7 months ago) by robwdcock
File length: 1841 byte(s)
Diff to previous 577 , to selected 2005
+ 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 577 - (view) (annotate) - [select for diffs]
Modified Fri Mar 3 08:32:16 2006 UTC (13 years, 8 months ago) by gross
File length: 2829 byte(s)
Diff to previous 484 , to selected 2005
installation of new inc file

Revision 484 - (view) (annotate) - [select for diffs]
Modified Thu Feb 2 02:12:08 2006 UTC (13 years, 9 months ago) by jgs
File length: 2807 byte(s)
Diff to previous 481 , to selected 2005
add remainder of includes to SConscript includes install

Revision 481 - (view) (annotate) - [select for diffs]
Modified Wed Feb 1 05:57:50 2006 UTC (13 years, 9 months ago) by jgs
File length: 2002 byte(s)
Diff to previous 474 , to selected 2005
add mechanism to install .h files to inc directories
(still need to specify full lists of .h files to install)


Revision 474 - (view) (annotate) - [select for diffs]
Modified Mon Jan 30 04:23:44 2006 UTC (13 years, 9 months ago) by jgs
File length: 1805 byte(s)
Copied from: trunk/escript/src/Data/SConscript revision 469
Diff to previous 468 , to selected 2005
restructure escript source tree
move src/Data/* -> src
remove inc
modify #includes and cpppath settings accordingly


Revision 468 - (view) (annotate) - [select for diffs]
Modified Wed Jan 25 06:50:39 2006 UTC (13 years, 9 months ago) by jgs
Original Path: trunk/escript/src/Data/SConscript
File length: 1805 byte(s)
Diff to previous 392 , to selected 2005
reorganised esysUtils to remove inc directory

Revision 392 - (view) (annotate) - [select for diffs]
Modified Tue Dec 20 05:39:30 2005 UTC (13 years, 11 months ago) by gross
Original Path: trunk/escript/src/Data/SConscript
File length: 1805 byte(s)
Diff to previous 352 , to selected 2005
Utils added for compilation

Revision 352 - (view) (annotate) - [select for diffs]
Modified Wed Dec 14 02:21:37 2005 UTC (13 years, 11 months ago) by jgs
Original Path: trunk/escript/src/Data/SConscript
File length: 1781 byte(s)
Diff to previous 288 , to selected 2005
turns out Install() targets should also be made Default()
targets if you want them to actually reliably work!


Revision 288 - (view) (annotate) - [select for diffs]
Modified Fri Dec 2 01:55:04 2005 UTC (13 years, 11 months ago) by jgs
Original Path: trunk/escript/src/Data/SConscript
File length: 1754 byte(s)
Diff to previous 277 , to selected 2005
now automatically build unit tests as required based on dependencies
between unit tests and libraries


Revision 277 - (view) (annotate) - [select for diffs]
Modified Wed Nov 30 04:52:39 2005 UTC (13 years, 11 months ago) by jgs
Original Path: trunk/escript/src/Data/SConscript
File length: 1712 byte(s)
Diff to previous 223 , to selected 2005
explicitly define dependencies between modules


Revision 223 - (view) (annotate) - [select for diffs]
Modified Thu Nov 24 23:12:13 2005 UTC (13 years, 11 months ago) by jgs
Original Path: trunk/escript/src/Data/SConscript
File length: 1347 byte(s)
Diff to previous 192 , to selected 2005
pass in cc/cxx settings from config file

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


Revision 191 - (view) (annotate) - [select for diffs]
Modified Mon Nov 21 04:10:12 2005 UTC (14 years ago) by jgs
Original Path: trunk/escript/src/Data/SConscript
File length: 1259 byte(s)
Diff to previous 190 , to selected 2005
push platform dependent compiler flags and include directories up to library level scons files - these will eventually be brought in from external config files

Revision 190 - (view) (annotate) - [select for diffs]
Modified Mon Nov 21 03:27:42 2005 UTC (14 years ago) by jgs
Original Path: trunk/escript/src/Data/SConscript
File length: 1457 byte(s)
Diff to previous 188 , to selected 2005
pass in value for esysroot and use this to determine include file locations

Revision 188 - (view) (annotate) - [select for diffs]
Modified Mon Nov 21 01:20:26 2005 UTC (14 years ago) by jgs
Original Path: trunk/escript/src/Data/SConscript
File length: 1306 byte(s)
Diff to previous 181 , to selected 2005
explicitly add -fpic option to all compiler options lists
to ensure relocatable code is generated


Revision 181 - (view) (annotate) - [select for diffs]
Added Fri Nov 18 04:28:47 2005 UTC (14 years ago) by jgs
Original Path: trunk/escript/src/Data/SConscript
File length: 1300 byte(s)
Diff to selected 2005
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.

  Diffs between and
  Type of Diff should be a

  ViewVC Help
Powered by ViewVC 1.1.26