/[escript]/branches/schroedinger_upto1946/SConstruct
ViewVC logotype

Log of /branches/schroedinger_upto1946/SConstruct

Parent Directory Parent Directory | Revision Log Revision Log


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

Revision 1950 - (view) (annotate) - [select for diffs]
Modified Thu Oct 30 00:59:34 2008 UTC (9 years ago) by jfenwick
File length: 26468 byte(s)
Diff to previous 1948
Branch commit
Brought schroedinger merge upto trunk@1946.


Revision 1948 - (view) (annotate) - [select for diffs]
Modified Wed Oct 29 23:44:45 2008 UTC (9 years ago) by jfenwick
File length: 26202 byte(s)
Diff to previous 1947
Branch commit.
Merge trunk changes upto 1870 (using the moreshared branchs record) to 
schroedinger.



Revision 1947 - (view) (annotate) - [select for diffs]
Modified Wed Oct 29 23:19:45 2008 UTC (9 years ago) by jfenwick
File length: 26165 byte(s)
Diff to previous 1858
This does not actually have the changes in it yet.


Revision 1858 - (view) (annotate) - [select for diffs]
Modified Wed Oct 8 00:28:28 2008 UTC (9 years, 1 month ago) by jfenwick
Original Path: branches/schroedinger/SConstruct
File length: 26165 byte(s)
Diff to previous 1813
Branch of branch moreshared_from_1812 at revision 1857.


Revision 1813 - (view) (annotate) - [select for diffs]
Modified Fri Sep 26 00:58:05 2008 UTC (9 years, 1 month ago) by jfenwick
Original Path: branches/more_shared_ptrs_from_1812/SConstruct
File length: 26165 byte(s)
Diff to previous 1811
Branching to experiment with proxies and shared pointers.


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


Revision 1796 - (view) (annotate) - [select for diffs]
Modified Wed Sep 17 01:45:46 2008 UTC (9 years, 2 months ago) by jfenwick
Original Path: trunk/SConstruct
File length: 26000 byte(s)
Diff to previous 1789
Merged noarrayview branch onto trunk.



Revision 1789 - (view) (annotate) - [select for diffs]
Modified Mon Sep 15 08:34:44 2008 UTC (9 years, 2 months ago) by phornby
Original Path: trunk/SConstruct
File length: 26000 byte(s)
Diff to previous 1785
Near line 288 of SConstruct.

Fixed the HAVE_GETHOSTNAME environment variable setting.
The the test had a "not" that should not be there,
and the wrong env was being Append()'ed.

On linux, this resulted in HAVE_GETHOSTNAME not being -D'ed.

the strcpy at line 78 of 
escript/src/Utils.cpp

was flagged by gcc as an error because
strcpy is not declared on the compilation branch
that compiles if HAVE_GETHOSTNAME is not set.
I have not fixed this.

Also, the hostname buffer is only 64 char long.
Why limit the length of the hostname,
admitting buffer overflow, in a .cpp file?
Why use strcpy in C++?




Revision 1785 - (view) (annotate) - [select for diffs]
Modified Thu Sep 11 23:35:42 2008 UTC (9 years, 2 months ago) by ksteube
Original Path: trunk/SConstruct
File length: 25999 byte(s)
Diff to previous 1771
Config variables such as boost_lib_path and netcdf_lib_path are stored in
the wrapper script bin/finleypython so the user gets the proper environment
automatically


Revision 1771 - (view) (annotate) - [select for diffs]
Modified Mon Sep 8 22:47:55 2008 UTC (9 years, 2 months ago) by ksteube
Original Path: trunk/SConstruct
File length: 24866 byte(s)
Diff to previous 1756
Removed failing test until we fix a bug.
Fixed several compiler warnings.


Revision 1756 - (view) (annotate) - [select for diffs]
Modified Mon Sep 8 01:45:46 2008 UTC (9 years, 2 months ago) by ksteube
Original Path: trunk/SConstruct
File length: 24758 byte(s)
Diff to previous 1753
First version of a wrapper script that sets LD_LIBRARY_PATH and PYTHONPATH

Not yet ready for general use


