/[escript]/trunk/finley/src/CPPAdapter/system_dep.h
ViewVC logotype

Log of /trunk/finley/src/CPPAdapter/system_dep.h

Parent Directory Parent Directory | Revision Log Revision Log


Sticky Revision:
(Current path doesn't exist after revision 6206)

Revision 2030 - (view) (annotate) - [select for diffs]
Modified Wed Nov 12 07:34:08 2008 UTC (10 years, 2 months ago) by phornby
File length: 1379 byte(s)
Diff to previous 2029
Fix the undef'fing of _DLL_API in windows case.



Revision 2029 - (view) (annotate) - [select for diffs]
Modified Wed Nov 12 07:27:05 2008 UTC (10 years, 2 months ago) by phornby
File length: 1382 byte(s)
Diff to previous 2018
Test a more elegant way of handling XXX_DLL_API macros.



Revision 2018 - (view) (annotate) - [select for diffs]
Modified Mon Nov 10 13:31:43 2008 UTC (10 years, 2 months ago) by phornby
File length: 1360 byte(s)
Diff to previous 1811
Only import mathimf.h on win32 with intelc. Allow others to use the
standard math.h

change the #ifndef const -> #ifndef __const (oops!!)



Revision 1811 - (view) (annotate) - [select for diffs]
Modified Thu Sep 25 23:11:13 2008 UTC (10 years, 3 months ago) by ksteube
File length: 1335 byte(s)
Diff to previous 1628
Copyright updated in all files


Revision 1628 - (view) (annotate) - [select for diffs]
Modified Fri Jul 11 13:12:46 2008 UTC (10 years, 6 months ago) by phornby
File length: 1370 byte(s)
Diff to previous 1455

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 1455 - (view) (annotate) - [select for diffs]
Modified Thu Feb 28 17:19:44 2008 UTC (10 years, 10 months ago) by phornby
File length: 1369 byte(s)
Diff to previous 1388
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 - (view) (annotate) - [select for diffs]
Modified Fri Jan 11 07:45:58 2008 UTC (11 years ago) by trankine
File length: 1319 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 (11 years ago) by trankine
Original Path: temp/finley/src/CPPAdapter/system_dep.h
File length: 1319 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 (11 years ago) by phornby
Original Path: temp_trunk_copy/finley/src/CPPAdapter/system_dep.h
File length: 1319 byte(s)
Diff to previous 1312
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 (11 years, 3 months ago) by ksteube
File length: 1319 byte(s)
Diff to previous 779
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 779 - (view) (annotate) - [select for diffs]
Modified Fri Jul 14 07:41:31 2006 UTC (12 years, 6 months ago) by woo409
File length: 879 byte(s)
Diff to previous 757
+ 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 - (view) (annotate) - [select for diffs]
Modified Mon Jun 26 13:12:56 2006 UTC (12 years, 6 months ago) by woo409
File length: 879 byte(s)
Copied from: branches/intelc_win32/finley/src/CPPAdapter/system_dep.h revision 756
Diff to previous 744
+ Merge of intelc_win32 branch (revision 741:755) with trunk. Tested on iVEC altix (run_tests and py_tests all pass)


Revision 744 - (view) (annotate) - [select for diffs]
Modified Sat Jun 24 12:05:12 2006 UTC (12 years, 6 months ago) by woo409
Original Path: branches/intelc_win32/finley/src/CPPAdapter/system_dep.h
File length: 879 byte(s)
Diff to previous 743
+ Fixed up some #else statements that were in the wrong order and prevented compilation on altix


Revision 743 - (view) (annotate) - [select for diffs]
Added Sat Jun 24 11:44:55 2006 UTC (12 years, 6 months ago) by woo409
Original Path: branches/intelc_win32/finley/src/CPPAdapter/system_dep.h
File length: 878 byte(s)
+ Some additional files for the win32 port
  + The additional test meshes are because windows produces floating point numbers like this 12e+001 where are unix is 12e+01
  + nelix_kb_options.py is my notebooks config file. I've included it as an example of win32 compilation options
  + system_dep.h is there for win32 shared library function export/import macros and also to use the intel mathimf.h library since the standard MS VC++ math.h doesn't have all the necessary functions. NOTE this file must be included before all other headers to prevent inclusion of math.h

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