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

Log of /trunk/paso/src/SConscript

Parent Directory Parent Directory | Revision Log Revision Log


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

Revision 2479 - (view) (annotate) - [select for diffs]
Modified Thu Jun 18 06:50:37 2009 UTC (10 years, 2 months ago) by gross
File length: 2665 byte(s)
Diff to previous 2078 , to selected 1804
paso returns now some diagnostics. SCSL has been removed.


Revision 2078 - (view) (annotate) - [select for diffs]
Modified Thu Nov 20 16:10:10 2008 UTC (10 years, 9 months ago) by phornby
File length: 2714 byte(s)
Diff to previous 2057 , to selected 1804
Two changes.

1. Move blocktimer from escript to esysUtils.
2. Make it possible to link to paso as a DLL or .so.

Should have no effect on 'nix's

In respect of 1., blocktimer had begun to spring up everywhere, so
for the moment I thought it best to move it to the only other library that
pops up all over the place.

In respect of 2., paso needed to be a DLL in order to use the windows intelc /fast
option, which does aggressive multi-file optimisations. Even in its current form, it either
vectorises or parallelises  hundreds more loops in the esys system than appear in the pragmas.

In achieving 2. I have not been too delicate in adding

PASO_DLL_API

declarations to the .h files in paso/src. Only toward the end of the process of
the conversion, when the number of linker errors dropped below 20, say, did I choosy about what
functions in a header I declared PASO_DLL_API. As a result, there are likely to be many routines
declared as external functions symbols that are in fact internal to the paso DLL. 
Why is this an issue?  It prevents the intelc compiler from getting aggressive on the paso module.
With pain there is sometimes gain. At least all the DLL rules in windows give good
(non-microsoft) compiler writers a chance to really shine.

So, if you should see a PASO_DLL_API on a function in a paso header file,
and think to yourself, "that function is only called in paso, why export it?", then feel free to
delete the PASO_DLL_API export declaration.

Here's hoping for no breakage.....

Revision 2057 - (view) (annotate) - [select for diffs]
Modified Mon Nov 17 13:30:46 2008 UTC (10 years, 9 months ago) by phornby
File length: 2636 byte(s)
Diff to previous 1913 , to selected 1804
Prepare this file for the possibility of dynamic linkage.

SVN is doing something weird to me... I'm sure I committed this change already...

Revision 1913 - (view) (annotate) - [select for diffs]
Modified Thu Oct 23 08:27:33 2008 UTC (10 years, 10 months ago) by phornby
File length: 2450 byte(s)
Diff to previous 1844 , to selected 1804
Create Pattern_coupling.h as there were too many modules that implicitly defined these
functions. This checkin is to test the minimum number of files this change allows me to
include to get Pattern_coupling.c to compile correctly on the Altix.



Revision 1844 - (view) (annotate) - [select for diffs]
Modified Fri Oct 3 05:19:23 2008 UTC (10 years, 10 months ago) by artak
File length: 2430 byte(s)
Diff to previous 1819 , to selected 1804
This is prep for AMG solver. It is only a copy from RILU not actual AMG

Revision 1819 - (view) (annotate) - [select for diffs]
Modified Tue Sep 30 05:58:06 2008 UTC (10 years, 10 months ago) by artak
File length: 2396 byte(s)
Diff to previous 1811 , to selected 1804
Firs version of symmetric Gauss-Seidel preconditioner with coloring

Revision 1811 - (view) (annotate) - [select for diffs]
Modified Thu Sep 25 23:11:13 2008 UTC (10 years, 10 months ago) by ksteube
File length: 2383 byte(s)
Diff to previous 1804
Copyright updated in all files


Revision 1804 - (view) (annotate) - [selected]
Modified Wed Sep 24 07:52:19 2008 UTC (10 years, 11 months ago) by gross
File length: 2406 byte(s)
Diff to previous 1787
a robister version of the upwinding scheme

Revision 1787 - (view) (annotate) - [select for diffs]
Modified Mon Sep 15 01:36:34 2008 UTC (10 years, 11 months ago) by artak
File length: 2428 byte(s)
Diff to previous 1705 , to selected 1804
MINRES solver is added to escript. Additional 16 tests are added to run_simplesolve for MINRES and TFQMR solvers

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


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

