epsi
/
msspec_python3
3
0
Fork 0
Code Issues 6 Pull Requests Releases Wiki Activity

Remove variant_dir in SConstruct. 

The f2py *.so suffix is not consistent with python virtualenv version.
By using the source dir it is easier to fix manually since the *.so are not
installed
This commit is contained in:
Sylvain Tricot 2020-05-26 13:50:23 +02:00
parent 43886601e9
commit d4e166cb6d
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/SConstruct
View File

@ -87,5 +87,7 @@ if GetOption('verbose'):
Export('env') Export('env')
SConscript('msspec/spec/fortran/SConstruct', variant_dir='build/build_spec') SConscript('msspec/spec/fortran/SConstruct')
SConscript('msspec/phagen/fortran/SConstruct', variant_dir='build/build_phagen') SConscript('msspec/phagen/fortran/SConstruct')
#SConscript('msspec/spec/fortran/SConstruct', variant_dir='build/build_spec')
#SConscript('msspec/phagen/fortran/SConstruct', variant_dir='build/build_phagen')

2
src/msspec/phagen/fortran/SConstruct
View File

@ -5,6 +5,6 @@ objects_src= ['phagen_scf_2.1_dp.f']
objects = env.Object(objects_src) objects = env.Object(objects_src)
module = env.F2py('libphagen', ['main.f'] + objects, F2PYCOMSTR=">>") module = env.F2py('libphagen', ['main.f'] + objects, F2PYCOMSTR=">>")
env.InstallModule(module) #env.InstallModule(module)
env.Alias('phagen', module) env.Alias('phagen', module)

8
src/msspec/spec/fortran/SConstruct
View File

@ -46,19 +46,19 @@ common_deps = dim_mod_obj + memalloc_obj + cluster_gen_obj + common_sub_obj
deps = common_deps + renormalization_obj + phd_se_noso_nosp_nosym_obj deps = common_deps + renormalization_obj + phd_se_noso_nosp_nosym_obj
phd_se_mod = env_spec.F2py('_phd_se_noso_nosp_nosym', ['phd_se_noso_nosp_nosym/main.f'] + deps) phd_se_mod = env_spec.F2py('_phd_se_noso_nosp_nosym', ['phd_se_noso_nosp_nosym/main.f'] + deps)
env_spec.InstallModule(phd_se_mod) #env_spec.InstallModule(phd_se_mod)
deps = common_deps + renormalization_obj + phd_mi_noso_nosp_nosym_obj deps = common_deps + renormalization_obj + phd_mi_noso_nosp_nosym_obj
phd_mi_mod = env_spec.F2py('_phd_mi_noso_nosp_nosym', ['phd_mi_noso_nosp_nosym/main.f'] + deps) phd_mi_mod = env_spec.F2py('_phd_mi_noso_nosp_nosym', ['phd_mi_noso_nosp_nosym/main.f'] + deps)
env_spec.InstallModule(phd_mi_mod) #env_spec.InstallModule(phd_mi_mod)
deps = common_deps + renormalization_obj + eig_common_obj + eig_mi_obj deps = common_deps + renormalization_obj + eig_common_obj + eig_mi_obj
eig_mi_mod = env_spec.F2py('_eig_mi', ['eig/mi/main.f'] + deps) eig_mi_mod = env_spec.F2py('_eig_mi', ['eig/mi/main.f'] + deps)
env_spec.InstallModule(eig_mi_mod) #env_spec.InstallModule(eig_mi_mod)
deps = common_deps + renormalization_obj + eig_common_obj + eig_pw_obj deps = common_deps + renormalization_obj + eig_common_obj + eig_pw_obj
eig_pw_mod = env_spec.F2py('_eig_pw', ['eig/pw/main.f'] + deps) eig_pw_mod = env_spec.F2py('_eig_pw', ['eig/pw/main.f'] + deps)
env_spec.InstallModule(eig_pw_mod) #env_spec.InstallModule(eig_pw_mod)
# Alias # Alias
env_spec.Alias('spec', [phd_se_mod, phd_mi_mod, eig_pw_mod, eig_mi_mod]) env_spec.Alias('spec', [phd_se_mod, phd_mi_mod, eig_pw_mod, eig_mi_mod])