From ecc3823119c3500416bdb56c9e8bf1b8b691fa8f Mon Sep 17 00:00:00 2001 From: Claus-Justus Heine <Claus-Justus.Heine@IANS.Uni-Stuttgart.DE> Date: Wed, 7 Jan 2004 17:48:39 +0000 Subject: [PATCH] Substitute OPTIMISE by OPTIMIZE --- README | 99 ++++++++++++++++++------------- configure.ac | 8 +-- generate-alberta-automakefiles.sh | 2 +- 3 files changed, 62 insertions(+), 47 deletions(-) diff --git a/README b/README index bf1d5fa..4ec88af 100644 --- a/README +++ b/README @@ -22,10 +22,7 @@ at Please see the file `COPYING' for information about the availability of ALBERTA. -The ALBERTA-manual is located at - - ALBERTA/doc/alberta.{ps,pdf} - +The directory layout Contained in the package are the following sub-packages: __________ ALBERTA/ __________ src/ ______|--- 1d/ @@ -52,26 +49,37 @@ alberta-1.2/| |--- 2d/ The main package. 2) DEMO -A few demonstration programs. This sub-package includes several small Makefile.in's in which configure substitutes values like installation paths for libraries and headers. This directory can be copied elsewhere by the user after installation. The Makefiles include "Makefile.alberta" which resides in $installdir/include together with the C-header files. They are meant to facilitate the first steps with ALBERTA. +The sub-directory DEMO/ contains a few demonstration programs. After +running "make install" (see file ./INSTALL) a tar-ball containing all +demo programs will be installed in PREFIX/share/alberta/. The tar-ball +can be extracted elsewhere; the make-files contained in the tar-ball +have apropriate defaults for the location of the (installed) ALBERTA +libraries and header files. 3) ALBERTA_UTIL -This package contains the old ALBERTA util.c file, now split into several smaller source files. It is compiled to form a separate utility library (message macros, ALBERTA memory allocation routines, etc.) and should linked to any program using the ALBERTA package. -It can also be used as a standalone utility library. +This package contains the old ALBERTA util.c file, now split into +several smaller source files. It is compiled to form a separate +utility library (message macros, ALBERTA memory allocation routines, +etc.) and should linked to any program using the ALBERTA package. It +can also be used as a standalone utility library. 4) PLOT_ANSI -PLOT_ANSI provides tools for displaying X11 graphics, if gltools is not used. +PLOT_ANSI provides tools for displaying X11 graphics, if gltools is +not used. 5) SOLVER Linear and nonlinear solver routines for ALBERTA. 6) GRAPE -GRAPE interface for ALBERTA. Only for non-parametric FE of dimension 2 and 3. -"make" will create "alberta_grapeXX" and alberta_moviXX" where XX is in {22, 33}. -"make install" will install those programs below PREFIX/bin. +GRAPE interface for ALBERTA. Only for non-parametric FE of dimension 2 +and 3. The GRAPE-interface consists of "make" will create +"alberta_grapeXX" and alberta_moviXX" where XX is in {22, 33}. "make +install" will install those programs below PREFIX/bin. -The GRAPE interface is only installed when the GRAPE library and header file -are available on your system (determined at configure time, use -"configure --help" for appropriate command line switches for "configure"). +The GRAPE interface is only installed when the GRAPE library and +header file are available on your system (determined at configure +time, use "configure --help" for appropriate command line switches for +"configure"). II) External packages ===================== @@ -79,7 +87,7 @@ II) External packages 1) Required Packages -------------------- -The software-packages mentioned here are _required_. You will not be +The software-packages mentioned here are mandatory. You will not be able to compile and use ALBERTA without them. The configure-script will attempt to detect them at build-time (see "Configure Options" below). @@ -96,15 +104,14 @@ OpenGL -- you need some implementation of SGI's 3D-API. If your system BLAS -- "Basic Linear Algebra Subprograms" You definitely need some version of the BLAS. Often the BLAS can be found at "/usr/lib/libblas.a", but this need not be the - case. Also, you definitely want to use a version which is - optimised for your computer-architecture. + case. You should have a look at http://www.netlib.org/blas/faq.html - which lists some URLs to optimised BLAS-implementations for - some architectures. For an optimised version for AMD's Athlon + which lists some URLs to optimized BLAS-implementations for + some architectures. For an optimized version for AMD's Athlon and Opteron CPUs you should have a look at AMD's web-site (www.amd.com) and search for "acml". @@ -113,10 +120,10 @@ BLAS -- "Basic Linear Algebra Subprograms" Compiler dependence ------------------- In general, you need a version of the BLAS which was compiled - by the Fortran compiler you plan to use. Sometimes it is - possible to get around this restrictions by linking in - additional libraries, as shown in some of the examples listed - below. + by the Fortran compiler you are using to compile (parts of) + the ALBERTA package. Sometimes it is possible to get around + this restriction by linking in additional libraries, as shown + in some of the examples listed below. Intel's "math core library" libmkl: ------------------------------------ @@ -133,21 +140,29 @@ BLAS -- "Basic Linear Algebra Subprograms" setenv LD_LIBRARY_PATH /opt/intel/mkl61/lib/32 + + g77-compiled libblas on Linux, but Intel's ifc compiler for ALBERTA + ------------------------------------------------------------------- + NOTE: this probably doesn't make to much sense, but you can + try the following + + --with-blas-name="blas -lg2c" + + SunOS (Solaris), using libsunperf: ---------------------------------- - - Find about about the location thereof, then using Sun's f77 + Find out about the location of libsunperf, then using Sun's f77 compiler you need the following switches: --with-blas-lib=LOCATION --with-blas-name=sunperf However, with gcc the following might work: - --with-blas-lib=LOCATION --with-blas-name="sunperf -lfui -lfsu -lsumath" + --with-blas-lib=LOCATION --with-blas-name="sunperf -lfui -lfsu -lsunmath" + Alpha AXP with Compaq's extended math-library libcxml: ------------------------------------------------------ - The following might work (UNTESTED!!!) --with-blas-lib=LOCATION --with-blas-name="cxml -lcpml" @@ -169,14 +184,14 @@ gltools -- OpenGL toolkit be otherwise available with ALBERTA. NOTE: you need at least gltools-2-4. Version 2-3 will _not_ - work. configure does not check for right version, it's up to - you. + work. "configure" does not check for right version, it's up to + yourself. GRAPE -- Graphics Programming Environment - If GRAPE is present the four programs alberta_grape22, + If GRAPE is present, the four programs alberta_grape22, alberta_grape33, alberta_movi22 and alberta_movi33 are - compiled during the build-process. They can be used to display - data-files created by ALBERTA during your numerical + compiled and installed in PREFIX/bin/. They can be used to + display data-files created by ALBERTA during your numerical simulations. GRAPE is available from @@ -184,7 +199,7 @@ GRAPE -- Graphics Programming Environment http://www.mathematik.uni-freiburg.de/IAM/Research/grape/GENERAL/ alternate compilers - Many CPU-vendors distribute highly optimising compilers for + Many CPU-vendors distribute highly optimizing compilers for their specific CPU architecture. Often those compilers generate much faster code than even a modern gcc. Sometimes they are available at no cost, at least for private and @@ -276,10 +291,10 @@ The options below control which of them are actually created. --disable-debug Disable building of ALBERTA libraries with debugging information. On some systems (or better: with some compilers) - optimisation and debugging are mutual exclusive, therefore + optimization and debugging are mutual exclusive, therefore there are separate ALBERTA libraries which are compiled with - optimisation, but without debugging information, and another - versions which is compiled without optimisation, but with + optimization, but without debugging information, and another + versions which is compiled without optimization, but with debugging. (default: enabled) @@ -368,7 +383,7 @@ by running "configure --help" IV. Compiler flags ================== -The default flags for the optimised libraries are "-O3" when using gcc +The default flags for the optimized libraries are "-O3" when using gcc and "-O" otherwise. The default flags for the debugging-enabled libraries are @@ -377,10 +392,10 @@ The default flags for the debugging-enabled libraries are The relevant environment- respectively make-variables are CFLAGS - C-compiler flags used for _both_, optimised and debug enabled libraries + C-compiler flags used for _both_, optimized and debug enabled libraries -ALBERTA_OPTIMISE_CFLAGS - C-compiler flags used fo the optimised library. They are prepended +ALBERTA_OPTIMIZE_CFLAGS + C-compiler flags used fo the optimized library. They are prepended to the CFLAGS variable. ALBERTA_DEBUG_CFLAGS @@ -437,9 +452,9 @@ or implementation) ./configure <blablabla> \ - CC=icc CFLAGS="-mcpu=pentium4" ALBERA_OPTIMISE_CFLAGS="-O3" \ + CC=icc CFLAGS="-mcpu=pentium4" ALBERTA_OPTIMIZE_CFLAGS="-O3" \ ALBERTA_DEBUG_CFLAGS="-O0 -g" \ - F77=ifc FFLAGS="-mcpu=pentum4 -O3" \ + F77=ifc FFLAGS="-xW -O3" \ --with-blas-name=mkl --with-blas-lib=/opt/intel/mkl61/lib/32/ make make install diff --git a/configure.ac b/configure.ac index d3e7b5d..98166ec 100644 --- a/configure.ac +++ b/configure.ac @@ -111,14 +111,14 @@ dnl **************************************************************************** dnl dnl set default optimizing flags, but allow for user-override dnl -if test -z "${ALBERTA_OPTIMISE_CFLAGS}"; then +if test -z "${ALBERTA_OPTIMIZE_CFLAGS}"; then if test "$GCC" = yes; then - ALBERTA_OPTIMISE_CFLAGS="-O3" + ALBERTA_OPTIMIZE_CFLAGS="-O3" else - ALBERTA_OPTIMISE_CFLAGS="-O" + ALBERTA_OPTIMIZE_CFLAGS="-O" fi fi -AC_ARG_VAR([ALBERTA_OPTIMISE_CFLAGS],[Compiler-flags used to create the optimised libraries]) +AC_ARG_VAR([ALBERTA_OPTIMIZE_CFLAGS],[Compiler-flags used to create the optimised libraries]) if test "${FFLAGS}" = " "; then if test "$GCC" = yes; then FFLAGS="-O3" diff --git a/generate-alberta-automakefiles.sh b/generate-alberta-automakefiles.sh index 80562fc..4346c32 100755 --- a/generate-alberta-automakefiles.sh +++ b/generate-alberta-automakefiles.sh @@ -15,7 +15,7 @@ for DEBUG in 0 1; do LIBCODE=${DIM}${DIM_OF_WORLD}_${DEBUG}1 fi if test $DEBUG -eq 0; then - EFLAGS=OPTIMISE + EFLAGS=OPTIMIZE else EFLAGS=DEBUG fi -- GitLab