Commit 3f107ce1 authored by Adam Mercer's avatar Adam Mercer

migrate SEOBNRv3Update branch

parent 837952ed
This diff is collapsed.
This diff is collapsed.
#!/usr/bin/perl
use strict;
my %name2mails;
my %cmail2cname;
open IN, ".mailmap" or die $!;
while (<IN>) {
chomp;
my ($pname, $pmail, $cname, $cmail) = /^([^<]*?)\s*<([^>]*)>(?:\s*([^<]*?)\s*<([^>]*)>)?$/ or die;
$cmail = $pmail if $cmail eq "";
$name2mails{$pname}->{$pmail} = -1;
$name2mails{$pname}->{$cmail} = 0 if !defined($name2mails{$pname}->{$cmail});
$cmail2cname{$cmail} = $cname;
}
close IN;
open IN, "git shortlog -s -e -n |" or die $!;
my %authors;
my %emails;
while (<IN>) {
chomp;
my ($n, $cname, $cmail) = m/^\s*(\d+)\s+([^<>]+)\s+<([^>]+)>\s*$/ or die;
$name2mails{$cname}->{$cmail} = $n if !defined($name2mails{$cname}->{$cmail});
}
close IN;
foreach my $pname (sort { $a cmp $b } keys(%name2mails)) {
my $pname2mail = lc($pname);
$pname2mail =~ s/\s+/./g;
my @pmails;
push @pmails, grep { /^${pname2mail}[@]ligo[.]org$/ } keys(%{$name2mails{$pname}});
push @pmails, grep { /^[a-z.-]+[@]ligo[.]org$/ } keys(%{$name2mails{$pname}});
push @pmails, grep { /[@]ligo[.]org$/ } keys(%{$name2mails{$pname}});
push @pmails, grep { $name2mails{$pname}->{$_} < 0 } keys(%{$name2mails{$pname}});
push @pmails, sort { $name2mails{$pname}->{$b} <=> $name2mails{$pname}->{$a} } keys(%{$name2mails{$pname}});
shift @pmails if $pmails[0] =~ /^albert[.]einstein@/i;
my $pmail = shift @pmails;
die "Could not determine email address for $pname" unless defined($pmail);
next unless keys(%{$name2mails{$pname}}) > 1 || $name2mails{$pname}->{$pmail} <= 0;
print "$pname <$pmail>\n";
foreach my $mail (sort { $a cmp $b } keys(%{$name2mails{$pname}})) {
next if $mail eq $pmail;
if ($cmail2cname{$mail} ne "") {
print "$pname <$pmail> $cmail2cname{$mail} <$mail>\n";
chomp;
$_ =~ m/^\s*\d+\s+([^<>]+)\s+<([^>]+)>\s*$/ or die;
my $author = $1;
my $email = $2;
next if $author =~ /^UNKNOWN/;
if (defined($authors{$author})) {
print "$authors{$author} <$email>\n";
} elsif (defined($emails{$email})) {
print "$emails{$email} <$email>\n";
} else {
print "$pname <$pmail> <$mail>\n";
$authors{$author} = $emails{$email} = "$author <$email>";
}
}
}
FROM ligo/lalsuite-runtime:jessie
COPY /opt/lalsuite /opt/lalsuite
ENV LD_LIBRARY_PATH="/opt/lalsuite/lib" \
OCTAVE_PATH="/opt/lalsuite/lib/x86_64-linux-gnu/octave/3.8.2/site/oct/x86_64-pc-linux-gnu" \
PATH="/opt/lalsuite/bin:${PATH}" \
PKG_CONFIG_PATH="/opt/lalsuite/lib/pkgconfig" \
PYTHONPATH="/opt/lalsuite/lib/python2.7/site-packages" \
# LALSuite
This is the main LALSuite development repository, past development is
captured in the repository below:
https://git.ligo.org/lscsoft/lalsuite-archive
This new repository utilizes [git-lfs](https://wiki.ligo.org/DASWG/GitLFS#Install_the_git_LFS_client) for the managament of large files and as such `git-lfs` needs to be installed and configured to correctly clone this repository. After installing `git-lfs` it can be configured using:
```
$ git lfs install
```
This only needs to be done once for each machine you access the repository. It can then be cloned using:
```
$ git clone git@git.ligo.org:lscsoft/lalsuite.git
```
AC_PREREQ([2.63])
AC_INIT([LALSuite],[6.48.1],[lal-discuss@ligo.org])
AC_INIT([LALSuite],[6.41.1],[lal-discuss@ligo.org])
AC_CONFIG_SRCDIR([configure.ac])
AC_CONFIG_AUX_DIR([gnuscripts])
AC_CONFIG_MACRO_DIR([gnuscripts])
......
# ===========================================================================
# https://www.gnu.org/software/autoconf-archive/ax_lib_hdf5.html
# http://www.gnu.org/software/autoconf-archive/ax_lib_hdf5.html
# ===========================================================================
#
# SYNOPSIS
......@@ -33,7 +33,6 @@
# AC_SUBST(HDF5_FC)
# AC_SUBST(HDF5_FFLAGS)
# AC_SUBST(HDF5_FLIBS)
# AC_SUBST(HDF5_TYPE)
# AC_DEFINE(HAVE_HDF5)
#
# and sets with_hdf5="yes". Additionally, the macro sets
......@@ -75,9 +74,6 @@
# AC_MSG_ERROR([Unable to find HDF5, we need parallel HDF5.])
# fi
#
# The HDF5_TYPE environment variable returns "parallel" or "serial",
# depending on which type of library is found.
#
# LICENSE
#
# Copyright (c) 2009 Timothy Brown <tbrown@freeshell.org>
......@@ -88,7 +84,7 @@
# and this notice are preserved. This file is offered as-is, without any
# warranty.
#serial 16
#serial 11
AC_DEFUN([AX_LIB_HDF5], [
......@@ -141,7 +137,6 @@ HDF5_LIBS=""
HDF5_FC=""
HDF5_FFLAGS=""
HDF5_FLIBS=""
HDF5_TYPE=""
dnl Try and find hdf5 compiler tools and options.
if test "$with_hdf5" = "yes"; then
......@@ -158,12 +153,6 @@ if test "$with_hdf5" = "yes"; then
AC_MSG_CHECKING([Using provided HDF5 C wrapper])
AC_MSG_RESULT([$H5CC])
fi
AC_MSG_CHECKING([for HDF5 type])
AS_CASE([$H5CC],
[*h5pcc], [HDF5_TYPE=parallel],
[*h5cc], [HDF5_TYPE=serial],
[HDF5_TYPE=neither])
AC_MSG_RESULT([$HDF5_TYPE])
AC_MSG_CHECKING([for HDF5 libraries])
if test ! -f "$H5CC" || test ! -x "$H5CC"; then
AC_MSG_RESULT([no])
......@@ -241,7 +230,6 @@ HDF5 support is being disabled (equivalent to --with-hdf5=no).
AC_MSG_RESULT([yes (version $[HDF5_VERSION])])
dnl See if we can compile
AC_LANG_PUSH([C])
ax_lib_hdf5_save_CC=$CC
ax_lib_hdf5_save_CPPFLAGS=$CPPFLAGS
ax_lib_hdf5_save_LIBS=$LIBS
......@@ -263,7 +251,6 @@ HDF5 support is being disabled (equivalent to --with-hdf5=no).
CPPFLAGS=$ax_lib_hdf5_save_CPPFLAGS
LIBS=$ax_lib_hdf5_save_LIBS
LDFLAGS=$ax_lib_hdf5_save_LDFLAGS
AC_LANG_POP([C])
AC_MSG_CHECKING([for matching HDF5 Fortran wrapper])
dnl Presume HDF5 Fortran wrapper is just a name variant from H5CC
......@@ -316,7 +303,6 @@ HDF5 support is being disabled (equivalent to --with-hdf5=no).
AC_SUBST([HDF5_FC])
AC_SUBST([HDF5_FFLAGS])
AC_SUBST([HDF5_FLIBS])
AC_SUBST([HDF5_TYPE])
AC_DEFINE([HAVE_HDF5], [1], [Defined if you have HDF5 support])
fi
fi
......
# -*- mode: autoconf; -*-
# lalsuite_build.m4 - top level build macros
#
# serial 141
# serial 135
# restrict which LALSUITE_... patterns can appearing in output (./configure);
# useful for debugging problems with unexpanded LALSUITE_... Autoconf macros
......@@ -44,11 +44,6 @@ AC_DEFUN([AC_OUTPUT],[
AC_SUBST(AM_[]uvar,"${AM_[]uvar} ${sys_[]uvar}")
uvar="${uvar_prefix[]uvar}"
])
# append extra values for user variables to be added after configuration
m4_foreach_w([uvar],uvar_list,[
AC_ARG_VAR([POSTCONFIG_]uvar,[Extra ]uvar[ to be added after configuration])
uvar="${uvar} ${POSTCONFIG_[]uvar}"
])
# call original AC_OUTPUT
lalsuite_AC_OUTPUT
])
......@@ -504,32 +499,24 @@ AC_DEFUN([LALSUITE_MULTILIB_LIBTOOL_HACK],[
AC_DEFUN([LALSUITE_DISTCHECK_CONFIGURE_FLAGS],[
# $0: store configure flags for 'make distcheck'
DISTCHECK_CONFIGURE_FLAGS=
eval set x "${ac_configure_args}"
shift
for arg
do
AS_CASE(["${arg}"],
[--enable-*|--disable-*],[
for arg in ${ac_configure_args}; do
case ${arg} in
(\'--enable-*\'|\'--disable-*\')
# save any --enable/--disable arguments
DISTCHECK_CONFIGURE_FLAGS="${DISTCHECK_CONFIGURE_FLAGS} '${arg}'"
],
[--with-*|--without-*],[
DISTCHECK_CONFIGURE_FLAGS="${DISTCHECK_CONFIGURE_FLAGS} ${arg}";;
(\'--with-*\'|\'--without-*\')
# save any --with/--without arguments
DISTCHECK_CONFIGURE_FLAGS="${DISTCHECK_CONFIGURE_FLAGS} '${arg}'"
],
[--*],[
DISTCHECK_CONFIGURE_FLAGS="${DISTCHECK_CONFIGURE_FLAGS} ${arg}";;
(\'--*\')
# skip all other ./configure arguments
:
],
[DISTCHECK_CONFIGURE_FLAGS=*],[
: ;;
(\'DISTCHECK_CONFIGURE_FLAGS=*\')
# append value of DISTCHECK_CONFIGURE_FLAGS
DISTCHECK_CONFIGURE_FLAGS="${DISTCHECK_CONFIGURE_FLAGS} '`expr "X${arg}" : "XDISTCHECK_CONFIGURE_FLAGS=\(.*\)"`'"
],
[*=*],[
DISTCHECK_CONFIGURE_FLAGS="${DISTCHECK_CONFIGURE_FLAGS} "`expr "X${arg}" : "X'DISTCHECK_CONFIGURE_FLAGS=\(.*\)'"`;;
(\'*=*\')
# save any environment variables given to ./configure
DISTCHECK_CONFIGURE_FLAGS="${DISTCHECK_CONFIGURE_FLAGS} '${arg}'"
]
)
DISTCHECK_CONFIGURE_FLAGS="${DISTCHECK_CONFIGURE_FLAGS} ${arg}";;
esac
done
AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
# end $0
......@@ -704,24 +691,10 @@ AC_DEFUN([LALSUITE_CHECK_LIBRARY_FOR_SUPPORT],[
save_CPPFLAGS="${CPPFLAGS}"
LALSUITE_CLEAR_UVARS
CPPFLAGS="${save_CPPFLAGS}"
AS_IF([test "x${LALSUITE_BUILD}" = xtrue],[
for arg in ${lalsuite_libs}; do
AS_CASE([${arg}],
[lalsupport],[:],[
CPPFLAGS="-I${ac_pwd}/../${arg}/src ${CPPFLAGS}"
]
)
done
CPPFLAGS="-DLALSUITE_BUILD ${CPPFLAGS}"
])
AC_MSG_CHECKING([whether $1 has been compiled with $2 support])
AC_COMPILE_IFELSE([
AC_LANG_SOURCE([[
#ifdef LALSUITE_BUILD
#include "$1Config.h"
#else
#include <lal/$1Config.h>
#endif
#ifndef ]uppercase[_$2_ENABLED
#error ]uppercase[_$2_ENABLED is not defined
#endif
......@@ -972,59 +945,12 @@ AC_DEFUN([LALSUITE_ENABLE_BOINC],[
])
AC_DEFUN([LALSUITE_CHECK_BOINC],[
# $0: check for BOINC, and modify compiler for lal library checks
AS_IF([test "${boinc}" = "true"],[
# do compilation checks with c++
AC_LANG_PUSH([C++])
# check for BOINC libraries
AC_SUBST([BOINC_CFLAGS],[""])
AC_SUBST([BOINC_LIBS],["-lboinc_api -lboinc"])
LALSUITE_ADD_FLAGS([C],[${BOINC_CFLAGS}],[${BOINC_LIBS}])
AC_CHECK_LIB([boinc],[boinc_fopen],[:],[AC_MSG_ERROR([could not find the boinc library])])
AC_CHECK_LIB([boinc_api],[boinc_finish],[:],[AC_MSG_ERROR([could not find the boinc_api library])])
# check for BOINC headers
AC_CHECK_HEADERS([boinc/boinc_api.h],[:],[AC_MSG_ERROR([could not find the boinc_api.h header])])
])
# end $0
])
AC_DEFUN([LALSUITE_END_CHECK_BOINC],[
# $0: finish BOINC checks, and restore compiler after lal library checks
m4_pushdef([lowercase],m4_translit(AC_PACKAGE_NAME, [A-Z], [a-z]))
AC_REQUIRE([LALSUITE_CHECK_BOINC])
# $0: check for BOINC support
AS_IF([test "${boinc}" = "true"],[
m4_if(lowercase,[lal],[
# if LAL, define macro to indicate BOINC support
AC_DEFINE([LAL_BOINC_ENABLED],[1],[Define if using BOINC library])
],[
# if not LAL, check LAL was compiled with BOINC support
LALSUITE_CHECK_LIBRARY_FOR_SUPPORT([LAL],[BOINC],[:],[
AC_MSG_ERROR([BOINC enabled but LAL not compiled with BOINC support])
])
LALSUITE_CHECK_LIBRARY_FOR_SUPPORT([LAL],[BOINC],[:],[
AC_MSG_ERROR([BOINC was enabled but LAL was not compiler with BOINC support])
])
# go back to c
AC_LANG_POP([C++])
# force automake to use c++ compiler for linking
AC_MSG_WARN([using C++ compiler for linking (forced by BOINC)])
AC_SUBST([CCLD],['$(CXX)'])
AC_SUBST([am__v_CCLD_0],['@echo " CXXLD(B)" $][@;'])
],[
AC_SUBST([CCLD],['$(CC)'])
AC_SUBST([am__v_CCLD_0],['@echo " CCLD " $][@;'])
])
m4_popdef([lowercase])
# end $0
])
......@@ -1146,7 +1072,7 @@ AS_IF([test "x${osx_version_check}" = "xtrue"],[
AC_MSG_RESULT([$MACOSX_VERSION])])
AS_CASE(["$MACOSX_VERSION"],
[10.0*|10.1|10.1.*|10.2*|10.3*],AC_MSG_ERROR([This version of Mac OS X is not supported]),
[10.4*|10.5*|10.6*|10.7*|10.8*|10.9*|10.10*|10.11*|10.12*|10.13*],,
[10.4*|10.5*|10.6*|10.7*|10.8*|10.9*|10.10*|10.11*|10.12*],,
AC_MSG_WARN([Unknown Mac OS X version]))
])])])
......@@ -1398,8 +1324,6 @@ double volatile d = round(c);
])
m4_popdef([option])
m4_popdef([symbol])
])
# string listing all the SIMD extensions supported by the compiler
......
......@@ -131,9 +131,10 @@ swig_octave_flags = -octave $(SWIG_OCTAVE_FLAGS) -outdir swiglal_octave/ $(swig_
octexec_LTLIBRARIES = swiglal_octave.la
nodist_swiglal_octave_la_SOURCES = swiglal_octave.cpp
swiglal_octave_la_SOURCES = SWIGTest.c
swiglal_octave_la_CPPFLAGS = $(SWIG_OCTAVE_CPPFLAGS_IOCTAVE) $(swig_cppflags) $(SWIG_OCTAVE_CPPFLAGS) $(LAL_SYSTEM_INCLUDES)
swiglal_octave_la_CPPFLAGS = $(SWIG_OCTAVE_CPPFLAGS_IOCTAVE) $(swig_cppflags) $(SWIG_OCTAVE_CPPFLAGS)
swiglal_octave_la_CXXFLAGS = $(SWIG_OCTAVE_CXXFLAGS)
swiglal_octave_la_LDFLAGS = $(LDADD) $(swig_ldflags) $(SWIG_OCTAVE_LDFLAGS)
swiglal_octave_la_LDFLAGS = $(swig_ldflags) $(SWIG_OCTAVE_LDFLAGS)
swiglal_octave_la_LIBADD = $(LDADD)
swiglal_octave_la_LIBTOOLFLAGS = $(swig_libtoolflags)
if AMDEP
......@@ -186,9 +187,10 @@ pkgpyexec_LTLIBRARIES = swiglal_python.la
nodist_pkgpyexec_PYTHON = swiglal_python/$(PACKAGE).py
nodist_swiglal_python_la_SOURCES = swiglal_python.c
swiglal_python_la_SOURCES = SWIGTest.c
swiglal_python_la_CPPFLAGS = $(swig_cppflags) $(SWIG_PYTHON_CPPFLAGS) $(LAL_SYSTEM_INCLUDES)
swiglal_python_la_CFLAGS = $(SWIG_PYTHON_CFLAGS)