From 07a9ca2d0ea9a05c89f8ebc2236b71919d9e3d0c Mon Sep 17 00:00:00 2001
From: Matthieu Schaller <matthieu.schaller@durham.ac.uk>
Date: Fri, 26 Feb 2016 15:11:23 +0000
Subject: [PATCH] Updated author list, configure script to display whether
libNUMA was found and install instructions. Also moved to version 0.2.0 since
we have multi-timestep.
---
AUTHORS | 5 +++++
INSTALL.swift | 33 ++++++++++++++++++++-------------
configure.ac | 21 ++++++++++++---------
3 files changed, 37 insertions(+), 22 deletions(-)
diff --git a/AUTHORS b/AUTHORS
index 32597ffd14..4d43745609 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -3,3 +3,8 @@ Matthieu Schaller matthieu.schaller@durham.ac.uk
Aidan Chalk aidan.chalk@durham.ac.uk
Peter W. Draper p.w.draper@durham.ac.uk
Bert Vandenbrouck bert.vandenbroucke@gmail.com
+James S. Willis james.s.willis@durham.ac.uk
+John A. Regan john.a.regan@durham.ac.uk
+Angus Lepper angus.lepper@ed.ac.uk
+Tom Theuns tom.theuns@durham.ac.uk
+Richard G. Bower r.g.bower@durham.ac.uk
diff --git a/INSTALL.swift b/INSTALL.swift
index d3993a7081..c18142c1a6 100644
--- a/INSTALL.swift
+++ b/INSTALL.swift
@@ -75,26 +75,33 @@ SWIFT depends on a number of third party libraries that should be available
before you can build it.
-HDF5: a HDF5 library is required to read and write particle data. One of the
-commands "h5cc" or "h5pcc" should be available. If "h5pcc" is located them a
-parallel HDF5 built for the version of MPI located should be provided. If
-the command is not available then it can be located using the "--with-hfd5"
-configure option. The value should be the full path to the "h5cc" or "h5pcc"
-commands.
+HDF5: a HDF5 library (v. 1.8.x or higher) is required to read and write
+particle data. One of the commands "h5cc" or "h5pcc" should be
+available. If "h5pcc" is located them a parallel HDF5 built for the version
+of MPI located should be provided. If the command is not available then it
+can be located using the "--with-hfd5" configure option. The value should
+be the full path to the "h5cc" or "h5pcc" commands.
-MPI: an optional MPI library that fully supports MPI_THREAD_MULTIPLE.
+MPI: an optional MPI library that fully supports MPI_THREAD_MULTIPLE.
Before running configure the "mpirun" command should be available in the
shell. If your command isn't called "mpirun" then define the "MPIRUN"
environment variable, either in the shell or when running configure.
METIS: a build of the METIS library can be optionally used to optimize the
-load between MPI nodes (requires an MPI library). This should be found in the
-standard installation directories, or pointed at using the "--with-metis"
-configuration option. In this case the top-level installation directory of
-the METIS build should be given. Note to use METIS you should at least supply
-"--with-metis".
+load between MPI nodes (requires an MPI library). This should be found in
+the standard installation directories, or pointed at using the
+"--with-metis" configuration option. In this case the top-level
+installation directory of the METIS build should be given. Note to use
+METIS you should at least supply "--with-metis".
-DOXYGEN: the doxygen library is required to create the SWIFT API documentation.
+libNUMA: a build of the NUMA library can be used to pin the threads to
+the physical core of the machine SWIFT is running on. This is not always
+necessary as the OS scheduler may do a good job at distributing the threads
+among the different cores on each computing node.
+
+
+DOXYGEN: the doxygen library is required to create the SWIFT API
+documentation.
diff --git a/configure.ac b/configure.ac
index 134622be41..f10fbac92c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Init the project.
-AC_INIT([SWIFT],[0.1.0])
+AC_INIT([SWIFT],[0.2.0])
AC_CONFIG_SRCDIR([src/space.c])
AC_CONFIG_AUX_DIR([.])
AM_INIT_AUTOMAKE
@@ -270,11 +270,13 @@ AC_CHECK_FUNC(pthread_setaffinity_np, AC_DEFINE([HAVE_SETAFFINITY],[true],
AM_CONDITIONAL(HAVESETAFFINITY,
[test "$ac_cv_func_pthread_setaffinity_np" = "yes"])
+have_numa="no"
if test "$ac_cv_func_pthread_setaffinity_np" = "yes"; then
# Check for libnuma.
AC_CHECK_HEADER([numa.h])
if test "$ac_cv_header_numa_h" = "yes"; then
AC_CHECK_LIB([numa], [numa_available])
+ have_numa="yes"
fi
fi
@@ -335,14 +337,15 @@ AC_CONFIG_FILES([Makefile src/Makefile examples/Makefile doc/Makefile doc/Doxyfi
# Report general configuration.
AC_MSG_RESULT([
- Compiler: $CC
- vendor: $ax_cv_c_compiler_vendor
- version: $ax_cv_c_compiler_version
- flags: $CFLAGS
- MPI enabled: $enable_mpi
- HDF5 enabled: $with_hdf5
- parallel: $have_parallel_hdf5
- Metis enabled: $with_metis
+ Compiler : $CC
+ - vendor : $ax_cv_c_compiler_vendor
+ - version : $ax_cv_c_compiler_version
+ - flags : $CFLAGS
+ MPI enabled : $enable_mpi
+ HDF5 enabled : $with_hdf5
+ - parallel : $have_parallel_hdf5
+ Metis enabled : $with_metis
+ libNUMA enabled : $have_numa
])
# Generate output.
--
GitLab