Log of /trunk/site_scons/dependencies.py
Parent Directory
|
Revision Log
Revision
7031 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Tue Nov 17 23:44:30 2020 UTC
(2 years, 4 months ago)
by
aellery
File length: 37580 byte(s)
Diff to
previous 7030
Bug fix. Escript now compiles with boost numpy support in Ubuntu 18.04 bionic
Revision
7029 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Tue Nov 17 06:50:01 2020 UTC
(2 years, 4 months ago)
by
aellery
File length: 37037 byte(s)
Diff to
previous 7027
Fixed bug that prevented escript from compiling with boost numpy
Revision
7004 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Thu Jul 9 05:00:17 2020 UTC
(2 years, 8 months ago)
by
aellery
File length: 34742 byte(s)
Diff to
previous 7002
The version of Trilinos on github has both the experimental headers and the non-experimental headers for Tpetra. I've modified dependencies.py to select the non-experimental code first, if it is present.
Revision
7002 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Tue Jul 7 02:27:30 2020 UTC
(2 years, 8 months ago)
by
aellery
File length: 35021 byte(s)
Diff to
previous 7000
-Updated the trilinos section of the install guide
-Added sympy to hadFeature
-Fixed an undocumented bug in which the sympy tests would run even though escript was built without sympy support
Revision
7000 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Tue Jun 30 06:25:47 2020 UTC
(2 years, 8 months ago)
by
aellery
File length: 34712 byte(s)
Diff to
previous 6997
-Fixed bug 519 (escript would not compile with Boost 1.73.0 due to deprecated headers)
-Changed saveDataCSV so that only one MPI process writes output at a time
-Solved undocumented bug in the build program that was causing an error (when reading the version of OPENMPI)
Revision
6997 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Tue Jun 16 03:57:47 2020 UTC
(2 years, 9 months ago)
by
uqaeller
File length: 34556 byte(s)
Diff to
previous 6944
-Fixed undocumented bug that prevented escript from compiling with the latest version of Trilinos (briefly, the Trilinos code in dependencies.py would find the header files for the experimental version of Tpetra BlockCrsMatrix when it did not exist.)
-Added a second Trilinos cmake script to the install guide. The install guide now has two Trilinos build scripts, one of which configures Trilinos to build with MPI support and one to build without MPI support.
Revision
6944 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Thu Jan 30 03:39:44 2020 UTC
(3 years, 1 month ago)
by
uqaeller
File length: 34277 byte(s)
Diff to
previous 6942
Updated the install guide.
Also, added in a new option (disable_boost_numpy) which enables a user to disable the boost_numpy libraries (on by default) during the build.
Revision
6942 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Tue Jan 21 06:03:41 2020 UTC
(3 years, 1 month ago)
by
uqaeller
File length: 34164 byte(s)
Diff to
previous 6940
Fixed an undocumented bug in which the direct_PASO tests would run if escript was compiled with Trilinos (but without a direct solver for PASO).
Revision
6898 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Fri Oct 25 06:20:25 2019 UTC
(3 years, 4 months ago)
by
aellery
File length: 33507 byte(s)
Diff to
previous 6887
I have made some minor changes to make escript compatible with the newer versions of Trilinos.
Revision
6885 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Wed Sep 11 05:44:23 2019 UTC
(3 years, 6 months ago)
by
aellery
File length: 32828 byte(s)
Diff to
previous 6882
The people maintaining Trilinos have recently moved some of the Tpetra BlockCRSMatrix code from experimental to their main code base. This commit brings escript up to date with their changes.
Revision
6878 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Thu Aug 15 06:03:17 2019 UTC
(3 years, 7 months ago)
by
aellery
File length: 30390 byte(s)
Diff to
previous 6872
- Prototype of the EscriptToTVTK function in Weipa.
- Moved the readthedocs yaml files to the tools folder
Revision
6872 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Tue Aug 6 07:31:34 2019 UTC
(3 years, 7 months ago)
by
aellery
File length: 30398 byte(s)
Diff to
previous 6871
I have added a new function named getNumpyX which works the same as getX except that it returns a numpy ndarray instead of a Data object.
Example use:
import numpy
from esys.finley import Rectangle
domain=Rectangle(n0=10,n1=10)
numpyCoordinates=domain.getNumpyX()
I have also updated the userguide. I'm adding in some tests for this in the next commit.
Revision
6824 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Fri May 31 02:10:47 2019 UTC
(3 years, 9 months ago)
by
aellery
File length: 30611 byte(s)
Diff to
previous 6817
Added a new flag that can be used to disable gmsh during a build. To build escript without gmsh, use the flag
use_gmsh=False
Gmsh is still enabled by default, if it is available.
Revision
6815 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Fri May 10 06:04:03 2019 UTC
(3 years, 10 months ago)
by
aellery
File length: 30444 byte(s)
Diff to
previous 6814
-BOOST_BYTE_ORDER has been deprecated. I have written some code to take this change into account
-Fixed a problem in the trilinoswrap code cause by the last commit
Revision
6814 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Thu May 9 00:53:01 2019 UTC
(3 years, 10 months ago)
by
aellery
File length: 30897 byte(s)
Diff to
previous 6813
Fixed bug that was stopping the clang-ser-py3-paso-int buildbot from completing.
The bug occurred because it is possible to build boost without boost numpy support. The old dependencies.py code incorrectly assumed that the boost numpy headers are always there.
Revision
6813 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Wed May 8 07:01:14 2019 UTC
(3 years, 10 months ago)
by
aellery
File length: 30469 byte(s)
Diff to
previous 6799
-Fix for bug 464 (Missing Trilinos header file due to deprecation)
-Fix for the bug that was stopping the gnu-omp-py3-paso-long buildbot from completing
-Update to trilinos documentation in the install guide
Revision
6799 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Mon Mar 25 05:53:58 2019 UTC
(3 years, 11 months ago)
by
aellery
File length: 30197 byte(s)
Diff to
previous 6787
I have rewritten the solverbuddy. Briefly:
1. The remaining AMG code has been removed from PASO.
2. If Trilinos is available, escript will now use it by default.
3. eScript will use a direct solver by default, (if one is available,) when solving 2 dimensional problems and an iterative solver, by default, when solving 3 dimensional problems. This can be changed by a user by manually specifying which solver to use.
4. There is a new option available, setHermitian(), that allows a user to specify when a coefficient matrix is Hermitian.
5. Symmetry information is always passed onto the Trilinos solver when this information is relevant.
6. All tests have been updated, when relevant, to reflect these changes.
7. I fixed a couple of undocumented bugs.
Revision
6787 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Mon Feb 4 01:41:55 2019 UTC
(4 years, 1 month ago)
by
aellery
File length: 30188 byte(s)
Diff to
previous 6785
eScripts now compiles successfully with the anaconda python interpreter.
Revision
6785 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Thu Jan 31 03:06:03 2019 UTC
(4 years, 1 month ago)
by
aellery
File length: 29959 byte(s)
Diff to
previous 6782
The buildbot intel-hyb-py3-trilinos-long was failing to compile because it could not locate the trilinos header files (on savanna). This problem has occurred due to a bug in the scons CheckCXXHeader() function. I have rewritten dependencies.py so that it checks for the existence of these libraries using the python function os.path.isfile() instead.
Revision
6782 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Wed Jan 30 06:38:11 2019 UTC
(4 years, 1 month ago)
by
aellery
File length: 29869 byte(s)
Diff to
previous 6781
Temporary fix to bug 433. Trilinos will now solve for the Hessian matrix used by the LBFGS algorithm in inversions.py using GMRES instead of CG.
Revision
6779 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Thu Jan 24 02:26:40 2019 UTC
(4 years, 1 month ago)
by
aellery
File length: 30454 byte(s)
Diff to
previous 6751
eScripts now displays more information about the Trilinos libraries during compilation.
Revision
6751 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Wed Nov 21 02:35:29 2018 UTC
(4 years, 3 months ago)
by
aellery
File length: 29200 byte(s)
Diff to
previous 6739
Fixed support bug 443 (escripts would not compile on openSUSE).
Revision
6739 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Wed Nov 7 23:58:41 2018 UTC
(4 years, 4 months ago)
by
aellery
File length: 27857 byte(s)
Diff to
previous 6717
I have removed support for boomerAMG from eScript. Specific changes are:
i) I have removed the definition of the variables "boomeramg", "boomeramg_prefix" and "boomeramg_libs" from SConstruct as well as the boomerAMG section of dependencies.py. Similarly, I have removed the boomerAMG section of paso/src/SConscript. Also, I have removed boomeramg from the report that scons prints out after compilation.
ii) I have removed the enum SO_PRECONDITIONER_BOOMERAMG from escriptcpp.cpp
iii) I have removed the enum SO_PRECONDITIONER_BOOMERAMG from escriptcore/src/SolverOptions.h and have updated a few comments.
iv) I have removed the case for SO_PRECONDITIONER_BOOMERAMG from the switches in SolverBuddy::getSummary(), SolverBuddy::getName() and SolverBuddy::setPreconditioner() in SolverOptions.cpp
v) In paso/src/Preconditioner.h, I have redefined the structure Preconditioner_AMG_Root so that it does not include a pointer to a Preconditioner_BoomerAMG.
vi) I have updated a couple of files in paso (AMG.cpp, AMG_Root.cpp) to reflect the changes in this structure (specifically, the fact that prec->boomeramg is now meaningless).
vii) I have removed a preprocessor directive in paso/src/Options.h (#define PASO_BOOMERAMG 60) and have updated paso/src/Options.cpp to reflect this change by removing this case from several switches.
viii) The files paso/src/BOOMERAMG.h and paso/src/BOOMERAMG.cpp have been removed from the latest commit.
On meerkat, with these changes, escripts compiles without any problems.
Revision
6714 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Thu Aug 30 02:08:54 2018 UTC
(4 years, 6 months ago)
by
aellery
File length: 27200 byte(s)
Diff to
previous 6712
escripts currently does not compile properly with boost version 1.63 or higher as it cannot locate the boost python numpy module. I have updated the code to temporarily deactive getNumpy until this is fixed.
To compile with getNumpy, point the compiler to the missing library then change line 277 of site_scons/dependencies.py to read:
if boostversion >= 106300:
Revision
6712 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Wed Aug 29 00:02:21 2018 UTC
(4 years, 6 months ago)
by
aellery
File length: 27200 byte(s)
Diff to
previous 6651
eScripts has a new feature!!!
When compiled with boost version 1.63 or higher, the command getNumpy( [data] ) will return a numpy ndarray containing the values in the data object [data]. The code is optimised to use MPI. Please note that at the moment the code does not support masks or complex numbers.
Revision
6651 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Wed Feb 7 02:12:08 2018 UTC
(5 years, 1 month ago)
by
jfenwick
File length: 26545 byte(s)
Diff to
previous 6630
Make everyone sad by touching all the files
Copyright dates update
Revision
6630 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Fri Nov 24 03:22:29 2017 UTC
(5 years, 3 months ago)
by
jfenwick
File length: 26545 byte(s)
Diff to
previous 6622
check for sympy in the specified python rather than the one scons is using
Revision
6622 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Thu Nov 9 02:24:15 2017 UTC
(5 years, 4 months ago)
by
jfenwick
File length: 26003 byte(s)
Diff to
previous 6612
Modify netcdf dependencies checks to look for the files actually being included.
(netcdfcpp.h or ncVar.h).
It turns out that behind the scenes that they both depend on netcdf.h, but it's a good idea in theory.
Revision
6509 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Thu Mar 2 07:36:17 2017 UTC
(6 years ago)
by
jfenwick
File length: 25811 byte(s)
Diff to
previous 6490
netcdf build option is now 3-state
no, 3, 4
I haven't bumped the options file version because
my changes should be backwards compatible
Revision
6252 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Thu Jun 2 05:02:50 2016 UTC
(6 years, 9 months ago)
by
caltinay
File length: 25658 byte(s)
Diff to
previous 6249
brrr, they switched from reporting via stderr to stdout...
Revision
6249 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Thu Jun 2 04:37:00 2016 UTC
(6 years, 9 months ago)
by
caltinay
File length: 25543 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
(6 years, 9 months ago)
by
caltinay
File length: 25166 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
(6 years, 9 months ago)
by
caltinay
File length: 25139 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
(6 years, 9 months ago)
by
caltinay
File length: 24120 byte(s)
Diff to
previous 6175
**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
6175 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Fri Apr 15 06:59:14 2016 UTC
(6 years, 11 months ago)
by
caltinay
File length: 24297 byte(s)
Diff to
previous 6146
make sure to copy python lists rather than adding on or PrependUnique is
useless.
Revision
6145 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Wed Apr 6 06:28:57 2016 UTC
(6 years, 11 months ago)
by
caltinay
File length: 24280 byte(s)
Diff to
previous 6144
now refraining from adding all libraries to all targets. So we don't link
unnecessary libraries, e.g. escript does not need parmetis etc...
Revision
6119 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Sun Apr 3 23:36:59 2016 UTC
(6 years, 11 months ago)
by
caltinay
File length: 24115 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
5706 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Mon Jun 29 03:41:36 2015 UTC
(7 years, 8 months ago)
by
sshaw
File length: 22085 byte(s)
Diff to
previous 5705
all python files now force use of python3 prints and division syntax to stop sneaky errors appearing in py3 environs
Revision
5696 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Fri Jun 26 04:00:56 2015 UTC
(7 years, 8 months ago)
by
caltinay
File length: 22029 byte(s)
Diff to
previous 5689
Added version check to parmetis to get size of index types.
Also reporting boost & parmetis version now in summary.
Revision
5689 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Thu Jun 25 04:04:38 2015 UTC
(7 years, 8 months ago)
by
caltinay
File length: 20325 byte(s)
Diff to
previous 5593
Bail out if trying to build with long indices and lapack.
Revision
5435 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Tue Jan 27 00:15:26 2015 UTC
(8 years, 1 month ago)
by
caltinay
File length: 20147 byte(s)
Diff to
previous 5407
option 'thrust_prefix' was never used - updated to cuda_prefix and added
detection code. Updated savanna options.
Revision
5183 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Tue Sep 30 05:55:37 2014 UTC
(8 years, 5 months ago)
by
caltinay
File length: 19007 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
(8 years, 6 months ago)
by
caltinay
File length: 19003 byte(s)
Diff to
previous 5018
Merging ripley diagonal storage + CUDA support into trunk.
Options file version has been incremented due to new options
'cuda' and 'nvccflags'.
Revision
5018 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Tue Jun 10 03:38:29 2014 UTC
(8 years, 9 months ago)
by
caltinay
File length: 18562 byte(s)
Diff to
previous 4947
byteswap.h availability does not mean bswapXXX works so check that.
(crayc++ does not support inline assembly)
Revision
4947 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Mon May 19 03:58:03 2014 UTC
(8 years, 10 months ago)
by
sshaw
File length: 18397 byte(s)
Diff to
previous 4900
adding build fail message for when a boost lib is too old to compile everything anyway (minimum version is currently 1.46)
Revision
4870 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Mon Apr 14 10:50:41 2014 UTC
(8 years, 11 months ago)
by
caltinay
File length: 17756 byte(s)
Diff to
previous 4740
Q: ...so what does this papi flag do?
A: darn, you got me.
[now it prints errors with the papi version shipped with debian, hooray]
Revision
4738 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Wed Mar 12 01:32:36 2014 UTC
(9 years ago)
by
sshaw
File length: 17691 byte(s)
Diff to
previous 4657
adding support for reading binary grids from gzip compressed binary files, ripley brick only so far
Revision
4657 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Thu Feb 6 06:12:20 2014 UTC
(9 years, 1 month ago)
by
jfenwick
File length: 17253 byte(s)
Diff to
previous 4520
I changed some files.
Updated copyright notices, added GeoComp.
Revision
4520 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Thu Aug 22 06:42:57 2013 UTC
(9 years, 7 months ago)
by
caltinay
File length: 17185 byte(s)
Diff to
previous 4419
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
4337 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Fri Mar 22 00:05:25 2013 UTC
(10 years ago)
by
caltinay
File length: 17471 byte(s)
Diff to
previous 4323
Detect a few more byte swap/endianness headers and silence output from
'detectModule' scons helper
Revision
4323 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Tue Mar 19 00:17:36 2013 UTC
(10 years ago)
by
jfenwick
File length: 17158 byte(s)
Diff to
previous 4300
Bringing across changes from release3.3.1. (Version names are set back to Development).
Revision
4300 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Mon Mar 11 00:50:19 2013 UTC
(10 years ago)
by
caltinay
File length: 17126 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
(10 years ago)
by
caltinay
File length: 17126 byte(s)
Diff to
previous 4296
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]
Added
Fri Mar 8 04:42:01 2013 UTC
(10 years ago)
by
caltinay
File length: 16747 byte(s)
de-cluttered sconstruct a bit and fixed a script.
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.