Revision 1753 - (view) (annotate) - [select for diffs]
Modified Sun Sep 7 22:01:23 2008 UTC (9 years, 2 months ago) by ksteube
Original Path: trunk/SConstruct
File length: 24312 byte(s)
Diff to previous 1729
Test suite fails due to missing arg in call to Finley_Mesh_createMappings.
Added NULL arg, but still need to find proper fix as loadMesh does not work.

Adjusted SConstruct to delete pythonMPI if not compiled for MPI.


Revision 1729 - (view) (annotate) - [select for diffs]
Modified Tue Aug 26 06:48:40 2008 UTC (9 years, 2 months ago) by ksteube
Original Path: trunk/SConstruct
File length: 24377 byte(s)
Diff to previous 1708
Added prefix/lib go LD_LIBRARY_PATH


Revision 1708 - (view) (annotate) - [select for diffs]
Modified Thu Aug 14 22:42:24 2008 UTC (9 years, 3 months ago) by ksteube
Original Path: trunk/SConstruct
File length: 24365 byte(s)
Diff to previous 1705
Added newline at end of file TFQMR.c because it is an error for icc.
Turned useumfpack off by default.


Revision 1705 - (view) (annotate) - [select for diffs]
Modified Thu Aug 14 05:56:40 2008 UTC (9 years, 3 months ago) by ksteube
Original Path: trunk/SConstruct
File length: 24322 byte(s)
Diff to previous 1663
Branch scons-dev is hereby closed.
Some parts of scons scripts have been re-written.


Revision 1663 - (view) (annotate) - [select for diffs]
Modified Tue Jul 22 02:56:21 2008 UTC (9 years, 4 months ago) by artak
Original Path: trunk/SConstruct
File length: 33254 byte(s)
Diff to previous 1634
-pedantic_errors commented for compiling in MAC OS X

Revision 1634 - (view) (annotate) - [select for diffs]
Modified Sat Jul 12 09:08:33 2008 UTC (9 years, 4 months ago) by phornby
Original Path: trunk/SConstruct
File length: 33243 byte(s)
Diff to previous 1628
linux_gcc_eg_options.py:
remove the std99 option, it is no longer needed as the code compiles without
C 1999 extension (need for these extensions elinminated in windows port).
Turn on all warnings except unknown pragmas. Should catch a lot of stuff.

SConstruct:
Impassioned plea

system_dep.h:
Add the standard incantation for dealing with const declarations
in C code called from C and C++

blocktimer:
Get the calling interface right for C code called from C and C++
and use __const as defined in system_dep.h
(Should be re-factored into compiler_dep.h file).

MeshAdapterFactory.cpp:
Since we have (effectively) no control over netCDF policy,
cast const char *'s to char *'s



Revision 1628 - (view) (annotate) - [select for diffs]
Modified Fri Jul 11 13:12:46 2008 UTC (9 years, 4 months ago) by phornby
Original Path: trunk/SConstruct
File length: 33169 byte(s)
Diff to previous 1560

Merge in /branches/windows_from_1456_trunk_1620_merged_in branch.

You will find a preserved pre-merge trunk in tags under tags/trunk_at_1625.
That will be useful for diffing & checking on my stupidity.

Here is a list of the conflicts and their resolution at this
point in time.


=================================================================================
(LLWS == looks like white space).

finley/src/Assemble_addToSystemMatrix.c - resolve to branch - unused var. may be wrong.....
finley/src/CPPAdapter/SystemMatrixAdapter.cpp - resolve to branch - LLWS
finley/src/CPPAdapter/MeshAdapter.cpp - resolve to branch - LLWS
paso/src/PCG.c - resolve to branch - unused var fixes.
paso/src/SolverFCT.c - resolve to branch - LLWS
paso/src/FGMRES.c - resolve to branch - LLWS
paso/src/Common.h - resolve to trunk version. It's omp.h's include... not sure it's needed,
but for the sake of saftey.....
paso/src/Functions.c - resolve to branch version, indentation/tab removal and return error
on bad unimplemented Paso_FunctionCall.
paso/src/SolverFCT_solve.c - resolve to branch version, unused vars
paso/src/SparseMatrix_MatrixVector.c - resolve to branch version, unused vars.
escript/src/Utils.cpp - resloved to branch, needs WinSock2.h
escript/src/DataExpanded.cpp - resolved to branch version - LLWS
escript/src/DataFactory.cpp - resolve to branch version
=================================================================================

