/[escript]/branches/diaplayground/scons/windows_intelc_options.py
ViewVC logotype

Log of /branches/diaplayground/scons/windows_intelc_options.py

Parent Directory Parent Directory | Revision Log Revision Log


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

Revision 4940 - (view) (annotate) - [select for diffs]
Modified Thu May 15 01:40:06 2014 UTC (5 years, 6 months ago) by caltinay
File length: 7135 byte(s)
Diff to previous 4657 , to selected 1232
A branch to have fun with diagonal storage for ripley.


Revision 4657 - (view) (annotate) - [select for diffs]
Modified Thu Feb 6 06:12:20 2014 UTC (5 years, 9 months ago) by jfenwick
Original Path: trunk/scons/windows_intelc_options.py
File length: 7135 byte(s)
Diff to previous 4520 , to selected 1232
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 (6 years, 3 months ago) by caltinay
Original Path: trunk/scons/windows_intelc_options.py
File length: 7067 byte(s)
Diff to previous 4406 , to selected 1232
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 4406 - (view) (annotate) - [select for diffs]
Modified Tue May 14 02:54:09 2013 UTC (6 years, 6 months ago) by caltinay
Original Path: trunk/scons/windows_intelc_options.py
File length: 7244 byte(s)
Diff to previous 4154 , to selected 1232
Removed references to pyvisi which disappeared a few releases ago...


Revision 4154 - (view) (annotate) - [select for diffs]
Modified Tue Jan 22 09:30:23 2013 UTC (6 years, 10 months ago) by jfenwick
Original Path: trunk/scons/windows_intelc_options.py
File length: 7365 byte(s)
Diff to previous 3981 , to selected 1232
Round 1 of copyright fixes

Revision 3981 - (view) (annotate) - [select for diffs]
Modified Fri Sep 21 02:47:54 2012 UTC (7 years, 2 months ago) by jfenwick
Original Path: trunk/scons/windows_intelc_options.py
File length: 7365 byte(s)
Diff to previous 3911 , to selected 1232
First pass of updating copyright notices

Revision 3911 - (view) (annotate) - [select for diffs]
Modified Thu Jun 14 01:01:03 2012 UTC (7 years, 5 months ago) by jfenwick
Original Path: trunk/scons/windows_intelc_options.py
File length: 7246 byte(s)
Diff to previous 3598 , to selected 1232
Copyright changes

Revision 3598 - (view) (annotate) - [select for diffs]
Modified Fri Sep 16 01:01:17 2011 UTC (8 years, 2 months ago) by caltinay
Original Path: trunk/scons/windows_intelc_options.py
File length: 7246 byte(s)
Diff to previous 3597 , to selected 1232
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 (8 years, 2 months ago) by caltinay
Original Path: trunk/scons/windows_intelc_options.py
File length: 7285 byte(s)
Diff to previous 3349 , to selected 1232
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 3349 - (view) (annotate) - [select for diffs]
Modified Mon Nov 15 05:09:56 2010 UTC (9 years ago) by caltinay
Original Path: trunk/scons/windows_intelc_options.py
File length: 6774 byte(s)
Diff to previous 3259 , to selected 1232
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 3259 - (view) (annotate) - [select for diffs]
Modified Mon Oct 11 01:48:14 2010 UTC (9 years, 1 month ago) by jfenwick
Original Path: trunk/scons/windows_intelc_options.py
File length: 6672 byte(s)
Diff to previous 2881 , to selected 1232
Merging dudley and scons updates from branches


Revision 2881 - (view) (annotate) - [select for diffs]
Modified Thu Jan 28 02:03:15 2010 UTC (9 years, 9 months ago) by jfenwick
Original Path: trunk/scons/windows_intelc_options.py
File length: 993 byte(s)
Diff to previous 2548 , to selected 1232
Don't panic.
Updating copyright stamps


Revision 2548 - (view) (annotate) - [select for diffs]
Modified Mon Jul 20 06:20:06 2009 UTC (10 years, 4 months ago) by jfenwick
Original Path: trunk/scons/windows_intelc_options.py
File length: 993 byte(s)
Diff to previous 2078 , to selected 1232
Updating copyright notices

Revision 2078 - (view) (annotate) - [select for diffs]
Modified Thu Nov 20 16:10:10 2008 UTC (11 years ago) by phornby
Original Path: trunk/scons/windows_intelc_options.py
File length: 993 byte(s)
Diff to previous 2058 , to selected 1232
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 (11 years ago) by phornby
Original Path: trunk/scons/windows_intelc_options.py
File length: 995 byte(s)
Diff to previous 2045 , to selected 1232
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 2045 - (view) (annotate) - [select for diffs]
Modified Sat Nov 15 14:08:09 2008 UTC (11 years ago) by phornby
Original Path: trunk/scons/windows_intelc_options.py
File length: 949 byte(s)
Diff to previous 2044 , to selected 1232
Make the windows intel compiler work harder at un-rolling loops and inlining absolutely everything
it can.

Revision 2044 - (view) (annotate) - [select for diffs]
Modified Sat Nov 15 13:19:49 2008 UTC (11 years ago) by phornby
Original Path: trunk/scons/windows_intelc_options.py
File length: 919 byte(s)
Diff to previous 2043 , to selected 1232
Consolidate many of the icl speed options into the /Ox option.

Revision 2043 - (view) (annotate) - [select for diffs]
Modified Sat Nov 15 12:53:27 2008 UTC (11 years ago) by phornby
Original Path: trunk/scons/windows_intelc_options.py
File length: 932 byte(s)
Diff to previous 2014 , to selected 1232
Make the intel compiler work for its money.

Revision 2014 - (view) (annotate) - [select for diffs]
Modified Mon Nov 10 12:44:51 2008 UTC (11 years ago) by phornby
Original Path: trunk/scons/windows_intelc_options.py
File length: 796 byte(s)
Diff to previous 2013 , to selected 1232
Refine the intelc compiler options, and link to the dll version of libguide.

Revision 2013 - (view) (annotate) - [select for diffs]
Modified Mon Nov 10 12:16:32 2008 UTC (11 years ago) by phornby
Original Path: trunk/scons/windows_intelc_options.py
File length: 810 byte(s)
Diff to previous 2005 , to selected 1232
Add the tools_names vars to control the compiler toolset scons uses
on windows platforms. (See cgisrv3_options.py for example of use).

Revision 2005 - (view) (annotate) - [select for diffs]
Modified Mon Nov 10 01:21:39 2008 UTC (11 years ago) by jfenwick
Original Path: trunk/scons/windows_intelc_options.py
File length: 811 byte(s)
Diff to previous 1929 , to selected 1232
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 1929 - (view) (annotate) - [select for diffs]
Modified Fri Oct 24 09:20:17 2008 UTC (11 years, 1 month ago) by phornby
Original Path: trunk/scons/windows_intelc_options.py
File length: 759 byte(s)
Diff to previous 1928 , to selected 1232
abortive attempt to automate the choice of windows compiler based uponj the options file.

Revision 1928 - (view) (annotate) - [select for diffs]
Modified Fri Oct 24 08:20:23 2008 UTC (11 years, 1 month ago) by phornby
Original Path: trunk/scons/windows_intelc_options.py
File length: 735 byte(s)
Diff to previous 1927 , to selected 1232
Pass 2 at getting openMP going on windows.
Problem is incompatible mathinf.h and system math.h at this point.

Revision 1927 - (view) (annotate) - [select for diffs]
Modified Fri Oct 24 06:24:49 2008 UTC (11 years, 1 month ago) by phornby
Original Path: trunk/scons/windows_intelc_options.py
File length: 742 byte(s)
Diff to previous 1836 , to selected 1232
First cut at omp options for windows.

Revision 1836 - (view) (annotate) - [select for diffs]
Modified Fri Oct 3 01:53:50 2008 UTC (11 years, 1 month ago) by phornby
Original Path: trunk/scons/windows_intelc_options.py
File length: 568 byte(s)
Diff to previous 1810 , to selected 1232
do some code reuse to ease upkeep.

Revision 1810 - (view) (annotate) - [select for diffs]
Modified Thu Sep 25 06:53:26 2008 UTC (11 years, 1 month ago) by ksteube
Original Path: trunk/scons/windows_intelc_options.py
File length: 2245 byte(s)
Diff to previous 1633 , to selected 1232
Updated copyright for a few remaining python files


Revision 1633 - (view) (annotate) - [select for diffs]
Modified Sat Jul 12 07:45:17 2008 UTC (11 years, 4 months ago) by trankine
Original Path: trunk/scons/windows_intelc_options.py
File length: 2268 byte(s)
Diff to previous 1628 , to selected 1232
Turn on netcdf in windows build. No new errors generated.... remarkable.

The correctly configured netCDF source and windows build config.
that matches enthought python25/vtk/PmdPyRT for windows, can be
obtained from

https://cgsrv1.arrc.csiro.au/subversion/swframeutils/thirdParty/netcdf/trunk

username & password needed. If you have access to our twiki, no new username is required,
but authorisation to read the repository will be required.


