Commit e983ce31 authored by Maude Le Jeune's avatar Maude Le Jeune
Browse files

Merge branch 'master' of gitorious.org:spherelib/spherelib

parents a80fc46d 73fa9e55
...@@ -200,7 +200,7 @@ class AlmExt : public Alm< xcomplex<T> > ...@@ -200,7 +200,7 @@ class AlmExt : public Alm< xcomplex<T> >
case 12: return Trafo(1950,1950,Galactic,Ecliptic); case 12: return Trafo(1950,1950,Galactic,Ecliptic);
default: planck_fail("Unsupported transformation "+dataToString(num)); default: planck_fail("Unsupported transformation "+dataToString(num));
} }
} }
///////////////////////////////////////////////// /////////////////////////////////////////////////
...@@ -211,7 +211,7 @@ class AlmExt : public Alm< xcomplex<T> > ...@@ -211,7 +211,7 @@ class AlmExt : public Alm< xcomplex<T> >
{ {
Trafo tr(maketrafo(trafo)); Trafo tr(maketrafo(trafo));
rotate_alm((*this),tr.Matrix()); rotate_alm((*this),tr.Matrix());
} }
///////////////////////////////////////////////// /////////////////////////////////////////////////
......
...@@ -91,3 +91,4 @@ void rotate_alm (npy_cdouble *salm, int nsalm, int rotint) ...@@ -91,3 +91,4 @@ void rotate_alm (npy_cdouble *salm, int nsalm, int rotint)
} }
...@@ -53,7 +53,7 @@ def configure(ctx): ...@@ -53,7 +53,7 @@ def configure(ctx):
ctx.check(header_name=['fitsio.h'],compile_mode='cxx', mandatory=True) ctx.check(header_name=['fitsio.h'],compile_mode='cxx', mandatory=True)
except: except:
print('→ find cfitsio from cfitsio_prefix') print('→ find cfitsio from cfitsio_prefix')
ctx.env["CFITSIO_PREFIX"] = str(Options.options.healpix_prefix) ctx.env["CFITSIO_PREFIX"] = str(Options.options.cfitsio_prefix)
ctx.env["CFITSIO_EXT_LIB"] = ctx.env["CFITSIO_PREFIX"]+'/lib' ctx.env["CFITSIO_EXT_LIB"] = ctx.env["CFITSIO_PREFIX"]+'/lib'
ctx.env["CFITSIO_EXT_INC"] = ctx.env["CFITSIO_PREFIX"]+'/include' ctx.env["CFITSIO_EXT_INC"] = ctx.env["CFITSIO_PREFIX"]+'/include'
ctx.env['CXXFLAGS'].append("-I"+ctx.env["CFITSIO_EXT_INC"]) ctx.env['CXXFLAGS'].append("-I"+ctx.env["CFITSIO_EXT_INC"])
...@@ -62,20 +62,19 @@ def configure(ctx): ...@@ -62,20 +62,19 @@ def configure(ctx):
ctx.env["HEALPIX_TARGET"] = "healpy" ctx.env["HEALPIX_TARGET"] = "healpy"
ctx.check_cxx(lib=['cfitsio'], libpath=ctx.env["CFITSIO_EXT_LIB"], uselib_store='cfitsio', mandatory=True) ctx.check_cxx(lib=['cfitsio'], libpath=ctx.env["CFITSIO_EXT_LIB"], uselib_store='cfitsio', mandatory=True)
ctx.check_cxx(lib=['cxxsupport', 'cfitsio', 'fftpack', 'healpix_cxx','psht','c_utils'], ctx.check_cxx(lib=['cxxsupport', 'fftpack', 'healpix_cxx','psht','c_utils'],libpath=ctx.env["HEALPIX_EXT_LIB"], uselib_store='healpix',mandatory=True)
libpath=ctx.env["HEALPIX_EXT_LIB"], uselib_store='healpix',mandatory=True)
ctx.env['CXXFLAGS'].append("-I"+str(Options.options.with_gsl)+"/include") ctx.env['CXXFLAGS'].append("-I"+str(Options.options.with_gsl)+"/include")
ctx.env['CXXFLAGS'].append("-I"+str(Options.options.with_fftw3)+"/include") ctx.env['CXXFLAGS'].append("-I"+str(Options.options.with_fftw3)+"/include")
ctx.env['CXXFLAGS'].append("-I"+str(Options.options.with_numpy_core)+"/include") ctx.env['CXXFLAGS'].append("-I"+str(Options.options.with_numpy_core)+"/include")
ctx.env['CXXFLAGS'].append('-fPIC') ctx.env['CXXFLAGS'].append('-fPIC')
ctx.env['CXXFLAGS'].append('-fopenmp') ctx.env['CXXFLAGS'].append('-fopenmp')
ctx.env['CXXFLAGS'].append('-shared')
#ctx.check_fortran() #ctx.check_fortran()
ctx.check(header_name=['gsl/gsl_rng.h', 'gsl/gsl_sort_double.h'],compile_mode='cxx', mandatory=True) ctx.check(header_name=['gsl/gsl_rng.h', 'gsl/gsl_sort_double.h'],compile_mode='cxx', mandatory=True)
ctx.check(header_name=['fftw3.h'],compile_mode='cxx', mandatory=True) ctx.check(header_name=['fftw3.h'],compile_mode='cxx', mandatory=True)
ctx.check_cxx(lib=['gsl', 'gslcblas'], libpath=str(Options.options.with_gsl)+"/lib", uselib_store='gsl', mandatory=True) ctx.check_cxx(lib=['gsl', 'gslcblas'], libpath=str(Options.options.with_gsl)+"/lib", uselib_store='gsl', mandatory=True)
ctx.check_cxx(lib=['fftw3'], libpath=str(Options.options.with_fftw3)+"/lib", uselib_store='fftw3', mandatory=True) ctx.check_cxx(lib=['fftw3'], libpath=str(Options.options.with_fftw3)+"/lib", uselib_store='fftw3', mandatory=True)
ctx.check_python_module('healpy') ctx.check_python_module('healpy')
#ctx.find_file('numpy/arrayobject.h', mandatory=True) #ctx.find_file('numpy/arrayobject.h', mandatory=True)
...@@ -90,7 +89,9 @@ def build(bld): ...@@ -90,7 +89,9 @@ def build(bld):
import Options import Options
import os import os
libs.append('gomp' ) libs.append('gomp' )
#libs.append('iomp5')
libs.append('pthread') libs.append('pthread')
target=bld.env["HEALPIX_TARGET"] target=bld.env["HEALPIX_TARGET"]
abspath = bld.root.abspath() abspath = bld.root.abspath()
cxx_spherelib = bld( cxx_spherelib = bld(
......
Markdown is supported
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