Log of /trunk/esysUtils
Directory Listing
Revision
2097 -
Directory Listing
Modified
Tue Nov 25 12:03:29 2008 UTC
(12 years, 1 month ago)
by
phornby
moved the code
#ifndef __const
# if (defined __STDC__ && __STDC__) || defined __cplusplus
# define __const const
# else
# define __const
# endif
#endif
from escript/src/system_dep.h to esysUtils/src/system_dep.h, just for blocktimer's sake.
Revision
2079 -
Directory Listing
Modified
Fri Nov 21 01:04:56 2008 UTC
(12 years, 2 months ago)
by
artak
Changed comment operator from // to /* */, because it does not compile in our C standart
Revision
2078 -
Directory Listing
Modified
Thu Nov 20 16:10:10 2008 UTC
(12 years, 2 months ago)
by
phornby
Two changes.
1. Move blocktimer from escript to esysUtils.
2. Make it possible to link to paso as a DLL or .so.
Should have no effect on 'nix's
In respect of 1., blocktimer had begun to spring up everywhere, so
for the moment I thought it best to move it to the only other library that
pops up all over the place.
In respect of 2., paso needed to be a DLL in order to use the windows intelc /fast
option, which does aggressive multi-file optimisations. Even in its current form, it either
vectorises or parallelises hundreds more loops in the esys system than appear in the pragmas.
In achieving 2. I have not been too delicate in adding
PASO_DLL_API
declarations to the .h files in paso/src. Only toward the end of the process of
the conversion, when the number of linker errors dropped below 20, say, did I choosy about what
functions in a header I declared PASO_DLL_API. As a result, there are likely to be many routines
declared as external functions symbols that are in fact internal to the paso DLL.
Why is this an issue? It prevents the intelc compiler from getting aggressive on the paso module.
With pain there is sometimes gain. At least all the DLL rules in windows give good
(non-microsoft) compiler writers a chance to really shine.
So, if you should see a PASO_DLL_API on a function in a paso header file,
and think to yourself, "that function is only called in paso, why export it?", then feel free to
delete the PASO_DLL_API export declaration.
Here's hoping for no breakage.....
Revision
2055 -
Directory Listing
Modified
Mon Nov 17 13:26:40 2008 UTC
(12 years, 2 months ago)
by
phornby
I have found that windows intelc /Qiop option,
which performs multi-file loop parallisation and vectorisation,
taking account of all the information in a single .obj file that it generates,
will get it's second phase link action right if it is linking
to DLL's rather than statically linking. This and other SConscripts
have been modified to take account of the options that select a static
or dynamic library.
Revision
2040 -
Directory Listing
Modified
Sat Nov 15 12:43:11 2008 UTC
(12 years, 2 months ago)
by
phornby
Handle ESYS_STATIC_LIB more elegantly, and make it
a two-liner to turn it into a DLL if needed.
Revision
2031 -
Directory Listing
Modified
Wed Nov 12 08:02:33 2008 UTC
(12 years, 2 months ago)
by
phornby
Need finer control than INTERFACE_STATIC_LIB could exert. Now there is a
XXX_STATIC_LIB for each lib.
Revision
2030 -
Directory Listing
Modified
Wed Nov 12 07:34:08 2008 UTC
(12 years, 2 months ago)
by
phornby
Fix the undef'fing of _DLL_API in windows case.
Revision
2029 -
Directory Listing
Modified
Wed Nov 12 07:27:05 2008 UTC
(12 years, 2 months ago)
by
phornby
Test a more elegant way of handling XXX_DLL_API macros.
Revision
2020 -
Directory Listing
Modified
Mon Nov 10 14:02:17 2008 UTC
(12 years, 2 months ago)
by
phornby
THROW_ANY is dead. Pls read comments in esysUtils/src/system_dep.h
Revision
2019 -
Directory Listing
Modified
Mon Nov 10 13:49:00 2008 UTC
(12 years, 2 months ago)
by
phornby
Yet another concerted effort to handle missing macro arguments
in a portable way.
Revision
2017 -
Directory Listing
Modified
Mon Nov 10 13:19:38 2008 UTC
(12 years, 2 months ago)
by
phornby
Tighten the test for including mathimf.h to be windows specific.
Also another experiment in eliminating THROW_ANY
Revision
1811 -
Directory Listing
Modified
Thu Sep 25 23:11:13 2008 UTC
(12 years, 3 months ago)
by
ksteube
Copyright updated in all files
Revision
1796 -
Directory Listing
Modified
Wed Sep 17 01:45:46 2008 UTC
(12 years, 4 months ago)
by
jfenwick
Merged noarrayview branch onto trunk.
Revision
1705 -
Directory Listing
Modified
Thu Aug 14 05:56:40 2008 UTC
(12 years, 5 months ago)
by
ksteube
Branch scons-dev is hereby closed.
Some parts of scons scripts have been re-written.
Revision
1670 -
Directory Listing
Modified
Thu Jul 24 04:30:43 2008 UTC
(12 years, 5 months ago)
by
ksteube
Fix variable declaration to compile under MPI
Revision
1662 -
Directory Listing
Modified
Tue Jul 22 01:49:21 2008 UTC
(12 years, 6 months ago)
by
ksteube
Ran a simple Escript program on Mac OS Darwin. Still much to do.
Revision
1649 -
Directory Listing
Modified
Tue Jul 15 08:41:02 2008 UTC
(12 years, 6 months ago)
by
phornby
Make operator=() on exception non-virtual. Should silence the Altix compiler.
However, if an exception is cast to another parent type, and
operator=() is called when the exception so cast is an l-value in the assignment,
an "incomplete" assignment will occur, copying only the parent class members of the
l-value in the assignmnet.
Revision
1628 -
Directory Listing
Modified
Fri Jul 11 13:12:46 2008 UTC
(12 years, 6 months ago)
by
phornby
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
1562 -
Directory Listing
Modified
Wed May 21 13:04:40 2008 UTC
(12 years, 8 months ago)
by
gross
The algebraic upwinding with MPI. The case of boundary constraint needs still some attention.
Revision
1455 -
Directory Listing
Modified
Thu Feb 28 17:19:44 2008 UTC
(12 years, 10 months ago)
by
phornby
Merge of branches/windows_from_1431_trunk.
Revamp of the exception system.
Fix unused vars and signed/unsigned comparisons.
defined a macro THROW(ARG) in the system_dep.h's to
deal with the expectations of declarations on different architectures.
Details in the logs of branches/windows_from_1431_trunk.
pre-merge snapshot of the trunk in tags/trunk_at_1452
Revision
1388 -
Directory Listing
Modified
Fri Jan 11 07:45:58 2008 UTC
(13 years ago)
by
trankine
And get the *(&(*&(* name right
Revision
1387 -
Directory Listing
Modified
Fri Jan 11 07:45:26 2008 UTC
(13 years ago)
by
trankine
Original Path:
temp/esysUtils
Restore the trunk that existed before the windows changes were committed to the (now moved to branches) old trunk.
Revision
1312 -
Directory Listing
Modified
Mon Sep 24 06:18:44 2007 UTC
(13 years, 3 months ago)
by
ksteube
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
1235 -
Directory Listing
Modified
Mon Aug 13 00:25:29 2007 UTC
(13 years, 5 months ago)
by
phornby
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
1133 -
Directory Listing
Modified
Tue May 8 07:19:33 2007 UTC
(13 years, 8 months ago)
by
gross
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
1022 -
Directory Listing
Modified
Tue Mar 13 02:25:53 2007 UTC
(13 years, 10 months ago)
by
phornby
Now define the destructors for all the Exceptions (sorry guys & gals).
Revision
1020 -
Directory Listing
Modified
Mon Mar 12 10:12:36 2007 UTC
(13 years, 10 months ago)
by
phornby
Added explicit destructors to all Exception classes.
Fixed an ifdef in TestCase.cpp
Made the conditional definition of M_PI in LocalOps.h
depend only on M_PI being undefined.
Replace dynamically dimensioned arrays in DataFactory & DataTagged with malloc.
sort() method of list does not take a named argument
(despite the manual's claims to the contary).
Revision
779 -
Directory Listing
Modified
Fri Jul 14 07:41:31 2006 UTC
(14 years, 6 months ago)
by
woo409
+ Updated compilation options for Cognac to squeeze out a bit more performance
+ Now compiles using the Intel Math headers (mathimf.h) rather than plain math.h on both Win32 and Linux platforms when using the Intel compiler. Gives a small boost to performance on Altix and is essential on Windows
Revision
757 -
Directory Listing
Modified
Mon Jun 26 13:12:56 2006 UTC
(14 years, 6 months ago)
by
woo409
+ Merge of intelc_win32 branch (revision 741:755) with trunk. Tested on iVEC altix (run_tests and py_tests all pass)
Revision
727 -
Directory Listing
Modified
Fri May 12 06:31:06 2006 UTC
(14 years, 8 months ago)
by
gross
In case of an error in paso a seg fault occured. this was caused by
inproper deallocation of memory in this case. this problem is fixed now.
Revision
700 -
Directory Listing
Modified
Thu Apr 6 00:13:40 2006 UTC
(14 years, 9 months ago)
by
gross
A few changes in the build mechanism and the file structure so scons can build release tar files:
* paso/src/Solver has been moved to paso/src
* all test_.py are now run_.py files and are assumed to be passing python tests. they can run by
scons py_tests and are part of the release test set
* escript/py_src/test_ are moved to escript/test/python and are installed in to the build directory
(rather then the PYTHONPATH).
* all py files in test/python which don't start with run_ or test_ are now 'local_py_tests'. they are installed i
by not run automatically.
* CppUnitTest is now treated as a escript module (against previous decisions).
* scons realse builds nor tar/zip files with relvant source code (src and tests in seperate files)
the python tests don't pass yet due to path problems.
Revision
682 -
Directory Listing
Modified
Mon Mar 27 02:43:09 2006 UTC
(14 years, 9 months ago)
by
robwdcock
+ 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
644 -
Directory Listing
Modified
Fri Mar 24 01:05:42 2006 UTC
(14 years, 10 months ago)
by
elspeth
More copyright.
Revision
643 -
Directory Listing
Modified
Fri Mar 24 00:28:41 2006 UTC
(14 years, 10 months ago)
by
elspeth
More copyright info added.
Revision
468 -
Directory Listing
Modified
Wed Jan 25 06:50:39 2006 UTC
(14 years, 11 months ago)
by
jgs
reorganised esysUtils to remove inc directory
Revision
455 -
Directory Listing
Modified
Tue Jan 24 04:36:54 2006 UTC
(14 years, 11 months ago)
by
jgs
minor comment and formatting changes
Revision
450 -
Directory Listing
Modified
Mon Jan 23 05:04:45 2006 UTC
(14 years, 11 months ago)
by
jgs
remove old make based build system
Revision
425 -
Directory Listing
Modified
Tue Jan 10 04:10:39 2006 UTC
(15 years ago)
by
gross
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
362 -
Directory Listing
Modified
Thu Dec 15 02:07:55 2005 UTC
(15 years, 1 month ago)
by
jgs
removed unit-test runner scripts as unit-tests now run from scons
Revision
360 -
Directory Listing
Modified
Thu Dec 15 01:52:16 2005 UTC
(15 years, 1 month ago)
by
jgs
add target to run all unit tests, the build will fail
for this target if any unit test fails
Revision
355 -
Directory Listing
Modified
Wed Dec 14 05:05:31 2005 UTC
(15 years, 1 month ago)
by
jgs
add explicit target for building of unit tests
Revision
352 -
Directory Listing
Modified
Wed Dec 14 02:21:37 2005 UTC
(15 years, 1 month ago)
by
jgs
turns out Install() targets should also be made Default()
targets if you want them to actually reliably work!
Revision
335 -
Directory Listing
Modified
Thu Dec 8 22:55:50 2005 UTC
(15 years, 1 month ago)
by
jgs
script to run esysUtils unit tests
Revision
334 -
Directory Listing
Modified
Thu Dec 8 22:52:12 2005 UTC
(15 years, 1 month ago)
by
jgs
use socket.gethostname() to get host name
Revision
325 -
Directory Listing
Modified
Wed Dec 7 02:08:17 2005 UTC
(15 years, 1 month ago)
by
jgs
now determine hostname via socket.gethostname() as HOSTNAME
environment variable is apparently not set on all platforms
Revision
324 -
Directory Listing
Modified
Wed Dec 7 01:10:36 2005 UTC
(15 years, 1 month ago)
by
jgs
add symlinks to include files - previously added by hand as cvs couldn't
handle them
Revision
309 -
Directory Listing
Modified
Mon Dec 5 01:59:58 2005 UTC
(15 years, 1 month ago)
by
jgs
now load default options - by default!
Revision
308 -
Directory Listing
Modified
Mon Dec 5 01:58:33 2005 UTC
(15 years, 1 month ago)
by
jgs
rename
Revision
307 -
Directory Listing
Modified
Mon Dec 5 01:58:18 2005 UTC
(15 years, 1 month ago)
by
jgs
build unit tests from main scons file now
Revision
306 -
Directory Listing
Modified
Mon Dec 5 00:48:01 2005 UTC
(15 years, 1 month ago)
by
jgs
add dependency between unit test and library
Revision
252 -
Directory Listing
Modified
Tue Nov 29 05:58:03 2005 UTC
(15 years, 1 month ago)
by
jgs
pass in platform specific libraries via options files now
Revision
248 -
Directory Listing
Modified
Tue Nov 29 04:58:23 2005 UTC
(15 years, 1 month ago)
by
jgs
add top level scons config files to allow building
of all unit tests for each module at once
Revision
246 -
Directory Listing
Modified
Tue Nov 29 04:27:00 2005 UTC
(15 years, 1 month ago)
by
jgs
allow compile options to be loaded from a config
file specified on the command line to scons
Revision
241 -
Directory Listing
Modified
Mon Nov 28 06:14:47 2005 UTC
(15 years, 1 month ago)
by
jgs
if usegcc=1 is set on command line, load compiler options
fropm scons/gcc_options.py
Revision
227 -
Directory Listing
Modified
Fri Nov 25 01:49:23 2005 UTC
(15 years, 1 month ago)
by
jgs
now load compile options from options file
Revision
225 -
Directory Listing
Modified
Fri Nov 25 01:22:34 2005 UTC
(15 years, 1 month ago)
by
jgs
pass in correct options to archiver for static libraries
Revision
224 -
Directory Listing
Modified
Fri Nov 25 00:33:27 2005 UTC
(15 years, 1 month ago)
by
jgs
implement switching of debug compiler options based on command line flag 'debug'
Revision
223 -
Directory Listing
Modified
Thu Nov 24 23:12:13 2005 UTC
(15 years, 1 month ago)
by
jgs
pass in cc/cxx settings from config file
Revision
217 -
Directory Listing
Modified
Thu Nov 24 06:48:50 2005 UTC
(15 years, 1 month ago)
by
jgs
import sys
Revision
216 -
Directory Listing
Modified
Thu Nov 24 06:35:14 2005 UTC
(15 years, 1 month ago)
by
jgs
first pass at importing compile options from an external file'
Revision
214 -
Directory Listing
Modified
Thu Nov 24 05:15:26 2005 UTC
(15 years, 1 month ago)
by
jgs
collect all information needed to determine build
configuration (ie: debug/nodebug, host, platform etc)
Revision
207 -
Directory Listing
Modified
Wed Nov 23 05:08:19 2005 UTC
(15 years, 1 month ago)
by
jgs
fixed permissions on these files
Revision
197 -
Directory Listing
Modified
Tue Nov 22 02:01:35 2005 UTC
(15 years, 2 months ago)
by
jgs
first draft of scons construct file for esysUtils unit tests
Revision
191 -
Directory Listing
Modified
Mon Nov 21 04:10:12 2005 UTC
(15 years, 2 months ago)
by
jgs
push platform dependent compiler flags and include directories up to library level scons files - these will eventually be brought in from external config files
Revision
190 -
Directory Listing
Modified
Mon Nov 21 03:27:42 2005 UTC
(15 years, 2 months ago)
by
jgs
pass in value for esysroot and use this to determine include file locations
Revision
188 -
Directory Listing
Modified
Mon Nov 21 01:20:26 2005 UTC
(15 years, 2 months ago)
by
jgs
explicitly add -fpic option to all compiler options lists
to ensure relocatable code is generated
Revision
180 -
Directory Listing
Modified
Fri Nov 18 03:29:44 2005 UTC
(15 years, 2 months ago)
by
jgs
first draft of scons config scripts for esysUtils library
Revision
155 -
Directory Listing
Modified
Wed Nov 9 02:02:19 2005 UTC
(15 years, 2 months ago)
by
jgs
Copied from:
trunk/esys2/esysUtils revision 154
move all directories from trunk/esys2 into trunk and remove esys2
Revision
147 -
Directory Listing
Modified
Fri Aug 12 01:45:47 2005 UTC
(15 years, 5 months ago)
by
jgs
Original Path:
trunk/esys2/esysUtils
erge of development branch dev-02 back to main trunk on 2005-08-12
