/[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 6404 - (view) (annotate) - [select for diffs]
Modified Thu Sep 22 05:37:56 2016 UTC (14 months, 3 weeks ago) by jfenwick
File length: 31607 byte(s)
Diff to previous 6333
Fixing the openmp options for icpc


Revision 6333 - (view) (annotate) - [select for diffs]
Modified Fri Jul 1 03:58:43 2016 UTC (17 months, 2 weeks ago) by caltinay
File length: 31532 byte(s)
Diff to previous 6297
write some more features into buildvars.


Revision 6297 - (view) (annotate) - [select for diffs]
Modified Fri Jun 17 00:05:11 2016 UTC (18 months ago) by caltinay
File length: 31339 byte(s)
Diff to previous 6287
make lazy-related config options tristate variables.


Revision 6287 - (view) (annotate) - [select for diffs]
Modified Wed Jun 15 06:33:57 2016 UTC (18 months ago) by caltinay
File length: 31449 byte(s)
Diff to previous 6255
add c++11 flag to all compilers by default.


Revision 6255 - (view) (annotate) - [select for diffs]
Modified Thu Jun 2 06:52:06 2016 UTC (18 months, 2 weeks ago) by caltinay
File length: 31439 byte(s)
Diff to previous 6249
modified build summary so we save some space and make clear what solvers
are available.


Revision 6249 - (view) (annotate) - [select for diffs]
Modified Thu Jun 2 04:37:00 2016 UTC (18 months, 2 weeks ago) by caltinay
File length: 30721 byte(s)
Diff to previous 6248
fixes #368 - if this is openmpi try to get the version to determine default
options.


Revision 6248 - (view) (annotate) - [select for diffs]
Modified Thu Jun 2 04:13:21 2016 UTC (18 months, 2 weeks ago) by caltinay
File length: 30395 byte(s)
Diff to previous 6247
more scons changes:
- replaced p.stdout.read... by p.communicate as recommended by doco
- moved python lib name enquiry logic from options file into dependencies.py
- reporting python version in summary now.


Revision 6247 - (view) (annotate) - [select for diffs]
Modified Thu Jun 2 02:35:41 2016 UTC (18 months, 2 weeks ago) by caltinay
File length: 30358 byte(s)
Diff to previous 6241
Another change that may break things...
- added new TristateVariable to scons
- use it only for lapack for now whose value now defaults to 'auto', i.e.
   if mkl is installed, use it, otherwise try to link with atlas, all
   unless longindices is True.
- updated options files accordingly.


Revision 6241 - (view) (annotate) - [select for diffs]
Modified Wed Jun 1 06:00:06 2016 UTC (18 months, 2 weeks ago) by caltinay
File length: 30434 byte(s)
Diff to previous 6184
**Warning, this may break your build**
- Bumped required options version to 203 - new options for trilinos, paso, weipa
- scons/templates/README_FIRST is now the file that explains all the options,
  added comment to README but need to change install guide still.
- removed some obsolete options files
- removed most comments from template files, they now refer to README_FIRST
- removed usepython3 option as we now determine this based on python version
  string.
- enabled use of numpy.h with python 3 (last commit should have fixed the
  issues)


Revision 6184 - (view) (annotate) - [select for diffs]
Modified Wed Apr 27 01:30:57 2016 UTC (19 months, 3 weeks ago) by caltinay
File length: 31010 byte(s)
Diff to previous 6174
more fixes to weipa readerlib build


Revision 6174 - (view) (annotate) - [select for diffs]
Modified Fri Apr 15 03:41:03 2016 UTC (20 months ago) by caltinay
File length: 30980 byte(s)
Diff to previous 6167
Some reorganisation of EscriptParams and related changes.
We now distinguish between modifiable parameters and build features.
To interrogate the latter use:
escript::hasFeature()  [ python: escript.hasFeature() ]
and
escript::listFeatures() [ python: escript.listFeatures() ]

I have decided to add specific getters for the remaining few parameters to
avoid the penalty of string comparisons and to remove the wealth of friend
declarations with Data* classes.

Also made some changes in SConstruct to make sure we set *all* preprocessor
directives *before* building anything.

Still to do is dealing with checks for direct solver and gmsh. The latter needs
to be a runtime check rather than a compile time check.


Revision 6167 - (view) (annotate) - [select for diffs]
Modified Tue Apr 12 09:34:03 2016 UTC (20 months ago) by caltinay
File length: 31006 byte(s)
Diff to previous 6137
forgot to commit.


Revision 6137 - (view) (annotate) - [select for diffs]
Modified Wed Apr 6 01:57:52 2016 UTC (20 months, 1 week ago) by caltinay
File length: 30958 byte(s)
Diff to previous 6124
new configure check for working complex std::acos


Revision 6124 - (view) (annotate) - [select for diffs]
Modified Tue Apr 5 03:23:12 2016 UTC (20 months, 1 week ago) by caltinay
File length: 31109 byte(s)
Diff to previous 6119
Fixing python module build on OS X. Added PythonModule builder so we do this generically now.

Revision 6119 - (view) (annotate) - [select for diffs]
Modified Sun Apr 3 23:36:59 2016 UTC (20 months, 2 weeks ago) by caltinay
File length: 30877 byte(s)
Diff to previous 6112
merging trilinos branch to trunk.
We can now build with trilinos and use it instead of paso for single PDEs.
There are some more things to be done...


Revision 6112 - (view) (annotate) - [select for diffs]
Modified Thu Mar 31 09:40:10 2016 UTC (20 months, 2 weeks ago) by jfenwick
File length: 33731 byte(s)
Diff to previous 6103
Relicense all the things!



Revision 6103 - (view) (annotate) - [select for diffs]
Modified Wed Mar 30 05:01:49 2016 UTC (20 months, 2 weeks ago) by jfenwick
File length: 33741 byte(s)
Diff to previous 6098
Add variable to control using replacement acos on broken OSX

Revision 6098 - (view) (annotate) - [select for diffs]
Modified Tue Mar 29 02:21:44 2016 UTC (20 months, 2 weeks ago) by jfenwick
File length: 33590 byte(s)
Diff to previous 6035
Remove "within object" checks for sharing from normal codepath

Something about the way the checks were being done, slowed things down.
Now, you will only get those checks if you define SLOWSHARECHECK



Revision 6035 - (view) (annotate) - [select for diffs]
Modified Wed Mar 9 00:39:20 2016 UTC (21 months, 1 week ago) by caltinay
File length: 33556 byte(s)
Diff to previous 6034
reverted accidental commit of SConstruct.


Revision 6034 - (view) (annotate) - [select for diffs]
Modified Wed Mar 9 00:37:57 2016 UTC (21 months, 1 week ago) by caltinay
File length: 33549 byte(s)
Diff to previous 6010
a few changes to GroupTest / utest:
GroupTest class now takes a name parameter that is used as (shell) function
name in utest for the test group.
By default all tests are run as before but one can now do:
./utest.sh build '-t2' escriptcpp
to only run the escript c++ unit tests.
Also tweaked a couple things so utest.sh does now work with dash.


Revision 6010 - (view) (annotate) - [select for diffs]
Modified Wed Mar 2 04:26:26 2016 UTC (21 months, 2 weeks ago) by caltinay
File length: 33556 byte(s)
Diff to previous 6004
silence the auto_ptr deprecation warning on savanna.


Revision 6004 - (view) (annotate) - [select for diffs]
Modified Tue Mar 1 23:43:55 2016 UTC (21 months, 2 weeks ago) by caltinay
File length: 33484 byte(s)
Diff to previous 6001
removed build_shared from most files.
esysUtils is gone and paso now has to be a shared lib to allow python
bindings.
I haven't bumped the options file version yet as there's more to come
before the release (trilinos etc) and the plan is to overhaul the scons
stuff once again.


Revision 6001 - (view) (annotate) - [select for diffs]
Modified Tue Mar 1 05:01:49 2016 UTC (21 months, 2 weeks ago) by caltinay
File length: 33575 byte(s)
Diff to previous 5939
Bye bye esysUtils.
Also removed first.h as escript/DataTypes.h is now required everywhere
and fulfills that role by including a boost python header first.


Revision 5939 - (view) (annotate) - [select for diffs]
Modified Thu Feb 18 10:04:32 2016 UTC (21 months, 4 weeks ago) by caltinay
File length: 34020 byte(s)
Diff to previous 5929
added -std=c++11 unconditionally in sconstruct since we can't compile
without.


Revision 5929 - (view) (annotate) - [select for diffs]
Modified Wed Feb 17 07:40:00 2016 UTC (21 months, 4 weeks ago) by caltinay
File length: 33998 byte(s)
Diff to previous 5863
Merged pasowrap into paso.
Unfortunately, this required touching quite a few files.
build_shared now defaults to true but will likely disappear altogether
once esysUtils disappears.


Revision 5863 - (view) (annotate) - [select for diffs]
Modified Wed Jan 13 02:25:48 2016 UTC (23 months ago) by jfenwick
File length: 34405 byte(s)
Diff to previous 5853
Copyright dates updated.
\version for doxygen to read


Revision 5853 - (view) (annotate) - [select for diffs]
Modified Tue Dec 15 01:19:33 2015 UTC (2 years ago) by jfenwick
File length: 34405 byte(s)
Diff to previous 5851
bringing changes over from debian for 4.1
The quilt patch series do not make sense at the moment because most of them will already be encorporated 


Revision 5851 - (view) (annotate) - [select for diffs]
Modified Thu Dec 10 05:09:35 2015 UTC (2 years ago) by jfenwick
File length: 34445 byte(s)
Diff to previous 5814
changes to support fixing libraries build on osx - enable with osx_dependency_fix.  Also added options file for OSX.11 and homebrew

Revision 5814 - (view) (annotate) - [select for diffs]
Modified Fri Oct 2 04:52:56 2015 UTC (2 years, 2 months ago) by jfenwick
File length: 34135 byte(s)
Diff to previous 5811
Allow openmpi to execute when there is no rsh/ssh

Revision 5811 - (view) (annotate) - [select for diffs]
Modified Sat Sep 26 02:10:31 2015 UTC (2 years, 2 months ago) by jfenwick
File length: 34118 byte(s)
Diff to previous 5802
Running sanity check from build directory


Revision 5802 - (view) (annotate) - [select for diffs]
Modified Wed Sep 23 05:17:26 2015 UTC (2 years, 2 months ago) by jfenwick
File length: 33993 byte(s)
Diff to previous 5801
Trying again to default to sanity.


Revision 5801 - (view) (annotate) - [select for diffs]
Modified Tue Sep 22 10:37:07 2015 UTC (2 years, 2 months ago) by jfenwick
File length: 33686 byte(s)
Diff to previous 5800
move sanity out of always build until ordering can be resolved

Revision 5800 - (view) (annotate) - [select for diffs]
Modified Tue Sep 22 09:42:58 2015 UTC (2 years, 2 months ago) by jfenwick
File length: 33585 byte(s)
Diff to previous 5798
Fixing default builds

Revision 5798 - (view) (annotate) - [select for diffs]
Modified Tue Sep 22 04:22:12 2015 UTC (2 years, 2 months ago) by jfenwick
File length: 33595 byte(s)
Diff to previous 5696
Added a sanity check for builds as requested by Anton.
This will just check to see if the libraries built.

Feel free to add other checks to scripts/release_sanity  BUT they are not
to create files which pollute the source directory.



Revision 5696 - (view) (annotate) - [select for diffs]
Modified Fri Jun 26 04:00:56 2015 UTC (2 years, 5 months ago) by caltinay
File length: 33184 byte(s)
Diff to previous 5618
Added version check to parmetis to get size of index types.
Also reporting boost & parmetis version now in summary.


Revision 5618 - (view) (annotate) - [select for diffs]
Modified Mon May 25 00:05:26 2015 UTC (2 years, 6 months ago) by jfenwick
File length: 33087 byte(s)
Diff to previous 5603
Remove comment about Python3 support being experimental


Revision 5603 - (view) (annotate) - [select for diffs]
Modified Mon May 4 04:15:50 2015 UTC (2 years, 7 months ago) by jfenwick
File length: 33102 byte(s)
Diff to previous 5601
Fix unintended revert in copyright

Revision 5601 - (view) (annotate) - [select for diffs]
Modified Mon May 4 03:25:18 2015 UTC (2 years, 7 months ago) by jfenwick
File length: 33098 byte(s)
Diff to previous 5593
Now with correct priorities for alternatives, paths to overlord binary, other fixes

Revision 5593 - (view) (annotate) - [select for diffs]
Modified Fri Apr 24 01:36:26 2015 UTC (2 years, 7 months ago) by jfenwick
File length: 32980 byte(s)
Diff to previous 5592
Fixing institution name to comply with policy

Revision 5592 - (view) (annotate) - [select for diffs]
Modified Fri Apr 24 01:09:11 2015 UTC (2 years, 7 months ago) by jfenwick
File length: 32976 byte(s)
Diff to previous 5591
Spelling error

Revision 5591 - (view) (annotate) - [select for diffs]
Modified Fri Apr 24 01:02:33 2015 UTC (2 years, 7 months ago) by jfenwick
File length: 32976 byte(s)
Diff to previous 5589
Fixing bad path in help message.

Revision 5589 - (view) (annotate) - [select for diffs]
Modified Wed Apr 22 03:13:44 2015 UTC (2 years, 7 months ago) by jfenwick
File length: 32975 byte(s)
Diff to previous 5576
Changes brought across from the debian preparation branch.



Revision 5576 - (view) (annotate) - [select for diffs]
Modified Wed Apr 1 07:38:51 2015 UTC (2 years, 8 months ago) by jfenwick
File length: 32629 byte(s)
Diff to previous 5496
Fixed missing optionfile message

Revision 5496 - (view) (annotate) - [select for diffs]
Modified Thu Feb 26 00:36:29 2015 UTC (2 years, 9 months ago) by sshaw
File length: 32623 byte(s)
Diff to previous 5467
fixing a missing build dependency of pythonMPI existing before individual tests are run

Revision 5467 - (view) (annotate) - [select for diffs]
Modified Mon Feb 16 00:24:20 2015 UTC (2 years, 10 months ago) by jfenwick
File length: 32587 byte(s)
Diff to previous 5450
Removing DBADPYTHONMACRO workarounds

Revision 5450 - (view) (annotate) - [select for diffs]
Modified Mon Feb 9 01:39:26 2015 UTC (2 years, 10 months ago) by sshaw
File length: 32751 byte(s)
Diff to previous 5448
Solving MPI gmsh invocation race conditions via network-IPC with the help of escript-overlord.
I, for one, welcome it.


Revision 5448 - (view) (annotate) - [select for diffs]
Modified Fri Feb 6 05:31:37 2015 UTC (2 years, 10 months ago) by jfenwick
File length: 32530 byte(s)
Diff to previous 5436
Updating all the dates

Revision 5436 - (view) (annotate) - [select for diffs]
Modified Tue Jan 27 05:16:42 2015 UTC (2 years, 10 months ago) by caltinay
File length: 32530 byte(s)
Diff to previous 5435
export slurm env for tests. Added ice options file.


Revision 5435 - (view) (annotate) - [select for diffs]
Modified Tue Jan 27 00:15:26 2015 UTC (2 years, 10 months ago) by caltinay
File length: 32424 byte(s)
Diff to previous 5408
option 'thrust_prefix' was never used - updated to cuda_prefix and added
detection code. Updated savanna options.


Revision 5408 - (view) (annotate) - [select for diffs]
Modified Thu Dec 18 03:54:12 2014 UTC (3 years ago) by jfenwick
File length: 32405 byte(s)
Diff to previous 5407
fixing stuff

Revision 5407 - (view) (annotate) - [select for diffs]
Modified Thu Dec 18 02:48:24 2014 UTC (3 years ago) by jfenwick
File length: 32405 byte(s)
Diff to previous 5391
release changes

Revision 5391 - (view) (annotate) - [select for diffs]
Modified Tue Dec 16 06:59:58 2014 UTC (3 years ago) by caltinay
File length: 32384 byte(s)
Diff to previous 5381
report gmshpy availability


Revision 5381 - (view) (annotate) - [select for diffs]
Modified Tue Dec 16 00:40:47 2014 UTC (3 years ago) by sshaw
File length: 32183 byte(s)
Diff to previous 5320
simple fix for dudley's finley dependency


Revision 5320 - (view) (annotate) - [select for diffs]
Modified Tue Dec 9 01:39:46 2014 UTC (3 years ago) by sshaw
File length: 32115 byte(s)
Diff to previous 5277
new EscriptParam GMSH_SUPPORT and GMSH_MPI for use in python-land, included associated exceptions in DCRes gmsh use and assocaiated skips in relevant tests

Revision 5277 - (view) (annotate) - [select for diffs]
Modified Mon Nov 24 03:29:15 2014 UTC (3 years ago) by caltinay
File length: 31948 byte(s)
Diff to previous 5271
added missing cpus-per-rank option for OpenMPI


Revision 5271 - (view) (annotate) - [select for diffs]
Modified Tue Nov 18 00:46:29 2014 UTC (3 years ago) by caltinay
File length: 31929 byte(s)
Diff to previous 5266
Re-enabled process binding params for OpenMPI. Not sure if this is a good default though...


Revision 5266 - (view) (annotate) - [select for diffs]
Modified Mon Nov 17 06:45:01 2014 UTC (3 years, 1 month ago) by caltinay
File length: 31907 byte(s)
Diff to previous 5250
New options 'launcher', 'prelaunch' and 'postlaunch'.
The idea is to avoid system/env-specific hacks to run-escript and provide
a means to configure launchers (i.e. mpirun and friends) at build-time.
Thus bin/run-escript now lives as a template run-escript.in and the actual
launcher is created using the above options when running scons.
Technically not much should have changed as I have tried to set the defaults
to what they were in the original launcher.

Only wheezy_options updated so far until I get feedback...



Revision 5250 - (view) (annotate) - [select for diffs]
Modified Mon Nov 10 04:05:11 2014 UTC (3 years, 1 month ago) by caltinay
File length: 30394 byte(s)
Diff to previous 5184
Updated wheezy template options file and made our rodents import from there.
Had to rename scons/os -> scons/templates to avoid import conflicts.
Removed obsolete option vsl_random and added new options.
Other templates are yet to be updated.


Revision 5184 - (view) (annotate) - [select for diffs]
Modified Wed Oct 1 04:19:22 2014 UTC (3 years, 2 months ago) by caltinay
File length: 30839 byte(s)
Diff to previous 5183
New scons option 'domains' to build only specified domains.
Defaults to all. Implements #257


Revision 5183 - (view) (annotate) - [select for diffs]
Modified Tue Sep 30 05:55:37 2014 UTC (3 years, 2 months ago) by caltinay
File length: 30171 byte(s)
Diff to previous 5148
More long-index work. Added scons option 'longindices'.
Parts will not compile yet if set to true.


Revision 5148 - (view) (annotate) - [select for diffs]
Modified Mon Sep 15 01:25:23 2014 UTC (3 years, 3 months ago) by caltinay
File length: 30017 byte(s)
Diff to previous 5123
Merging ripley diagonal storage + CUDA support into trunk.
Options file version has been incremented due to new options
'cuda' and 'nvccflags'.


Revision 5123 - (view) (annotate) - [select for diffs]
Modified Thu Aug 28 07:02:11 2014 UTC (3 years, 3 months ago) by sshaw
File length: 29227 byte(s)
Diff to previous 5045
Adding speckley (high-order) domain family, doesn't yet support MPI, Reduced functionspaces, or PDEs using A, B and/or C



Revision 5045 - (view) (annotate) - [select for diffs]
Modified Fri Jun 13 02:53:39 2014 UTC (3 years, 6 months ago) by caltinay
File length: 28821 byte(s)
Diff to previous 5017
minor fixes required on cray/py26


Revision 5017 - (view) (annotate) - [select for diffs]
Modified Tue Jun 10 02:16:18 2014 UTC (3 years, 6 months ago) by sshaw
File length: 28817 byte(s)
Diff to previous 4917
scons now runs tests via a testrunner to collect lists of skipped tests in build/ (examples have their own builder since they aren't unit tests)
fixed hessian regularisation tests falling over by adding a shortcircuit optional arg that returns the pde, not the solution
added missing/omitted tests back into scons tests


Revision 4917 - (view) (annotate) - [select for diffs]
Modified Wed Apr 30 05:58:08 2014 UTC (3 years, 7 months ago) by caltinay
File length: 28640 byte(s)
Diff to previous 4889
export LD_PRELOAD for tests.
added freebsd 10.0 options file.


Revision 4889 - (view) (annotate) - [select for diffs]
Modified Mon Apr 28 01:17:41 2014 UTC (3 years, 7 months ago) by jduplessis
File length: 28627 byte(s)
Diff to previous 4877
Updated warning message when no options file is provided


Revision 4877 - (view) (annotate) - [select for diffs]
Modified Tue Apr 22 07:24:32 2014 UTC (3 years, 7 months ago) by caltinay
File length: 28619 byte(s)
Diff to previous 4820
new intel cc,mkl & mpi on savanna.


Revision 4820 - (view) (annotate) - [select for diffs]
Modified Tue Apr 1 04:55:49 2014 UTC (3 years, 8 months ago) by sshaw
File length: 28603 byte(s)
Diff to previous 4775
allowing for larger amounts of variable tracking with debug=true (mostly for escriptcpp.cpp)

Revision 4775 - (view) (annotate) - [select for diffs]
Modified Wed Mar 19 23:12:53 2014 UTC (3 years, 8 months ago) by caltinay
File length: 28510 byte(s)
Diff to previous 4738
Moved matrix format exception further up the stack which fixes #109.
Also, removed default defines CORE_ID1 and BLOCKTIMER, added the former to
savanna's options.


Revision 4738 - (view) (annotate) - [select for diffs]
Modified Wed Mar 12 01:32:36 2014 UTC (3 years, 9 months ago) by sshaw
File length: 28548 byte(s)
Diff to previous 4726
adding support for reading binary grids from gzip compressed binary files, ripley brick only so far

Revision 4726 - (view) (annotate) - [select for diffs]
Modified Fri Mar 7 00:23:44 2014 UTC (3 years, 9 months ago) by sshaw
File length: 28293 byte(s)
Diff to previous 4657
Added a success/fail line below config in build process ( redmine #26 )

Revision 4657 - (view) (annotate) - [select for diffs]
Modified Thu Feb 6 06:12:20 2014 UTC (3 years, 10 months ago) by jfenwick
File length: 28150 byte(s)
Diff to previous 4640
I changed some files.
Updated copyright notices, added GeoComp.




Revision 4640 - (view) (annotate) - [select for diffs]
Modified Fri Jan 31 00:56:51 2014 UTC (3 years, 10 months ago) by jfenwick
File length: 28082 byte(s)
Diff to previous 4542
Ensure that DYLD_LIBRARY_PATH is passed into scons.
Update mole_options to work with g++
(To get this to work, you will need to set up your env vars).



Revision 4542 - (view) (annotate) - [select for diffs]
Modified Thu Nov 28 01:33:22 2013 UTC (4 years ago) by jfenwick
File length: 27919 byte(s)
Diff to previous 4520
Moving to new icc and associated modules.




Revision 4520 - (view) (annotate) - [select for diffs]
Modified Thu Aug 22 06:42:57 2013 UTC (4 years, 3 months ago) by caltinay
File length: 27846 byte(s)
Diff to previous 4508
Removing spurious usage of C compiler:
-Changed all scons tests to use C++ compiler
-Renamed paso profiling files (unused)
-Updated most options files (removal of options and updated comments)


Revision 4508 - (view) (annotate) - [select for diffs]
Modified Wed Jul 24 04:23:22 2013 UTC (4 years, 4 months ago) by jfenwick
File length: 28160 byte(s)
Diff to previous 4426
Moving to escriptcore

Revision 4426 - (view) (annotate) - [select for diffs]
Modified Mon May 27 06:14:19 2013 UTC (4 years, 6 months ago) by jfenwick
File length: 27860 byte(s)
Diff to previous 4300
Testing commit


Revision 4300 - (view) (annotate) - [select for diffs]
Modified Mon Mar 11 00:50:19 2013 UTC (4 years, 9 months ago) by caltinay
File length: 27865 byte(s)
Diff to previous 4299
Always invoke external python to check for modules. For some reason scipy
detection did not work properly using the old way.


Revision 4299 - (view) (annotate) - [select for diffs]
Modified Mon Mar 11 00:40:09 2013 UTC (4 years, 9 months ago) by caltinay
File length: 27850 byte(s)
Diff to previous 4295
Exit with a warning in example files that require unavailable scipy.
bollide->hamster
added warnings to scons for scipy and gdal


Revision 4295 - (view) (annotate) - [select for diffs]
Modified Fri Mar 8 04:42:01 2013 UTC (4 years, 9 months ago) by caltinay
File length: 27911 byte(s)
Diff to previous 4249
de-cluttered sconstruct a bit and fixed a script.


Revision 4249 - (view) (annotate) - [select for diffs]
Modified Tue Feb 26 01:01:59 2013 UTC (4 years, 9 months ago) by caltinay
File length: 41621 byte(s)
Diff to previous 4244
s/shake75/bollide. Made build_full succeed without cppunit.


Revision 4244 - (view) (annotate) - [select for diffs]
Modified Mon Feb 25 05:37:50 2013 UTC (4 years, 9 months ago) by jfenwick
File length: 41588 byte(s)
Diff to previous 4216
More testing and a target in scons for the pdf docs


Revision 4216 - (view) (annotate) - [select for diffs]
Modified Tue Feb 19 05:15:38 2013 UTC (4 years, 9 months ago) by caltinay
File length: 41556 byte(s)
Diff to previous 4173
Report if pyproj is available.


Revision 4173 - (view) (annotate) - [select for diffs]
Modified Wed Jan 30 03:05:01 2013 UTC (4 years, 10 months ago) by caltinay
File length: 41369 byte(s)
Diff to previous 4167
Do not use -ffast-math by default (see mantis 691).


Revision 4167 - (view) (annotate) - [select for diffs]
Modified Fri Jan 25 05:21:30 2013 UTC (4 years, 10 months ago) by jfenwick
File length: 41292 byte(s)
Diff to previous 4154
fixes for doco for earlier releases

Revision 4154 - (view) (annotate) - [select for diffs]
Modified Tue Jan 22 09:30:23 2013 UTC (4 years, 10 months ago) by jfenwick
File length: 41221 byte(s)
Diff to previous 4110
Round 1 of copyright fixes

Revision 4110 - (view) (annotate) - [select for diffs]
Modified Fri Dec 14 01:21:33 2012 UTC (5 years ago) by jfenwick
File length: 41221 byte(s)
Diff to previous 4107
Fixed to use whatever python is leading the path.
Disabled epydoc


Revision 4107 - (view) (annotate) - [select for diffs]
Modified Thu Dec 13 05:54:03 2012 UTC (5 years ago) by jfenwick
File length: 41235 byte(s)
Diff to previous 4090
Now building doc using sphinx. Doc builds will fail until I get stuff installed on savanna

Revision 4090 - (view) (annotate) - [select for diffs]
Modified Mon Nov 26 03:51:04 2012 UTC (5 years ago) by caltinay
File length: 41222 byte(s)
Diff to previous 4078
Savanna tweaks.


Revision 4078 - (view) (annotate) - [select for diffs]
Modified Fri Nov 16 07:50:49 2012 UTC (5 years, 1 month ago) by jfenwick
File length: 41179 byte(s)
Diff to previous 4046
Unit tests for binary install with no scons and no source tree.
Script for installing and testing a .deb within a chroot.




Revision 4046 - (view) (annotate) - [select for diffs]
Modified Tue Oct 30 04:43:25 2012 UTC (5 years, 1 month ago) by caltinay
File length: 40499 byte(s)
Diff to previous 4045
Deprecated saveDX and made sure DeprecationWarnings are shown (py2.7 disabled
those). Also a fix to $BUILD_DIR being non-absolute.


Revision 4045 - (view) (annotate) - [select for diffs]
Modified Tue Oct 30 03:57:22 2012 UTC (5 years, 1 month ago) by caltinay
File length: 40486 byte(s)
Diff to previous 3982
Imported inversion cookbook.


Revision 3982 - (view) (annotate) - [select for diffs]
Modified Fri Sep 21 03:23:22 2012 UTC (5 years, 2 months ago) by jfenwick
File length: 40469 byte(s)
Diff to previous 3977
More edits + removing pyvisi from trunk


Revision 3977 - (view) (annotate) - [select for diffs]
Modified Thu Sep 20 04:27:10 2012 UTC (5 years, 2 months ago) by caltinay
File length: 40350 byte(s)
Diff to previous 3975
Export KMP_MONITOR_STACKSIZE so tests work on savanna.


Revision 3975 - (view) (annotate) - [select for diffs]
Modified Thu Sep 20 01:54:06 2012 UTC (5 years, 2 months ago) by caltinay
File length: 40326 byte(s)
Diff to previous 3967
Merged symbolic branch into trunk. Curious what daniel and spartacus have to
say...


Revision 3967 - (view) (annotate) - [select for diffs]
Modified Mon Sep 17 04:02:58 2012 UTC (5 years, 3 months ago) by jfenwick
File length: 40423 byte(s)
Diff to previous 3961
Changes to SConstruct to allow building with clang


Revision 3961 - (view) (annotate) - [select for diffs]
Modified Tue Sep 11 07:21:41 2012 UTC (5 years, 3 months ago) by jfenwick
File length: 40175 byte(s)
Diff to previous 3947
Options file for mole.
Work around for python compile errors


Revision 3947 - (view) (annotate) - [select for diffs]
Modified Wed Aug 22 23:19:10 2012 UTC (5 years, 3 months ago) by caltinay
File length: 40016 byte(s)
Diff to previous 3942
Compiling and installing downunder module now. Adjusted import statements
accordingly. Added a gravity test run.


Revision 3942 - (view) (annotate) - [select for diffs]
Modified Fri Jul 27 01:04:48 2012 UTC (5 years, 4 months ago) by jfenwick
File length: 39868 byte(s)
Diff to previous 3911
Porting changes back from 3.3 release branch


Revision 3911 - (view) (annotate) - [select for diffs]
Modified Thu Jun 14 01:01:03 2012 UTC (5 years, 6 months ago) by jfenwick
File length: 39604 byte(s)
Diff to previous 3896
Copyright changes

Revision 3896 - (view) (annotate) - [select for diffs]
Modified Fri May 11 01:31:29 2012 UTC (5 years, 7 months ago) by caltinay
File length: 39604 byte(s)
Diff to previous 3892
Re-enable numpy header detection with python 2.


Revision 3892 - (view) (annotate) - [select for diffs]
Modified Tue Apr 10 08:57:23 2012 UTC (5 years, 8 months ago) by jfenwick
File length: 39549 byte(s)
Diff to previous 3851
Merged changes across from the attempt2 branch.
This version builds and passes python2 tests.
It also passes most python3 tests.




Revision 3851 - (view) (annotate) - [select for diffs]
Modified Wed Feb 29 05:23:30 2012 UTC (5 years, 9 months ago) by jfenwick
File length: 38862 byte(s)
Diff to previous 3814
Start of cross-compile build for py3

Revision 3814 - (view) (annotate) - [select for diffs]
Modified Thu Feb 9 00:11:08 2012 UTC (5 years, 10 months ago) by caltinay
File length: 36469 byte(s)
Diff to previous 3804
Changes to savanna options file to use intel 12 and numpy 1.6.1.


Revision 3804 - (view) (annotate) - [select for diffs]
Modified Mon Feb 6 00:48:22 2012 UTC (5 years, 10 months ago) by caltinay
File length: 36477 byte(s)
Diff to previous 3792
Fixed utest.sh generator so tests can be run if the installation prefix is
not `pwd`


Revision 3792 - (view) (annotate) - [select for diffs]
Modified Wed Feb 1 06:16:25 2012 UTC (5 years, 10 months ago) by caltinay
File length: 36469 byte(s)
Diff to previous 3784
Merged ripley rectangular domain into trunk.


Revision 3784 - (view) (annotate) - [select for diffs]
Modified Wed Jan 25 01:31:42 2012 UTC (5 years, 10 months ago) by caltinay
File length: 36089 byte(s)
Diff to previous 3675
Implemented optimized copy from numpy in WrappedArray (#652).


Revision 3675 - (view) (annotate) - [select for diffs]
Modified Thu Nov 17 00:53:38 2011 UTC (6 years, 1 month ago) by jfenwick
File length: 35791 byte(s)
Diff to previous 3618
pasowrap joins the trunk.


Revision 3618 - (view) (annotate) - [select for diffs]
Modified Fri Sep 30 04:07:09 2011 UTC (6 years, 2 months ago) by jfenwick
File length: 35384 byte(s)
Diff to previous 3604
Allowed 'no' as an mpi type.
Allowed SVN_VERSION to be specified from the command line.
TO BE USED ONLY FOR RELEASE PURPOSES where you do not have a .svn checkout


Revision 3604 - (view) (annotate) - [select for diffs]
Modified Mon Sep 19 04:47:53 2011 UTC (6 years, 2 months ago) by caltinay
File length: 35027 byte(s)
Diff to previous 3602
Changed detection of pdflatex since some versions of scons require .ltx or
.latex file extensions when pdflatex is not available.
Also added cleanup of utest.sh and buildvars file.


Revision 3602 - (view) (annotate) - [select for diffs]
Modified Mon Sep 19 02:38:11 2011 UTC (6 years, 2 months ago) by caltinay
File length: 34668 byte(s)
Diff to previous 3598
Fix scons checks on windows


Revision 3598 - (view) (annotate) - [select for diffs]
Modified Fri Sep 16 01:01:17 2011 UTC (6 years, 3 months ago) by caltinay
File length: 34701 byte(s)
Diff to previous 3597
New config option build_shared (which replaces share_paso & share_esysUtils).
Also enabled building escriptreader library on Windows which should now
work in both shared and static mode.


Revision 3597 - (view) (annotate) - [select for diffs]
Modified Thu Sep 15 06:03:17 2011 UTC (6 years, 3 months ago) by caltinay
File length: 34766 byte(s)
Diff to previous 3585
Switching to external cppunit:
-removed tools/CppUnitTest
-updated scons script and files
-updated tests to changed API
-updated readme

Bumped scons options file version to 201. Additions:
-cppunit*
-boomeramg*
-vsl_random



Revision 3585 - (view) (annotate) - [select for diffs]
Modified Wed Sep 7 06:16:08 2011 UTC (6 years, 3 months ago) by caltinay
File length: 34465 byte(s)
Diff to previous 3560
Fix for #582: Determine if gmsh was compiled with MPI support and use
MPI_Comm_spawn to invoke it if necessary.


Revision 3560 - (view) (annotate) - [select for diffs]
Modified Mon Aug 29 01:10:42 2011 UTC (6 years, 3 months ago) by gross
File length: 34310 byte(s)
Diff to previous 3511
lf missing in buildvars print

Revision 3511 - (view) (annotate) - [select for diffs]
Modified Tue May 17 23:56:13 2011 UTC (6 years, 7 months ago) by lgao
File length: 34308 byte(s)
Diff to previous 3508
Fixed the scons build problem in case MPI is not in use (this 
is the reason why unit tests failed to execute properly for the
past several days).



Revision 3508 - (view) (annotate) - [select for diffs]
Modified Fri May 13 04:15:29 2011 UTC (6 years, 7 months ago) by lgao
File length: 34255 byte(s)
Diff to previous 3506
Add Boomer AMG as a new preconditioner 
Can be used by .setPreconditioner(SolverOptions.BOOMERAMG)
and the following parallel coarsening method can be 
used together with Boomer AMG preconditioner: 
  .setCoarsening(SolverOptions.CIJP_FIXED_RANDOM_COARSENING)
  .setCoarsening(SolverOptions.CIJP_COARSENING)
  .setCoarsening(SolverOptions.FALGOUT_COARSENING)
  .setCoarsening(SolverOptions.PMIS_COARSENING)
  .setCoarsening(SolverOptions.HMIS_COARSENING)

Note that Boomer AMG is only available when MPI is enabled.  



Revision 3506 - (view) (annotate) - [select for diffs]
Modified Wed May 11 01:59:45 2011 UTC (6 years, 7 months ago) by jfenwick
File length: 33324 byte(s)
Diff to previous 3466
Use VSL if MKLRANDOM is defined.
Use different seeds for different ranks/threads.
Use different seeds for successive calls with no seed given.


Revision 3466 - (view) (annotate) - [select for diffs]
Modified Tue Feb 8 05:16:21 2011 UTC (6 years, 10 months ago) by caltinay
File length: 33042 byte(s)
Diff to previous 3463
Added TEMP and friends to the list of env vars exported by scons.
Modified pycad's gmsh command line since the mesh filename may also contain
spaces.


Revision 3463 - (view) (annotate) - [select for diffs]
Modified Mon Feb 7 02:09:57 2011 UTC (6 years, 10 months ago) by caltinay
File length: 33020 byte(s)
Diff to previous 3393
Check for gmsh in main SConstruct file and skip tests that depend on it when
the executable is not found.


Revision 3393 - (view) (annotate) - [select for diffs]
Modified Fri Dec 3 04:14:56 2010 UTC (7 years ago) by caltinay
File length: 32712 byte(s)
Diff to previous 3359
shake24 (darwin) needs -L/usr/lib to pull correct gcc library.
The python library path was also not entirely correct - fixed.


Revision 3359 - (view) (annotate) - [select for diffs]
Modified Wed Nov 17 23:32:36 2010 UTC (7 years, 1 month ago) by jfenwick
File length: 32626 byte(s)
Diff to previous 3349
Fixing problem with ./utest.sh including full build path


Revision 3349 - (view) (annotate) - [select for diffs]
Modified Mon Nov 15 05:09:56 2010 UTC (7 years, 1 month ago) by caltinay
File length: 32644 byte(s)
Diff to previous 3343
escript now supports out-of-tree builds.
All build and test files are now created under a user-definable build_dir
directory.
This also fixes issue 291.
Removed most svn:ignore props since they are no longer required.


Revision 3343 - (view) (annotate) - [select for diffs]
Modified Wed Nov 10 02:01:29 2010 UTC (7 years, 1 month ago) by jfenwick
File length: 32405 byte(s)
Diff to previous 3338
Rename users guide to user.pdf from guide.pdf to match the conventions 
we follow with the other files.

Corrected the description of Einstein convention from "convenient"
to "compact". 


Revision 3338 - (view) (annotate) - [select for diffs]
Modified Fri Nov 5 03:50:51 2010 UTC (7 years, 1 month ago) by jfenwick
File length: 32406 byte(s)
Diff to previous 3332
Remove old name for man page to prevent clash with erlang.
Changed default library to link for boost to boost_python-mt



Revision 3332 - (view) (annotate) - [select for diffs]
Modified Mon Nov 1 05:26:55 2010 UTC (7 years, 1 month ago) by jfenwick
File length: 32403 byte(s)
Diff to previous 3319
Copy run-escript over for a prefix install.
Fixes mantis issue: 551

Revision 3319 - (view) (annotate) - [select for diffs]
Modified Thu Oct 28 03:14:27 2010 UTC (7 years, 1 month ago) by caltinay
File length: 32399 byte(s)
Diff to previous 3304
export PATH to scons when creating environment so tools in non-default
locations such as latex on savanna are found.


Revision 3304 - (view) (annotate) - [select for diffs]
Modified Mon Oct 25 04:43:48 2010 UTC (7 years, 1 month ago) by caltinay
File length: 32273 byte(s)
Diff to previous 3271
Disabled building html user's guide - it doesn't read the class file properly
and the PDF now supports links.


Revision 3271 - (view) (annotate) - [select for diffs]
Modified Thu Oct 14 02:16:00 2010 UTC (7 years, 2 months ago) by caltinay
File length: 32286 byte(s)
Diff to previous 3268
-use existing scons pdflatex target for user's guide
-create temporary files in build directory rather than source directory
-make latex less verbose if verbosity option is off
This fixes #291 for user's guide.


Revision 3268 - (view) (annotate) - [select for diffs]
Modified Wed Oct 13 02:16:23 2010 UTC (7 years, 2 months ago) by caltinay
File length: 31988 byte(s)
Diff to previous 3259
Do not ignore unknown options since the warnings are not easily visible,
bail out instead.


Revision 3259 - (view) (annotate) - [select for diffs]
Modified Mon Oct 11 01:48:14 2010 UTC (7 years, 2 months ago) by jfenwick
File length: 31951 byte(s)
Diff to previous 3178
Merging dudley and scons updates from branches


Revision 3178 - (view) (annotate) - [select for diffs]
Modified Tue Sep 14 00:31:59 2010 UTC (7 years, 3 months ago) by caltinay
File length: 40926 byte(s)
Diff to previous 3162
Corrected check for python version in launcher, added a function get_buildvar
for convenience.


Revision 3162 - (view) (annotate) - [select for diffs]
Modified Tue Sep 7 05:29:32 2010 UTC (7 years, 3 months ago) by jfenwick
File length: 40987 byte(s)
Diff to previous 3097
Changes to match packages in the debian repo.
Also got rid of lib/pyversion


Revision 3097 - (view) (annotate) - [select for diffs]
Modified Fri Aug 20 04:59:12 2010 UTC (7 years, 3 months ago) by gross
File length: 41071 byte(s)
Diff to previous 3096
some modifications to the GaussSeidel

Revision 3096 - (view) (annotate) - [select for diffs]
Modified Thu Aug 19 01:40:52 2010 UTC (7 years, 4 months ago) by caltinay
File length: 41048 byte(s)
Diff to previous 3078
-New VisIt simulation control interface in weipa (uses VisIt's simv2)
-Rewrote restarts.py to be a more generic data manager for restarts and exports
-Removed weipa python file since the functionality is now handled by restarts.py


Revision 3078 - (view) (annotate) - [select for diffs]
Modified Tue Aug 3 03:12:16 2010 UTC (7 years, 4 months ago) by jfenwick
File length: 40493 byte(s)
Diff to previous 3077
Switched the build_dir keyword param to variant_dir.
Should fix issue 525.



Revision 3077 - (view) (annotate) - [select for diffs]
Modified Mon Aug 2 23:01:14 2010 UTC (7 years, 4 months ago) by jfenwick
File length: 39854 byte(s)
Diff to previous 3076
Fix my error


Revision 3076 - (view) (annotate) - [select for diffs]
Modified Mon Aug 2 05:21:40 2010 UTC (7 years, 4 months ago) by jfenwick
File length: 39855 byte(s)
Diff to previous 3039
Removing hardcoded savanna from the SConstruct file.


Revision 3039 - (view) (annotate) - [select for diffs]
Modified Tue Jun 15 07:21:56 2010 UTC (7 years, 6 months ago) by caltinay
File length: 39852 byte(s)
Diff to previous 3037
Fix the NetCDF 4.1 issue (hopefully) - MPICH and IntelMPI have the required
definition.


Revision 3037 - (view) (annotate) - [select for diffs]
Modified Mon Jun 14 00:59:30 2010 UTC (7 years, 6 months ago) by caltinay
File length: 39664 byte(s)
Diff to previous 3036
Renamed escriptexport to weipa. Fixes #475.


Revision 3036 - (view) (annotate) - [select for diffs]
Modified Mon Jun 14 00:13:18 2010 UTC (7 years, 6 months ago) by caltinay
File length: 39776 byte(s)
Diff to previous 3024
Fixed compilation with MPI and NetCDF 4.1. Removed obsolete options file.


Revision 3024 - (view) (annotate) - [select for diffs]
Modified Wed May 5 01:12:32 2010 UTC (7 years, 7 months ago) by jfenwick
File length: 39679 byte(s)
Diff to previous 2967
Some savanna fixes but not complete


Revision 2967 - (view) (annotate) - [select for diffs]
Modified Wed Mar 3 03:50:46 2010 UTC (7 years, 9 months ago) by caltinay
File length: 39680 byte(s)
Diff to previous 2930
scons now understands cc_extra and cxx_extra. The former applies only to the
C compiler, the latter to the C++ compiler which fixes #510.


Revision 2930 - (view) (annotate) - [select for diffs]
Modified Mon Feb 8 06:25:43 2010 UTC (7 years, 10 months ago) by caltinay
File length: 39566 byte(s)
Diff to previous 2924
escriptconvert can now convert both to Silo and VTK and is thus built by
default


Revision 2924 - (view) (annotate) - [select for diffs]
Modified Thu Feb 4 05:30:53 2010 UTC (7 years, 10 months ago) by trankine
File length: 39584 byte(s)
Diff to previous 2923
* windows specific "we cant work out autolink" workaround
http://old.nabble.com/boost-1.41-and-autolink-%28maybe-the-wrong-list%29-td27040284.html

Revision 2923 - (view) (annotate) - [select for diffs]
Modified Thu Feb 4 04:05:36 2010 UTC (7 years, 10 months ago) by jfenwick
File length: 39485 byte(s)
Diff to previous 2910
Bringing non-release specific things from stage3.1 r2922 back to trunk


Revision 2910 - (view) (annotate) - [select for diffs]
Modified Wed Feb 3 03:22:31 2010 UTC (7 years, 10 months ago) by caltinay
File length: 39418 byte(s)
Diff to previous 2884
Added a libescriptreader.a target which does not depend on escript or finley
at runtime. This will be used for the VisIt plugin so is not built by default.


Revision 2884 - (view) (annotate) - [select for diffs]
Modified Thu Jan 28 05:00:59 2010 UTC (7 years, 10 months ago) by jfenwick
File length: 39262 byte(s)
Diff to previous 2882
Updated various nan checks to consider the windows _isnan

The default compiler flags have changed as well.
+ intel will now take -std=c99 instead of -ansi
+ gcc has -ansi removed which means it defaults to gnu99

We could have set gcc to -std=c99 as well but that gives a 
warning on g++ which gets converted into an error by our
pedantic warning.

Rationale:
We need something more than ansi to get proper nan handling.
- We currently don't have any code which does not comply with ansi
  but the nan checks don't work.

Impact:
If we want our code to still be able to compile on older compilers
(at reduced functionality) we need to be careful not to introduce other
c99-isms.
If we don't care, then it's time for some celebratory // comments.



Revision 2882 - (view) (annotate) - [select for diffs]
Modified Thu Jan 28 02:27:49 2010 UTC (7 years, 10 months ago) by caltinay
File length: 39265 byte(s)
Diff to previous 2881
Scons now allows to specify which C & C++ compiler to use via cc and cxx
variables. Fixes mantis # 485.


Revision 2881 - (view) (annotate) - [select for diffs]
Modified Thu Jan 28 02:03:15 2010 UTC (7 years, 10 months ago) by jfenwick
File length: 38948 byte(s)
Diff to previous 2879
Don't panic.
Updating copyright stamps


Revision 2879 - (view) (annotate) - [select for diffs]
Modified Thu Jan 28 01:00:26 2010 UTC (7 years, 10 months ago) by jfenwick
File length: 38948 byte(s)
Diff to previous 2827
Move definition of build_platform on t.poulet suggestion.
Redefine the IS_NAN macro to replace versions commented as
'This does not work'
If you are not compiling with a c99 compliant compiler you will not 
recognise nulls but this seems to be the best we can do right now 
without checking for explicit bit patterns.


Revision 2827 - (view) (annotate) - [select for diffs]
Modified Fri Dec 18 03:41:09 2009 UTC (8 years ago) by jfenwick
File length: 38948 byte(s)
Diff to previous 2820
There is now a mechanism to pass a C function into escript and invoke it on each datapoint with:

applyBinaryCFunction

Warning in order to use this function your escript must be compiled with 
scons ...  iknowwhatimdoing=yes

---------------------
Because this code relies on casts that the C standard does not allow some code has been moved into Dodgy{.h .cpp}

Scons files have been modified to treat these files specially [Warnings are not errors for these files.]

Revision 2820 - (view) (annotate) - [select for diffs]
Modified Thu Dec 10 05:03:11 2009 UTC (8 years ago) by artak
File length: 38615 byte(s)
Diff to previous 2812
Paso Testing tools now can select coarseing.The builld_PasoTests target is also added to scons. 

Revision 2812 - (view) (annotate) - [select for diffs]
Modified Tue Dec 8 00:12:07 2009 UTC (8 years ago) by caltinay
File length: 38468 byte(s)
Diff to previous 2810
Implemented saveSilo within a new dataexporter module. If Silo is not available
at compile time the function throws. Ultimately, saveVTK will be moved here as
well.


Revision 2810 - (view) (annotate) - [select for diffs]
Modified Mon Dec 7 04:13:49 2009 UTC (8 years ago) by caltinay
File length: 38366 byte(s)
Diff to previous 2787
Reincarnation of the escriptreader as a more flexible escriptexport library:
 - can be initialised with instances of escript::Data and Finley_Mesh
 - is now MPI aware at the EscriptDataset level including Silo writer
 - now uses boost shared pointers
The lib is currently only used by the escriptconvert tool but this is going to
change...


Revision 2787 - (view) (annotate) - [select for diffs]
Modified Fri Nov 27 05:03:09 2009 UTC (8 years ago) by jfenwick
File length: 37960 byte(s)
Diff to previous 2748
Worked around icc11 problem in table interpolate.
Best guess is that a stackframe was getting mauled somehow.



Revision 2748 - (view) (annotate) - [select for diffs]
Modified Tue Nov 17 07:32:59 2009 UTC (8 years, 1 month ago) by gross
File length: 37786 byte(s)
Diff to previous 2742
Macro elements are implemented now. VTK writer for macro elements still needs testing.

Revision 2742 - (view) (annotate) - [select for diffs]
Modified Thu Nov 12 06:03:37 2009 UTC (8 years, 1 month ago) by jfenwick
File length: 37713 byte(s)
Diff to previous 2729
Merging changes from the lapack branch.

The inverse() operation has been moved into c++. [No lazy support for this operation yet.]
Optional Lapack support has been added for matrices larger than 3x3. 
service0 is set to use mkl_lapack.




Revision 2729 - (view) (annotate) - [select for diffs]
Modified Thu Oct 22 01:45:28 2009 UTC (8 years, 1 month ago) by jfenwick
File length: 36898 byte(s)
Diff to previous 2721
UMFPack and MPI added to guineapig options.
Defaults for omp and mpi removed from SConstruct.


Revision 2721 - (view) (annotate) - [select for diffs]
Modified Fri Oct 16 05:40:12 2009 UTC (8 years, 2 months ago) by jfenwick
File length: 36929 byte(s)
Diff to previous 2604
minval and maxval are now lazy operations (they weren't before).
Whether or not Lsup, sup and inf resolve their arguments before computing answers is controlled by the escriptParam 'RESOLVE_COLLECTIVE'.
Note: integrate() still forces a resolve.

Added some unit tests for operations which weren't tested before.
Added deepcopy implementations for lazy operations which got missed somehow.

Revision 2604 - (view) (annotate) - [select for diffs]
Modified Wed Aug 12 01:21:46 2009 UTC (8 years, 4 months ago) by jfenwick
File length: 36532 byte(s)
Diff to previous 2603
The prefix option for building escript now works correctly.
This fixes mantis issue #362.


Revision 2603 - (view) (annotate) - [select for diffs]
Modified Wed Aug 12 00:44:35 2009 UTC (8 years, 4 months ago) by jfenwick
File length: 35974 byte(s)
Diff to previous 2548
Compute nodes will now read the correct options file and use the correct compiler.
I have added env_export to the service0 options file.
Use this if there are variables from the calling environment which need to be passed through scons. (In this case the INTEL_LICENSE_FILE variable).

There are still some issues with icpc linking.


Revision 2548 - (view) (annotate) - [select for diffs]
Modified Mon Jul 20 06:20:06 2009 UTC (8 years, 4 months ago) by jfenwick
File length: 35522 byte(s)
Diff to previous 2531
Updating copyright notices

Revision 2531 - (view) (annotate) - [select for diffs]
Modified Thu Jul 9 23:56:57 2009 UTC (8 years, 5 months ago) by jfenwick
File length: 35522 byte(s)
Diff to previous 2474
Setting always build on the api_epydoc target as a quick work around

Revision 2474 - (view) (annotate) - [select for diffs]
Modified Tue Jun 16 06:32:15 2009 UTC (8 years, 6 months ago) by gross
File length: 35483 byte(s)
Diff to previous 2458
linearPDEs has is now using the SolverOptions class to talk to PASO

Revision 2458 - (view) (annotate) - [select for diffs]
Modified Wed Jun 3 06:18:21 2009 UTC (8 years, 6 months ago) by jfenwick
File length: 35483 byte(s)
Diff to previous 2455
Various numarray erasures


Revision 2455 - (view) (annotate) - [select for diffs]
Modified Wed Jun 3 03:29:07 2009 UTC (8 years, 6 months ago) by jfenwick
File length: 35486 byte(s)
Diff to previous 2430
Merging changes from numpy branch.


Revision 2430 - (view) (annotate) - [select for diffs]
Modified Wed May 20 03:20:57 2009 UTC (8 years, 7 months ago) by jfenwick
File length: 35495 byte(s)
Diff to previous 2424
Use Variables class instead of Options in scons versions which support 
it.


Revision 2424 - (view) (annotate) - [select for diffs]
Modified Thu May 14 05:15:47 2009 UTC (8 years, 7 months ago) by gross
File length: 35255 byte(s)
Diff to previous 2423
small bug fixed.

Revision 2423 - (view) (annotate) - [select for diffs]
Modified Thu May 14 05:02:20 2009 UTC (8 years, 7 months ago) by gross
File length: 35260 byte(s)
Diff to previous 2416
* handling LD_LIBRARY_PATH for Windows (that only uses PATH)
* passing PATH env var in mpi call for Windows

Revision 2416 - (view) (annotate) - [select for diffs]
Modified Wed May 13 06:03:59 2009 UTC (8 years, 7 months ago) by gross
File length: 35013 byte(s)
Diff to previous 2409
* fix Windows MPI case: export system variables
* define ESCRIPT_NUM_PROC and ESCRIPT_NUM_NODES
* cleanup using os.path.join()

Revision 2409 - (view) (annotate) - [select for diffs]
Modified Tue May 5 06:22:11 2009 UTC (8 years, 7 months ago) by jfenwick
File length: 34955 byte(s)
Diff to previous 2391
bin/escript is now under version control.
The wrapper template is no longer used.
Extraneous output doc removed from scons during build.

note: finleypython is no longer built (it was deprecated anyway).

Revision 2391 - (view) (annotate) - [select for diffs]
Modified Thu Apr 16 01:08:57 2009 UTC (8 years, 8 months ago) by jfenwick
File length: 34953 byte(s)
Diff to previous 2388
Minor tweak to title page.
Better handling of alternative names in SConstruct.


Revision 2388 - (view) (annotate) - [select for diffs]
Modified Wed Apr 15 06:21:25 2009 UTC (8 years, 8 months ago) by jfenwick
File length: 34685 byte(s)
Diff to previous 2387
scons files executed on compute nodes will use the config file for the service node (when we get the other issues 
sorted).


Revision 2387 - (view) (annotate) - [select for diffs]
Modified Wed Apr 15 05:05:27 2009 UTC (8 years, 8 months ago) by jfenwick
File length: 34631 byte(s)
Diff to previous 2366
Changed the figure eps->pdf to use a builder to make hypothetical windows doc building easier.

Revision 2366 - (view) (annotate) - [select for diffs]
Modified Mon Apr 6 03:10:55 2009 UTC (8 years, 8 months ago) by gross
File length: 34460 byte(s)
Diff to previous 2364
starter for MPICH and MPICH2 add

Revision 2364 - (view) (annotate) - [select for diffs]
Modified Fri Apr 3 08:06:30 2009 UTC (8 years, 8 months ago) by gross
File length: 34450 byte(s)
Diff to previous 2363
MPI intel works now for the escript wrapper.

Revision 2363 - (view) (annotate) - [select for diffs]
Modified Fri Apr 3 03:56:19 2009 UTC (8 years, 8 months ago) by gross
File length: 34412 byte(s)
Diff to previous 2358
scons should now be able to run tests under MPI and OpenMP

Revision 2358 - (view) (annotate) - [select for diffs]
Modified Wed Apr 1 22:25:24 2009 UTC (8 years, 8 months ago) by gross
File length: 34034 byte(s)
Diff to previous 2356
mpi is not really ready yet.

Revision 2356 - (view) (annotate) - [select for diffs]
Modified Wed Apr 1 04:46:22 2009 UTC (8 years, 8 months ago) by gross
File length: 34034 byte(s)
Diff to previous 2338
more on escript command.

Revision 2338 - (view) (annotate) - [select for diffs]
Modified Fri Mar 27 05:01:49 2009 UTC (8 years, 8 months ago) by jfenwick
File length: 33762 byte(s)
Diff to previous 2334
Added vars for mpi_flavour
Output correct version into the user guide

Revision 2334 - (view) (annotate) - [select for diffs]
Modified Thu Mar 26 03:05:33 2009 UTC (8 years, 8 months ago) by jfenwick
File length: 33807 byte(s)
Diff to previous 2324
Getting install guide to build.


Revision 2324 - (view) (annotate) - [select for diffs]
Modified Thu Mar 19 04:35:30 2009 UTC (8 years, 9 months ago) by jfenwick
File length: 33632 byte(s)
Diff to previous 2308
Fixed some non-portable paths in SConstruct.
Added section links for compiling only escript.

Revision 2308 - (view) (annotate) - [select for diffs]
Modified Mon Mar 16 01:20:56 2009 UTC (8 years, 9 months ago) by gross
File length: 33482 byte(s)
Diff to previous 2302
size_t may be 64 bits which is incompatible to MPI_INT. This problem is fixed by inserting a cast in Mesh_read.c. 
Moreover a fix has been added making sure that gmsh and triangle are executed on one processor only.




Revision 2302 - (view) (annotate) - [select for diffs]
Modified Thu Mar 12 04:40:03 2009 UTC (8 years, 9 months ago) by jfenwick
File length: 33480 byte(s)
Diff to previous 2300
Debian/ubuntu package now includes the user guide and the python doco (but not the c++) as well as the examples.tar.gz.
A file called buildvars is now written to the lib directory.
It contains some configuration things I can easily get in python.

Feel free to add additional ones.

Revision 2300 - (view) (annotate) - [select for diffs]
Modified Wed Mar 11 08:17:57 2009 UTC (8 years, 9 months ago) by gross
File length: 32543 byte(s)
Diff to previous 2299
a power law model. tests still need to be added and needs to be linked with an incompressible solver.

Revision 2299 - (view) (annotate) - [select for diffs]
Modified Wed Mar 11 03:14:41 2009 UTC (8 years, 9 months ago) by jfenwick
File length: 32521 byte(s)
Diff to previous 2297
Modified script template to explcitly require bash (because of the 
bash-ism I'm using).
Wrapper script also sets up environment for standalone builds if the 
STANDALONE variable is set.

utest.sh will now be generated with executable bit set.


Revision 2297 - (view) (annotate) - [select for diffs]
Modified Fri Mar 6 04:46:14 2009 UTC (8 years, 9 months ago) by jfenwick
File length: 32379 byte(s)
Diff to previous 2296
SConstruct now records the version of python used to build.
The wrapper script now checks (where possible) and exits with a warning 
if the versions do not match.


Revision 2296 - (view) (annotate) - [select for diffs]
Modified Thu Mar 5 05:47:34 2009 UTC (8 years, 9 months ago) by jfenwick
File length: 32102 byte(s)
Diff to previous 2295
The escript wrapper now determines ESCRIPT_ROOT based on the position of the 
script rather than the value inserted at compile time.
This is one step towards making binary releases less tied to a known location.

SConstruct now keeps escript root at the front of LD_LIBRARY_PATH and PYTHONPATH

The wrapper script now accepts a -e arguement.
This doesn't actually run anything but outputs a set of exports which one can 
eval to give you the same environment as the wrapper.



Revision 2295 - (view) (annotate) - [select for diffs]
Modified Wed Mar 4 05:18:28 2009 UTC (8 years, 9 months ago) by jfenwick
File length: 30852 byte(s)
Diff to previous 2294
Modified SConstruct to be smarter about when it puts /boost on the end 
of paths.


Revision 2294 - (view) (annotate) - [select for diffs]
Modified Mon Mar 2 03:44:27 2009 UTC (8 years, 9 months ago) by jfenwick
File length: 30635 byte(s)
Diff to previous 2292
Added instructions on how to install debian package to the install guide.
Wrapper script generation now produces two scripts (escript and finleypython).
The two are identical - eventually we will remove finleypython.

Modified the wrapper script so it will print a message and start the python interpreter if you don't specify a script.

Revision 2292 - (view) (annotate) - [select for diffs]
Modified Fri Feb 27 02:07:43 2009 UTC (8 years, 9 months ago) by jfenwick
File length: 30633 byte(s)
Diff to previous 2286
Disabling default use of OpenMP in SConstruct.
I have set the option in service0_options so savanna should build as before.

If you are expecting OpenMP by default on any other machine please adjust your options files accordingly.



Revision 2286 - (view) (annotate) - [select for diffs]
Modified Mon Feb 23 02:50:06 2009 UTC (8 years, 9 months ago) by jfenwick
File length: 30634 byte(s)
Diff to previous 2284
Added build_full target. This will build escript, the unit test binaries 
and compile all the python files.
This should be called before using utest.sh.

Added gcc openmp params for badger


Revision 2284 - (view) (annotate) - [select for diffs]
Modified Fri Feb 20 02:10:59 2009 UTC (8 years, 9 months ago) by gross
File length: 30563 byte(s)
Diff to previous 2276
soem small fixes.

Revision 2276 - (view) (annotate) - [select for diffs]
Modified Tue Feb 17 06:21:31 2009 UTC (8 years, 10 months ago) by jfenwick
File length: 30544 byte(s)
Diff to previous 2273
utest.sh now builds correctly for Macintosh.
It turns out if you really want to differentiate between Mac and Linux, 
you should use platform not os.


Revision 2273 - (view) (annotate) - [select for diffs]
Modified Tue Feb 17 01:22:48 2009 UTC (8 years, 10 months ago) by jfenwick
File length: 30367 byte(s)
Diff to previous 2254
Added compile flags to turn autolazy on and off.
These are for testing purposes only.


Revision 2254 - (view) (annotate) - [select for diffs]
Modified Sun Feb 8 23:40:22 2009 UTC (8 years, 10 months ago) by jfenwick
File length: 30055 byte(s)
Diff to previous 2253
All these commits are because I am working with something which processes a clean checkout.


Revision 2253 - (view) (annotate) - [select for diffs]
Modified Sun Feb 8 23:35:28 2009 UTC (8 years, 10 months ago) by jfenwick
File length: 30057 byte(s)
Diff to previous 2251
Fixing incorrect user info


Revision 2251 - (view) (annotate) - [select for diffs]
Modified Fri Feb 6 06:50:39 2009 UTC (8 years, 10 months ago) by gross
File length: 30047 byte(s)
Diff to previous 2235
new compressible flow solver

Revision 2235 - (view) (annotate) - [select for diffs]
Modified Tue Feb 3 01:47:47 2009 UTC (8 years, 10 months ago) by jfenwick
File length: 30045 byte(s)
Diff to previous 2232
Added support for generating non-scons test scripts

Revision 2232 - (view) (annotate) - [select for diffs]
Modified Fri Jan 30 05:24:02 2009 UTC (8 years, 10 months ago) by jfenwick
File length: 29705 byte(s)
Diff to previous 2208
Ooops need this one too.


Revision 2208 - (view) (annotate) - [select for diffs]
Modified Mon Jan 12 06:37:07 2009 UTC (8 years, 11 months ago) by gross
File length: 29703 byte(s)
Diff to previous 2184
more work on the dary solver 



Revision 2184 - (view) (annotate) - [select for diffs]
Modified Mon Dec 22 04:27:26 2008 UTC (8 years, 11 months ago) by caltinay
File length: 29682 byte(s)
Diff to previous 2161
Scons'ified escriptreader library and tools. Added checks and options for the
Silo library which is required for escript2silo and optional for the library.
Updated shake75 options file.


Revision 2161 - (view) (annotate) - [select for diffs]
Modified Tue Dec 16 03:31:00 2008 UTC (9 years ago) by artak
File length: 28372 byte(s)
Diff to previous 2156
Paso Testing target is added.

Revision 2156 - (view) (annotate) - [select for diffs]
Modified Mon Dec 15 05:09:02 2008 UTC (9 years ago) by gross
File length: 28357 byte(s)
Diff to previous 2132
some modifications to the iterative solver to make them easier to use. 
There are also improved versions of the Darcy flux solver and the incompressible solver.



Revision 2132 - (view) (annotate) - [select for diffs]
Modified Fri Dec 5 00:18:06 2008 UTC (9 years ago) by jfenwick
File length: 28355 byte(s)
Diff to previous 2130
So its not just the Mac that needed -Wno-strict-aliasing



Revision 2130 - (view) (annotate) - [select for diffs]
Modified Thu Dec 4 05:56:45 2008 UTC (9 years ago) by jfenwick
File length: 28273 byte(s)
Diff to previous 2101
Modifications to keep both the mac and linux happy.


Revision 2101 - (view) (annotate) - [select for diffs]
Modified Wed Nov 26 08:29:08 2008 UTC (9 years ago) by gross
File length: 28123 byte(s)
Diff to previous 2100
UMF link check activated. BLAS check stil fails.

Revision 2100 - (view) (annotate) - [select for diffs]
Modified Wed Nov 26 08:13:00 2008 UTC (9 years ago) by gross
File length: 28096 byte(s)
Diff to previous 2063
This commit cleans up the incompressible solver and adds a DarcyFlux solver in model module. 
Some documentation for both classes has been added.
The convection code is only linear at the moment.




Revision 2063 - (view) (annotate) - [select for diffs]
Modified Wed Nov 19 04:59:43 2008 UTC (9 years ago) by jfenwick
File length: 28014 byte(s)
Diff to previous 2060
- Removed some deprecated directories.
- Removed the pythfilter script for converting python doco into c++ stubs. The license was unspecified and we don't use it.
- Suppressed long long warnings on gcc (the Mac complained).
- svn:ignored Mac library suffixes in lib directory

Revision 2060 - (view) (annotate) - [select for diffs]
Modified Tue Nov 18 00:18:08 2008 UTC (9 years, 1 month ago) by jfenwick
File length: 27958 byte(s)
Diff to previous 2054
Okay, so -isystem on the whole /usr/include directory appears to prevent 
compiling.  I suspect this might be something about changing the 
priority of includes.

Fixed.



Revision 2054 - (view) (annotate) - [select for diffs]
Modified Mon Nov 17 13:20:41 2008 UTC (9 years, 1 month ago) by phornby
File length: 27952 byte(s)
Diff to previous 2040
Added the share_esysUtils and share_paso options
both defaulting to False, to allow finer control over
the nature of these libraries. Following log messages will explain.

Revision 2040 - (view) (annotate) - [select for diffs]
Modified Sat Nov 15 12:43:11 2008 UTC (9 years, 1 month ago) by phornby
File length: 27583 byte(s)
Diff to previous 2038
Handle ESYS_STATIC_LIB more elegantly, and make it
a two-liner to turn it into a DLL if needed.

Revision 2038 - (view) (annotate) - [select for diffs]
Modified Fri Nov 14 00:12:58 2008 UTC (9 years, 1 month ago) by ksteube
File length: 27530 byte(s)
Diff to previous 2036
Change -isystem to point to boost_path and python_path instead of to /usr/include


Revision 2036 - (view) (annotate) - [select for diffs]
Modified Thu Nov 13 04:35:06 2008 UTC (9 years, 1 month ago) by jfenwick
File length: 27521 byte(s)
Diff to previous 2027
A fix to deal with boost1.34s badness


Revision 2027 - (view) (annotate) - [select for diffs]
Modified Tue Nov 11 02:52:24 2008 UTC (9 years, 1 month ago) by phornby
File length: 27330 byte(s)
Diff to previous 2026
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 2026 - (view) (annotate) - [select for diffs]
Modified Tue Nov 11 01:56:54 2008 UTC (9 years, 1 month ago) by jfenwick
File length: 27352 byte(s)
Diff to previous 2012
I have changed the default scons options for gcc to be much more picky about warnings.
By default warnings will be treated as errors; so a program with warnings won't compile.

If you need to turn this off, usewarnings=no will work.

The previous usepedantic oprtion is no longer turned on by default.

This should have no effect on any of the other compilers.
If anyone wants to jump in and supply sensible values for the fatalwarnings variable for their favourite compiler go ahead.

Revision 2012 - (view) (annotate) - [select for diffs]
Modified Mon Nov 10 12:13:45 2008 UTC (9 years, 1 month ago) by phornby
File length: 26625 byte(s)
Diff to previous 1930
Grew tired of having to edit SConstruct every time I changed from
MSVC to intelc. Added the tools_names option to allow control of tools
in the Environment call from the options file. This only applies to
the windows branch at present.

Revision 1930 - (view) (annotate) - [select for diffs]
Modified Fri Oct 24 09:35:55 2008 UTC (9 years, 1 month ago) by phornby
File length: 26468 byte(s)
Diff to previous 1887
revert to MS compiler for now.

Revision 1887 - (view) (annotate) - [select for diffs]
Modified Wed Oct 15 03:26:25 2008 UTC (9 years, 2 months ago) by ksteube
File length: 26224 byte(s)
Diff to previous 1866
Fixed two typos that stopped the test suite from running.

Also, gcc 4.3.2 issued several warnings not seen before:
ignoring the return value of fscanf and using the wrong format
with printf.


Revision 1866 - (view) (annotate) - [select for diffs]
Modified Thu Oct 9 04:01:06 2008 UTC (9 years, 2 months ago) by ksteube
File length: 26202 byte(s)
Diff to previous 1811
Repair to saveVTK similar to revision 1677 (there we got the number of offsets correct
and in this revision we got the number of types correct).
In case of MPI > 1 do not run saveDX tests since saveDX is not MPI parallel.


Revision 1811 - (view) (annotate) - [select for diffs]
Modified Thu Sep 25 23:11:13 2008 UTC (9 years, 2 months ago) by ksteube
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, 3 months ago) by jfenwick
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, 3 months ago) by phornby
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, 3 months ago) by ksteube
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, 3 months ago) by ksteube
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, 3 months ago) by ksteube
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, 3 months ago) by ksteube
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, 3 months ago) by ksteube
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, 4 months ago) by ksteube
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, 4 months ago) by ksteube
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
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, 5 months ago) by phornby
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, 5 months ago) by phornby
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
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
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, 8 months ago) by ksteube
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, 9 months ago) by trankine
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
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
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, 11 months ago) by gross
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, 11 months ago) by gross
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, 11 months ago) by gross
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, 11 months ago) by trankine
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, 11 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, 11 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, 11 months ago) by gross
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, 11 months ago) by gross
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 (10 years ago) by ksteube
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 (10 years ago) by trankine
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, 1 month ago) by ksteube
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, 1 month ago) by ksteube
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, 1 month ago) by ksteube
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, 2 months ago) by ksteube
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
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, 4 months ago) by ksteube
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, 4 months ago) by phornby
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, 4 months ago) by ksteube
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, 4 months ago) by phornby
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, 4 months ago) by phornby
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, 4 months ago) by phornby
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, 4 months ago) by phornby
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, 4 months ago) by phornby
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, 5 months ago) by ksteube
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, 5 months ago) by ksteube
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, 5 months ago) by ksteube
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, 6 months ago) by gross
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
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
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
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, 7 months ago) by gross
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, 7 months ago) by gross
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, 7 months ago) by gross
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, 7 months ago) by gross
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, 8 months ago) by ksteube
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, 9 months ago) by phornby
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, 9 months ago) by gross
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, 9 months ago) by phornby
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, 9 months ago) by gross
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, 9 months ago) by gross
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, 9 months ago) by gross
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, 10 months ago) by gross
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, 10 months ago) by jongui
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, 10 months ago) by gross
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, 10 months ago) by gross
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, 1 month ago) by gross
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, 2 months ago) by matt
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
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, 4 months ago) by gross
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, 4 months ago) by gross
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, 4 months ago) by gross
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, 4 months ago) by gross
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
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, 5 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 (11 years, 5 months ago) by bcumming
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, 5 months ago) by bcumming
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, 5 months ago) by bcumming
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
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
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, 7 months ago) by gross
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, 7 months ago) by gross
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
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, 8 months ago) by gross
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, 8 months ago) by gross
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, 8 months ago) by gross
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, 8 months ago) by gross
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, 8 months ago) by gross
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, 8 months ago) by robwdcock
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, 8 months ago) by robwdcock
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, 8 months ago) by robwdcock
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, 8 months ago) by gross
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
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
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
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
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, 9 months ago) by gross
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, 9 months ago) by gross
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, 9 months ago) by gross
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, 10 months ago) by jgs
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
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, 11 months ago) by gross
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 (12 years ago) by gross
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 (12 years ago) by cochrane
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 (12 years ago) by jgs
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 (12 years ago) by jgs
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 (12 years ago) by jgs
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 (12 years ago) by jgs
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
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
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
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