Revision 1387 - (view) (annotate) - [select for diffs]
Modified Fri Jan 11 07:45:26 2008 UTC (11 years, 7 months ago) by trankine
Original Path: temp/paso/src/SConscript
File length: 1362 byte(s)
Diff to previous 1384 , to selected 1804
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, 7 months ago) by phornby
Original Path: temp_trunk_copy/paso/src/SConscript
File length: 1362 byte(s)
Diff to previous 1312 , to selected 1804
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 (11 years, 11 months ago) by ksteube
File length: 1362 byte(s)
Diff to previous 1133 , to selected 1804
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 1133 - (view) (annotate) - [select for diffs]
Modified Tue May 8 07:19:33 2007 UTC (12 years, 3 months ago) by gross
File length: 1185 byte(s)
Diff to previous 700 , to selected 1804
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 700 - (view) (annotate) - [select for diffs]
Modified Thu Apr 6 00:13:40 2006 UTC (13 years, 4 months ago) by gross
File length: 1148 byte(s)
Diff to previous 682 , to selected 1804
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, 4 months ago) by robwdcock
File length: 1390 byte(s)
Diff to previous 618 , to selected 1804
+ 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 618 - (view) (annotate) - [select for diffs]
Modified Wed Mar 22 04:02:38 2006 UTC (13 years, 5 months ago) by gross
File length: 2901 byte(s)
Diff to previous 584 , to selected 1804
mmio moced to paso

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

Revision 495 - (view) (annotate) - [select for diffs]
Modified Mon Feb 6 06:32:06 2006 UTC (13 years, 6 months ago) by gross
File length: 2742 byte(s)
Diff to previous 483 , to selected 1804
performance monitoring added. complies without PAPI.

Revision 483 - (view) (annotate) - [select for diffs]
Modified Thu Feb 2 02:10:15 2006 UTC (13 years, 6 months ago) by jgs
File length: 2689 byte(s)
Diff to previous 481 , to selected 1804
change includes to use PasoUtil.h, and add remainder
of includes to SConscript include install


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


Revision 466 - (view) (annotate) - [select for diffs]
Modified Wed Jan 25 01:25:18 2006 UTC (13 years, 7 months ago) by jgs
File length: 2311 byte(s)
Diff to previous 430 , to selected 1804
remove redundant inc dir from paso src tree

Revision 430 - (view) (annotate) - [select for diffs]
Modified Wed Jan 11 06:40:50 2006 UTC (13 years, 7 months ago) by gross
File length: 2313 byte(s)
Diff to previous 425 , to selected 1804
ILU has been replicated is called RILU (recursive ILU) now. ILU will now be reimplemented.

Revision 425 - (view) (annotate) - [select for diffs]
Modified Tue Jan 10 04:10:39 2006 UTC (13 years, 7 months ago) by gross
File length: 2277 byte(s)
Diff to previous 411 , to selected 1804
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 411 - (view) (annotate) - [select for diffs]
Modified Tue Jan 3 00:23:48 2006 UTC (13 years, 7 months ago) by gross
File length: 1932 byte(s)
Diff to previous 352 , to selected 1804
SCSL interface has moved


Revision 352 - (view) (annotate) - [select for diffs]
Modified Wed Dec 14 02:21:37 2005 UTC (13 years, 8 months ago) by jgs
File length: 2015 byte(s)
Diff to previous 288 , to selected 1804
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, 8 months ago) by jgs
File length: 1988 byte(s)
Diff to previous 223 , to selected 1804
now automatically build unit tests as required based on dependencies
between unit tests and libraries


Revision 223 - (view) (annotate) - [select for diffs]
Modified Thu Nov 24 23:12:13 2005 UTC (13 years, 9 months ago) by jgs
File length: 1952 byte(s)
Diff to previous 199 , to selected 1804
pass in cc/cxx settings from config file

Revision 199 - (view) (annotate) - [select for diffs]
Modified Tue Nov 22 04:57:00 2005 UTC (13 years, 9 months ago) by jgs
File length: 1955 byte(s)
Diff to previous 192 , to selected 1804
pass in static archiver flags 


Revision 192 - (view) (annotate) - [select for diffs]
Modified Mon Nov 21 04:52:14 2005 UTC (13 years, 9 months ago) by jgs
File length: 1918 byte(s)
Diff to previous 191 , to selected 1804
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 (13 years, 9 months ago) by jgs
File length: 1834 byte(s)
Diff to previous 190 , to selected 1804
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 (13 years, 9 months ago) by jgs
File length: 2033 byte(s)
Diff to previous 187 , to selected 1804
pass in value for esysroot and use this to determine include file locations

Revision 187 - (view) (annotate) - [select for diffs]
Added Mon Nov 21 01:15:26 2005 UTC (13 years, 9 months ago) by jgs
File length: 1822 byte(s)
Diff to selected 1804
added first draft of scons construct/config scripts for paso 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