Commit 67a4fdc6 authored by Alessandro Mirone's avatar Alessandro Mirone

Merge branch 'speedup' of https://gitlab.esrf.fr/mirone/chst into speedup

parents bc00517d 543f1ae7
......@@ -34,6 +34,10 @@
#include <stdio.h>
#include <stdlib.h>
#include<math.h>
#ifndef M_PI
#define M_PI 3.14159265358979323846
#endif
#ifdef __SSE__
#include<emmintrin.h>
#endif
......
......@@ -13,6 +13,9 @@
#include "CCspace.h"
#include "edftools.h"
#include <math.h>
#ifndef M_PI
#define M_PI 3.14159265358979323846
#endif
#define myfread( a,b,c ,d ) {int res=fread(a,b,c,d); if(res<-1) printf(" gcc casse les pieds\n");}
......
......@@ -506,7 +506,8 @@ from . import Parameters_module
if(sys.argv[0][-12:]!="sphinx-build"):
from .Parameters_module import Parameters as P
mpi_extra=" --map-by slot "
# mpi_extra=" --map-by slot "
mpi_extra=" --byslot "
comando = 'mpirun -V'
if (sys.version_info >= (3, 7)):
......
......@@ -30,5 +30,5 @@
# is a problem for you.
#############################################################################*/
version = "2020a"
version = "__init__"
......@@ -304,6 +304,7 @@ def do_pyhst():
if "USECLANG4NVCC" in os.environ and os.environ ["USECLANG4NVCC"]=="YES":
postargs = postargs + [" -ccbin clang-3.8"]
else:
print(" EXTRA ", extra_postargs)
self.set_executable('compiler_so', "mpicc")
postargs = extra_postargs['gcc']
# postargs = extra_postargs['gcc']
......@@ -441,7 +442,7 @@ def do_pyhst():
library_dirs= mpilibs_dirs,
libraries=["fftw3f_threads", "fftw3f",hdf5_lib, "mpi"],
extra_link_args=['-fopenmp'] ,
extra_compile_args={'gcc': ["-fPIC",'-fopenmp',"-g" ]},
extra_compile_args={'gcc': ["-fPIC",'-fopenmp',"-g" ,"-std=c99"]},
define_macros=define_macros,
include_dirs=[ CUDA['include'], numpy.get_include()] + mpi_dirs + hdf5_dirs )
return module
......@@ -469,7 +470,7 @@ def do_pyhst():
# this syntax is specific to this build system
# we're only going to use certain compiler args with nvcc and not with gcc
# the implementation of this trick is in customize_compiler() below
extra_compile_args={'gcc': ["-g","-fPIC", "-O3"],
extra_compile_args={'gcc': ["-std=c99", "-g","-fPIC", "-O3"],
'nvcc': CUDA["arch"] + [ "--compiler-options", "-fPIC", "-O3", "-g","-D_FORCE_INLINES" ]},
include_dirs=[numpy.get_include(), CUDA['include'], 'PyHST/Cspace'] + hdf5_dirs)
return module
......@@ -494,7 +495,7 @@ def do_pyhst():
runtime_library_dirs=[CUDA['lib']],
extra_compile_args={'gcc': ["-g","-fPIC", "-O3"],
extra_compile_args={'gcc': ["-std=c99","-g","-fPIC", "-O3"],
'nvcc': CUDA["arch"] + [ "--compiler-options", "-fPIC", "-O3", "-g","-D_FORCE_INLINES" ]},
include_dirs=[numpy.get_include(), CUDA['include'], 'PyHST/Cspace',"/usr/include/qt4"] )
......
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