This currently passes tests on linux (debian), but is not checked on windows or Altix yet.

This checkin is to make a trunk I can check out for windows to do tests on it.

Known outstanding problem is in the operator=() method of exceptions
causing warning messages on the intel compilers.

May the God of doughnuts have mercy on my soul.



Revision 1560 - (view) (annotate) - [select for diffs]
Modified Wed May 21 05:55:30 2008 UTC (9 years, 6 months ago) by ksteube
Original Path: trunk/SConstruct
File length: 32780 byte(s)
Diff to previous 1559
Improvements to Savanna configuration


Revision 1559 - (view) (annotate) - [select for diffs]
Modified Wed May 21 04:27:15 2008 UTC (9 years, 6 months ago) by ksteube
Original Path: trunk/SConstruct
File length: 32763 byte(s)
Diff to previous 1459
Compiles and runs on Savanna (hostname service0)


Revision 1459 - (view) (annotate) - [select for diffs]
Modified Thu Mar 27 01:49:10 2008 UTC (9 years, 7 months ago) by ksteube
Original Path: trunk/SConstruct
File length: 32647 byte(s)
Diff to previous 1428
Implemented ParMETIS for mesh partition optimization under MPI.
Documented optimize=True in User Guide for Brick() and Rectangle().


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

Revision 1416 - (view) (annotate) - [select for diffs]
Modified Mon Feb 25 03:56:17 2008 UTC (9 years, 9 months ago) by ksteube
Original Path: trunk/SConstruct
File length: 31857 byte(s)
Diff to previous 1415
Set version number to 0 in case it's empty.


Revision 1415 - (view) (annotate) - [select for diffs]
Modified Thu Feb 21 04:57:17 2008 UTC (9 years, 9 months ago) by ksteube
Original Path: trunk/SConstruct
File length: 31811 byte(s)
Diff to previous 1391
Recent fixes have remedied problems with running OpenMP/MPI mixed mode programming.


Revision 1391 - (view) (annotate) - [select for diffs]
Modified Mon Jan 14 03:54:57 2008 UTC (9 years, 10 months ago) by gross
Original Path: trunk/SConstruct
File length: 31918 byte(s)
Diff to previous 1390
a waring is printed if the revision number could not be recovered.

Revision 1390 - (view) (annotate) - [select for diffs]
Modified Mon Jan 14 03:46:11 2008 UTC (9 years, 10 months ago) by gross
Original Path: trunk/SConstruct
File length: 31884 byte(s)
Diff to previous 1389
typo fixed.

Revision 1389 - (view) (annotate) - [select for diffs]
Modified Mon Jan 14 03:31:57 2008 UTC (9 years, 10 months ago) by gross
Original Path: trunk/SConstruct
File length: 31887 byte(s)
Diff to previous 1388
a hopefully more robust way of setting the revision number.

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

