Log of /release/release_2.0.0/scons/windows_intelc_options.py
Parent Directory
| 
Revision Log
Revision
2078 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Thu Nov 20 16:10:10 2008 UTC
(12 years, 3 months ago)
by
phornby
Original Path:
trunk/scons/windows_intelc_options.py
File length: 993 byte(s)
Diff to
previous 2058
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
2058 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Mon Nov 17 13:35:10 2008 UTC
(12 years, 3 months ago)
by
phornby
Original Path:
trunk/scons/windows_intelc_options.py
File length: 995 byte(s)
Diff to
previous 2045
Added (as comment for the moment) very aggressive intelc optimisation.
Also add options (as comments) to compile esysUtis and paso as DLL's so
I can eventually use the /fast option on the intelc compiler.
Revision
2005 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Mon Nov 10 01:21:39 2008 UTC
(12 years, 3 months ago)
by
jfenwick
Original Path:
trunk/scons/windows_intelc_options.py
File length: 811 byte(s)
Diff to
previous 1929
Bringing all changes across from schroedinger.
(Note this does not mean development is done, just that it will happen
on the trunk for now).
If anyone notices any problems please contact me.
Revision
1628 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Fri Jul 11 13:12:46 2008 UTC
(12 years, 7 months ago)
by
phornby
Original Path:
trunk/scons/windows_intelc_options.py
File length: 2171 byte(s)
Diff to
previous 1427
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
1312 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Mon Sep 24 06:18:44 2007 UTC
(13 years, 5 months ago)
by
ksteube
Original Path:
trunk/scons/windows_intelc_options.py
File length: 1920 byte(s)
Diff to
previous 1245
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
1232 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Fri Aug 10 06:44:04 2007 UTC
(13 years, 6 months ago)
by
phornby
Original Path:
trunk/scons/windows_intelc_options.py
File length: 1114 byte(s)
Diff to
previous 1160
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.
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.