Revision 1628 - (view) (annotate) - [select for diffs]
Modified Fri Jul 11 13:12:46 2008 UTC (11 years, 4 months ago) by phornby
Original Path: trunk/scons/windows_intelc_options.py
File length: 2171 byte(s)
Diff to previous 1427 , to selected 1232

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 1427 - (view) (annotate) - [select for diffs]
Modified Wed Feb 27 07:54:48 2008 UTC (11 years, 8 months ago) by trankine
Original Path: trunk/scons/windows_intelc_options.py
File length: 1919 byte(s)
Diff to previous 1388 , to selected 1232
brought from the windows port branch. Should make no difference to *nix's

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

Revision 1387 - (view) (annotate) - [select for diffs]
Modified Fri Jan 11 07:45:26 2008 UTC (11 years, 10 months ago) by trankine
Original Path: temp/scons/windows_intelc_options.py
File length: 1920 byte(s)
Diff to previous 1384 , to selected 1232
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 (11 years, 10 months ago) by phornby
Original Path: temp_trunk_copy/scons/windows_intelc_options.py
File length: 1920 byte(s)
Diff to previous 1312 , to selected 1232
Make a temp copy of the trunk before checking in the windows changes



Revision 1312 - (view) (annotate) - [select for diffs]
Modified Mon Sep 24 06:18:44 2007 UTC (12 years, 2 months ago) by ksteube
Original Path: trunk/scons/windows_intelc_options.py
File length: 1920 byte(s)
Diff to previous 1245 , to selected 1232
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 1245 - (view) (annotate) - [select for diffs]
Modified Mon Aug 13 14:27:20 2007 UTC (12 years, 3 months ago) by phornby
Original Path: trunk/scons/windows_intelc_options.py
File length: 1492 byte(s)
Diff to previous 1242 , to selected 1232
Add in the netcdf libraries.

Revision 1242 - (view) (annotate) - [select for diffs]
Modified Mon Aug 13 06:45:41 2007 UTC (12 years, 3 months ago) by phornby
Original Path: trunk/scons/windows_intelc_options.py
File length: 1495 byte(s)
Diff to previous 1232
Update for the new SConstruct

Revision 1232 - (view) (annotate) - [selected]
Modified Fri Aug 10 06:44:04 2007 UTC (12 years, 3 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.

Revision 1160 - (view) (annotate) - [select for diffs]
Modified Wed May 23 00:44:01 2007 UTC (12 years, 6 months ago) by gross
Original Path: trunk/scons/windows_intelc_options.py
File length: 1157 byte(s)
Diff to previous 1139 , to selected 1232
The OMP_NUM_THREADS environment variable is now imported into the scons evironment.

Revision 1139 - (view) (annotate) - [select for diffs]
Modified Mon May 14 05:12:53 2007 UTC (12 years, 6 months ago) by ksteube
Original Path: trunk/scons/windows_intelc_options.py
File length: 1145 byte(s)
Diff to previous 1041 , to selected 1232
Finished renaming of boost_lib to boost_libs and boost_lib_path to boost_libs_path.


Revision 1041 - (view) (annotate) - [select for diffs]
Modified Fri Mar 16 09:11:10 2007 UTC (12 years, 8 months ago) by phornby
Original Path: trunk/scons/windows_intelc_options.py
File length: 1143 byte(s)
Diff to previous 1025 , to selected 1232
Change the netcdf path options to reflect the svn controlled netcdf path.



Revision 1025 - (view) (annotate) - [select for diffs]
Modified Tue Mar 13 08:02:12 2007 UTC (12 years, 8 months ago) by phornby
Original Path: trunk/scons/windows_intelc_options.py
File length: 1155 byte(s)
Diff to previous 1019 , to selected 1232
More windows options.



Revision 1019 - (view) (annotate) - [select for diffs]
Modified Mon Mar 12 10:04:54 2007 UTC (12 years, 8 months ago) by phornby
Original Path: trunk/scons/windows_intelc_options.py
File length: 1153 byte(s)
Diff to previous 1017 , to selected 1232
More windows options changes.



Revision 1017 - (view) (annotate) - [select for diffs]
Modified Mon Mar 12 07:35:46 2007 UTC (12 years, 8 months ago) by phornby
Original Path: trunk/scons/windows_intelc_options.py
File length: 1045 byte(s)
Copied from: trunk/scons/windows_eg_options.py revision 1016
Diff to previous 869 , to selected 1232
Windows options files.



Revision 869 - (view) (annotate) - [select for diffs]
Added Fri Oct 13 03:48:29 2006 UTC (13 years, 1 month ago) by phornby
Original Path: trunk/scons/windows_eg_options.py
File length: 1045 byte(s)
Diff to selected 1232
Add some example options files people can copy and modify for their node.



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