Revision 1387 - (view) (annotate) - [select for diffs]
Modified Fri Jan 11 07:45:26 2008 UTC (9 years, 10 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 1384 - (view) (annotate) - [select for diffs]
Modified Fri Jan 11 02:29:38 2008 UTC (9 years, 10 months ago) by phornby
Original Path: temp_trunk_copy/SConstruct
File length: 31810 byte(s)
Diff to previous 1375
Make a temp copy of the trunk before checking in the windows changes



Revision 1375 - (view) (annotate) - [select for diffs]
Modified Wed Jan 9 00:15:05 2008 UTC (9 years, 10 months ago) by gross
Original Path: trunk/SConstruct
File length: 31810 byte(s)
Diff to previous 1374
bug in interpolation at reduced face elements fixed.

Revision 1374 - (view) (annotate) - [select for diffs]
Modified Tue Jan 8 09:37:55 2008 UTC (9 years, 10 months ago) by gross
Original Path: trunk/SConstruct
File length: 31805 byte(s)
Diff to previous 1360
some changes to get things going on the cognac.ivec.org.

Revision 1360 - (view) (annotate) - [select for diffs]
Modified Thu Dec 13 05:05:00 2007 UTC (9 years, 11 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 1354 - (view) (annotate) - [select for diffs]
Modified Wed Nov 28 02:23:30 2007 UTC (9 years, 11 months ago) by trankine
Original Path: trunk/SConstruct
File length: 31325 byte(s)
Diff to previous 1348
* rm and touch are not valid windows commands - use the scons provided methods.

Revision 1348 - (view) (annotate) - [select for diffs]
Modified Mon Nov 19 00:21:36 2007 UTC (10 years 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 (10 years 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 (10 years 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 1324 - (view) (annotate) - [select for diffs]
Modified Sun Sep 30 23:35:17 2007 UTC (10 years, 1 month ago) by ksteube
Original Path: trunk/SConstruct
File length: 30773 byte(s)
Diff to previous 1312
Interval mesh type has been removed from the User Guide
Adjusted getVersion method


Revision 1312 - (view) (annotate) - [select for diffs]
Modified Mon Sep 24 06:18:44 2007 UTC (10 years, 2 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 1250 - (view) (annotate) - [select for diffs]
Modified Thu Aug 16 02:54:42 2007 UTC (10 years, 3 months ago) by ksteube
Original Path: trunk/SConstruct
File length: 25454 byte(s)
Diff to previous 1248
Minor repairs to scons files


Revision 1248 - (view) (annotate) - [select for diffs]
Modified Tue Aug 14 05:20:39 2007 UTC (10 years, 3 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 1247 - (view) (annotate) - [select for diffs]
Modified Tue Aug 14 01:29:20 2007 UTC (10 years, 3 months ago) by ksteube
Original Path: trunk/SConstruct
File length: 25529 byte(s)
Diff to previous 1246
New python method getVersion() which returns the Subversion revision
from which escript was compiled


Revision 1246 - (view) (annotate) - [select for diffs]
Modified Mon Aug 13 22:09:00 2007 UTC (10 years, 3 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 1244 - (view) (annotate) - [select for diffs]
Modified Mon Aug 13 07:13:17 2007 UTC (10 years, 3 months ago) by phornby
Original Path: trunk/SConstruct
File length: 25044 byte(s)
Diff to previous 1243
use env['PROGSUFFIX'] instead of IS_WINDOWS_PLATFORM for the RunUnitTest builder.


Revision 1243 - (view) (annotate) - [select for diffs]
Modified Mon Aug 13 06:48:37 2007 UTC (10 years, 3 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 (10 years, 3 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 (10 years, 3 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 (10 years, 4 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 (10 years, 4 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 (10 years, 4 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 1185 - (view) (annotate) - [select for diffs]
Modified Thu May 31 04:33:31 2007 UTC (10 years, 5 months ago) by gross
Original Path: trunk/SConstruct
File length: 24206 byte(s)
Diff to previous 1164
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 (10 years, 6 months ago) by jongui
Original Path: trunk/SConstruct
File length: 24206 byte(s)
Diff to previous 1163
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 (10 years, 6 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 1160 - (view) (annotate) - [select for diffs]
Modified Wed May 23 00:44:01 2007 UTC (10 years, 6 months ago) by gross
Original Path: trunk/SConstruct
File length: 24071 byte(s)
Diff to previous 1149
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 (10 years, 6 months ago) by gross
Original Path: trunk/SConstruct
File length: 23926 byte(s)
Diff to previous 1141
some fixes from the windows version

Revision 1141 - (view) (annotate) - [select for diffs]
Modified Tue May 15 04:24:51 2007 UTC (10 years, 6 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 (10 years, 6 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 (10 years, 6 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 1083 - (view) (annotate) - [select for diffs]
Modified Thu Apr 12 01:15:01 2007 UTC (10 years, 7 months ago) by ksteube
Original Path: trunk/SConstruct
File length: 20021 byte(s)
Diff to previous 1039
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 (10 years, 8 months ago) by phornby
Original Path: trunk/SConstruct
File length: 19955 byte(s)
Diff to previous 1028
Just trying to get the intelc version going.



Revision 1028 - (view) (annotate) - [select for diffs]
Modified Wed Mar 14 00:15:24 2007 UTC (10 years, 8 months 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 (10 years, 8 months 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 1024 - (view) (annotate) - [select for diffs]
Modified Tue Mar 13 06:31:50 2007 UTC (10 years, 8 months ago) by gross
Original Path: trunk/SConstruct
File length: 19446 byte(s)
Diff to previous 1023
import of PATH

Revision 1023 - (view) (annotate) - [select for diffs]
Modified Tue Mar 13 05:43:36 2007 UTC (10 years, 8 months 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 1021 - (view) (annotate) - [select for diffs]
Modified Tue Mar 13 02:06:30 2007 UTC (10 years, 8 months ago) by gross
Original Path: trunk/SConstruct
File length: 19207 byte(s)
Diff to previous 965
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 (10 years, 9 months ago) by gross
Original Path: trunk/SConstruct
File length: 19185 byte(s)
Diff to previous 961
johns local setting removed.

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

Revision 958 - (view) (annotate) - [select for diffs]
Modified Tue Feb 13 01:08:39 2007 UTC (10 years, 9 months ago) by gross
Original Path: trunk/SConstruct
File length: 19186 byte(s)
Diff to previous 950
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 (10 years, 9 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 898 - (view) (annotate) - [select for diffs]
Modified Sun Nov 12 23:56:26 2006 UTC (11 years ago) by gross
Original Path: trunk/SConstruct
File length: 18558 byte(s)
Diff to previous 863
first checkin of pycad (gmsh pythoin wrapper)

Revision 863 - (view) (annotate) - [select for diffs]
Modified Wed Oct 4 01:01:15 2006 UTC (11 years, 1 month 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 817 - (view) (annotate) - [select for diffs]
Modified Sat Aug 26 03:08:52 2006 UTC (11 years, 3 months ago) by ksteube
Original Path: trunk/SConstruct
File length: 18751 byte(s)
Diff to previous 807
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 (11 years, 3 months ago) by gross
Original Path: trunk/SConstruct
File length: 18635 byte(s)
Diff to previous 806
new target for users guide

Revision 806 - (view) (annotate) - [select for diffs]
Modified Thu Aug 10 11:58:52 2006 UTC (11 years, 3 months ago) by gross
Original Path: trunk/SConstruct
File length: 18599 byte(s)
Diff to previous 805
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 (11 years, 3 months ago) by gross
Original Path: trunk/SConstruct
File length: 17934 byte(s)
Diff to previous 792
first steps toward UMFPACK

Revision 792 - (view) (annotate) - [select for diffs]
Modified Fri Jul 28 10:37:16 2006 UTC (11 years, 3 months ago) by gross
Original Path: trunk/SConstruct
File length: 16547 byte(s)
Diff to previous 786
frame for pyvisi set up

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

Revision 784 - (view) (annotate) - [select for diffs]
Modified Wed Jul 19 05:38:14 2006 UTC (11 years, 4 months ago) by bcumming
Original Path: trunk/SConstruct
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 (11 years, 4 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 762 - (view) (annotate) - [select for diffs]
Modified Fri Jun 30 00:09:19 2006 UTC (11 years, 4 months ago) by bcumming
Original Path: trunk/SConstruct
File length: 16547 byte(s)
Diff to previous 759
- 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 (11 years, 4 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 757 - (view) (annotate) - [select for diffs]
Modified Mon Jun 26 13:12:56 2006 UTC (11 years, 5 months ago) by woo409
Original Path: trunk/SConstruct
File length: 15099 byte(s)
Diff to previous 751
+ 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 (11 years, 5 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 722 - (view) (annotate) - [select for diffs]
Modified Mon May 1 11:49:18 2006 UTC (11 years, 6 months ago) by gross
Original Path: trunk/SConstruct
File length: 15078 byte(s)
Diff to previous 720
abstract added in users guide added

Revision 720 - (view) (annotate) - [select for diffs]
Modified Thu Apr 27 10:16:05 2006 UTC (11 years, 6 months ago) by gross
Original Path: trunk/SConstruct
File length: 15270 byte(s)
Diff to previous 712
formatting errors in epydoc tags fixed

Revision 712 - (view) (annotate) - [select for diffs]
Modified Thu Apr 27 02:08:50 2006 UTC (11 years, 7 months ago) by elspeth
Original Path: trunk/SConstruct
File length: 15254 byte(s)
Diff to previous 707
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 (11 years, 7 months ago) by gross
Original Path: trunk/SConstruct
File length: 15036 byte(s)
Diff to previous 706
latex build documentation is working now

Revision 706 - (view) (annotate) - [select for diffs]
Modified Sat Apr 8 16:13:02 2006 UTC (11 years, 7 months ago) by gross
Original Path: trunk/SConstruct
File length: 14072 byte(s)
Diff to previous 705
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 (11 years, 7 months ago) by gross
Original Path: trunk/SConstruct
File length: 13972 byte(s)
Diff to previous 700
python tests are allmost working

Revision 700 - (view) (annotate) - [select for diffs]
Modified Thu Apr 6 00:13:40 2006 UTC (11 years, 7 months 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 694 - (view) (annotate) - [select for diffs]
Modified Thu Mar 30 11:35:55 2006 UTC (11 years, 7 months ago) by gross
Original Path: trunk/SConstruct
File length: 12456 byte(s)
Diff to previous 691
pyvisi builds now. tests still to be fixed.

Revision 691 - (view) (annotate) - [select for diffs]
Modified Wed Mar 29 03:43:36 2006 UTC (11 years, 7 months 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 (11 years, 7 months 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 (11 years, 7 months 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 685 - (view) (annotate) - [select for diffs]
Modified Mon Mar 27 22:16:33 2006 UTC (11 years, 7 months ago) by gross
Original Path: trunk/SConstruct
File length: 12311 byte(s)
Diff to previous 684
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 (11 years, 8 months 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 (11 years, 8 months 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 643 - (view) (annotate) - [select for diffs]
Modified Fri Mar 24 00:28:41 2006 UTC (11 years, 8 months ago) by elspeth
Original Path: trunk/SConstruct
File length: 1105 byte(s)
Diff to previous 618
More copyright info added.


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

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

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

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

Revision 498 - (view) (annotate) - [select for diffs]
Modified Tue Feb 7 01:53:47 2006 UTC (11 years, 9 months ago) by jgs
Original Path: trunk/SConstruct
File length: 647 byte(s)
Diff to previous 455
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 (11 years, 10 months ago) by jgs
Original Path: trunk/SConstruct
File length: 649 byte(s)
Diff to previous 425
minor comment and formatting changes


Revision 425 - (view) (annotate) - [select for diffs]
Modified Tue Jan 10 04:10:39 2006 UTC (11 years, 10 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 380 - (view) (annotate) - [select for diffs]
Modified Mon Dec 19 01:54:51 2005 UTC (11 years, 11 months ago) by gross
Original Path: trunk/SConstruct
File length: 1306 byte(s)
Diff to previous 370
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 (11 years, 11 months ago) by cochrane
Original Path: trunk/SConstruct
File length: 1304 byte(s)
Diff to previous 340
Updated to allow for building of API documentation.


Revision 340 - (view) (annotate) - [select for diffs]
Modified Mon Dec 12 05:10:45 2005 UTC (11 years, 11 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 288 - (view) (annotate) - [select for diffs]
Modified Fri Dec 2 01:55:04 2005 UTC (11 years, 11 months ago) by jgs
Original Path: trunk/SConstruct
File length: 1144 byte(s)
Diff to previous 268
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 (11 years, 11 months ago) by jgs
Original Path: trunk/SConstruct
File length: 1151 byte(s)
Diff to previous 246
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 (11 years, 11 months ago) by jgs
Original Path: trunk/SConstruct
File length: 1110 byte(s)
Diff to previous 214
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 (12 years 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 (12 years 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 (12 years 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.

  Diffs between and
  Type of Diff should be a

  ViewVC Help
Powered by ViewVC 1.1.26