Commit 2880305d authored by Nathanaël Schaeffer's avatar Nathanaël Schaeffer
Browse files

add version and 'git describe' computed at compile-time; update to v3.4.6

parent 57114269
Pipeline #67070 failed with stages
in 10 seconds
SHTNS CHANGE LOG:
-----------------
* v3.4.6 (15 May 2021)
- Fix major bug arising in complex-valued synthesis since v3.4 (issue #42).
- Fix accuracy error for regular grids including poles and lmax>=1000.
- Fix hang occuring sometimes with python `set_grid()` method.
- Fix normalization issue with CUDA for analysis when using `SHT_REAL_NORM`.
- other minor fixes and improvements.
* v3.4.5 (13 Nov 2020)
- Fix compilation of python module with older versions of gcc.
......
......@@ -3,11 +3,13 @@ PREFIX=@prefix@
SED=@SED@
LIBS=@LIBS@
PYTHON=@PYTHON@
shtns_ver := $(shell grep -m 1 -e "^* v" CHANGELOG.md | sed -e "s/^* v\([^ ]*\).*/-DSHTNS_VER=\\\\\"\1\\\\\"/")
git_id := $(shell git describe --tags --always --dirty=*)
# compiler command with options for the sht codelets
shtcc=@CC2@ @CFLAGS2@ -D_GNU_SOURCE
# compiler command with options for other source (initialization, ...)
cc=@CC@ @CFLAGS@ -D_GNU_SOURCE @LDFLAGS@
cc=@CC@ @CFLAGS@ -D_GNU_SOURCE -DSHTNS_GIT=\"$(git_id)\" $(shtns_ver) @LDFLAGS@
fc=@FC@ @FFLAGS@ @LDFLAGS@
hfiles = sht_private.h sht_config.h shtns.h shtns_simd.h
......
......@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.62])
AC_INIT([SHTns],[3.4.5],[],[shtns],[https://bitbucket.org/nschaeff/shtns])
AC_INIT([SHTns],[3.4.6],[],[shtns],[https://bitbucket.org/nschaeff/shtns])
AC_LANG([C])
AC_CONFIG_SRCDIR([sht_init.c])
AC_CONFIG_HEADERS([sht_config.h])
......
......@@ -59,10 +59,14 @@ void shtns_verbose(int v) {
#define _SHTNS_ID_ _SIMD_NAME_
#endif
#ifndef SHTNS_VER
#define SHTNS_VER PACKAGE_VERSION
#endif
/// \internal Abort program with error message.
static void shtns_runerr(const char * error_text)
{
printf("*** [" PACKAGE_NAME "] Run-time error : %s\n",error_text);
printf("*** [SHTns] Run-time error : %s\n",error_text);
exit(1);
}
......@@ -898,10 +902,13 @@ done:
void shtns_print_version() {
#ifndef SHTNS4MAGIC
printf("[" PACKAGE_STRING "] built " __DATE__ ", " __TIME__ ", id: " _SHTNS_ID_ "\n");
printf("[SHTns " SHTNS_VER "] built ");
#else
printf("[" PACKAGE_STRING "] built for MagIC " __DATE__ ", " __TIME__ ", id: " _SHTNS_ID_ "\n");
printf("[SHTns " SHTNS_VER "] built for MagIC ");
#endif
printf(__DATE__ ", " __TIME__ ", id: ");
if (strlen(SHTNS_GIT) > 0) printf(SHTNS_GIT ",");
printf(_SHTNS_ID_ "\n");
}
......@@ -965,7 +972,7 @@ int config_save(shtns_cfg shtns, int req_flags)
FILE *fcfg = fopen("shtns_cfg","a");
if (fcfg != NULL) {
fprintf(fcfg, "%s %s %d %d %d %d %d %d %d %d %d %d",PACKAGE_VERSION, _SHTNS_ID_, shtns->lmax, shtns->mmax, shtns->mres, shtns->nphi, shtns->nlat, shtns->grid, shtns->nthreads, req_flags, shtns->nlorder, -1);
fprintf(fcfg, "%s %s %d %d %d %d %d %d %d %d %d %d",SHTNS_VER, _SHTNS_ID_, shtns->lmax, shtns->mmax, shtns->mres, shtns->nphi, shtns->nlat, shtns->grid, shtns->nthreads, req_flags, shtns->nlorder, -1);
fprint_ftable(fcfg, shtns->ftable);
fprintf(fcfg,"\n");
fclose(fcfg);
......@@ -1473,7 +1480,7 @@ int shtns_set_grid_auto(shtns_cfg shtns, enum shtns_type flags, double eps, int
if ((omp_threads > 1)&&(verbose>1)) printf(" nthreads = %d\n",shtns->nthreads);
#endif
#if SHT_VERBOSE > 0
if (verbose) printf(" => " PACKAGE_NAME " is ready.\n");
if (verbose) printf(" => SHTns is ready.\n");
#endif
return(shtns->nspat); // returns the number of doubles to be allocated for a spatial field.
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment