From ea87d5bf11888e6ec28cb44b7f884694aa21416f Mon Sep 17 00:00:00 2001 From: "Oleg E. Peil" Date: Fri, 11 Mar 2016 11:41:37 +0100 Subject: [PATCH] Fixed module and library paths In version 1.4 all python applications moved from the root python library to `pytriqs/` subdirectory. --- c++/plovasp/atm/CMakeLists.txt | 2 -- c++/plovasp/atm/test/CMakeLists.txt | 8 ++++---- python/converters/plovasp/CMakeLists.txt | 2 +- shells/plovasp.bash.in | 2 +- test/plovasp/atm/test_atm.py | 2 +- test/plovasp/inpconf/test_general.py | 2 +- test/plovasp/inpconf/test_groups.py | 2 +- test/plovasp/inpconf/test_input.py | 2 +- test/plovasp/inpconf/test_parameter_set.py | 2 +- test/plovasp/inpconf/test_shells.py | 2 +- test/plovasp/inpconf/test_special_parsers.py | 2 +- test/plovasp/plotools/test_consistency.py | 8 ++++---- test/plovasp/proj_group/test_block_map.py | 10 +++++----- test/plovasp/proj_group/test_one_site.py | 10 +++++----- test/plovasp/proj_group/test_select_bands.py | 10 +++++----- test/plovasp/proj_group/test_two_site.py | 10 +++++----- test/plovasp/proj_shell/test_projshells.py | 10 +++++----- test/plovasp/vaspio/test_doscar.py | 2 +- test/plovasp/vaspio/test_eigenval.py | 2 +- test/plovasp/vaspio/test_kpoints.py | 2 +- test/plovasp/vaspio/test_poscar.py | 2 +- 21 files changed, 46 insertions(+), 48 deletions(-) diff --git a/c++/plovasp/atm/CMakeLists.txt b/c++/plovasp/atm/CMakeLists.txt index 89187189..228e950f 100644 --- a/c++/plovasp/atm/CMakeLists.txt +++ b/c++/plovasp/atm/CMakeLists.txt @@ -3,8 +3,6 @@ add_library(atm_c dos_tetra3d.hpp dos_tetra3d.cpp argsort.hpp argsort.cpp) set_target_properties(atm_c PROPERTIES LINKER_LANGUAGE CXX) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/c++/plovasp/atm ${TRIQS_INCLUDE_ALL}) -#add_executable(test_atm test2py.cpp) -#target_link_libraries(test_atm atm_c) install(TARGETS atm_c DESTINATION lib) add_subdirectory(test) diff --git a/c++/plovasp/atm/test/CMakeLists.txt b/c++/plovasp/atm/test/CMakeLists.txt index 5407a392..eaecd9ed 100644 --- a/c++/plovasp/atm/test/CMakeLists.txt +++ b/c++/plovasp/atm/test/CMakeLists.txt @@ -12,10 +12,10 @@ FOREACH( TestName1 ${TestList} ) add_executable( ${TestName} ${CMAKE_CURRENT_SOURCE_DIR}/${TestName}.cpp ) target_link_libraries( ${TestName} atm_c ${TRIQS_LIBRARY_ALL} ) triqs_set_rpath_for_target( ${TestName} ) - triqs_add_cpp_test( ${TestName} ) -# if (TESTS_C_WITH_VALGRIND) -# add_test ( ${TestName}_valgrind valgrind --error-exitcode=1 ${CMAKE_CURRENT_BINARY_DIR}/${TestName}) -# endif() + triqs_add_cpp_test( ${TestName} ) + if (TESTS_C_WITH_VALGRIND) + add_test ( ${TestName}_valgrind valgrind --error-exitcode=1 ${CMAKE_CURRENT_BINARY_DIR}/${TestName}) + endif() ENDFOREACH( TestName1 ${TestList} ) #add_executable(test_atm test2py.cpp) diff --git a/python/converters/plovasp/CMakeLists.txt b/python/converters/plovasp/CMakeLists.txt index d09661c1..64bce9c0 100644 --- a/python/converters/plovasp/CMakeLists.txt +++ b/python/converters/plovasp/CMakeLists.txt @@ -1,4 +1,4 @@ -set(python_destination applications/dft/converters/plovasp) +set(python_destination pytriqs/applications/dft/converters/plovasp) include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${TRIQS_INCLUDE_ALL}) triqs_python_extension(atm ${python_destination}) diff --git a/shells/plovasp.bash.in b/shells/plovasp.bash.in index d4a34067..87798b99 100755 --- a/shells/plovasp.bash.in +++ b/shells/plovasp.bash.in @@ -1,4 +1,4 @@ #!/bin/bash -pytriqs -m applications.dft.converters.plovasp.converter $@ +pytriqs -m pytriqs.applications.dft.converters.plovasp.converter $@ diff --git a/test/plovasp/atm/test_atm.py b/test/plovasp/atm/test_atm.py index f0fc9595..46736e87 100644 --- a/test/plovasp/atm/test_atm.py +++ b/test/plovasp/atm/test_atm.py @@ -2,7 +2,7 @@ import os import numpy as np -import applications.dft.converters.plovasp.atm as atm +import pytriqs.applications.dft.converters.plovasp.atm as atm import mytest ################################################################################ diff --git a/test/plovasp/inpconf/test_general.py b/test/plovasp/inpconf/test_general.py index f5cff3a5..8cc694de 100644 --- a/test/plovasp/inpconf/test_general.py +++ b/test/plovasp/inpconf/test_general.py @@ -7,7 +7,7 @@ _rpath = os.path.dirname(rpath.__file__) + '/' import arraytest import numpy as np -from applications.dft.converters.plovasp.inpconf import ConfigParameters +from pytriqs.applications.dft.converters.plovasp.inpconf import ConfigParameters ################################################################################ # diff --git a/test/plovasp/inpconf/test_groups.py b/test/plovasp/inpconf/test_groups.py index 891990b5..6f2a1cc2 100644 --- a/test/plovasp/inpconf/test_groups.py +++ b/test/plovasp/inpconf/test_groups.py @@ -7,7 +7,7 @@ _rpath = os.path.dirname(rpath.__file__) + '/' import arraytest import numpy as np -from applications.dft.converters.plovasp.inpconf import ConfigParameters +from pytriqs.applications.dft.converters.plovasp.inpconf import ConfigParameters ################################################################################ # diff --git a/test/plovasp/inpconf/test_input.py b/test/plovasp/inpconf/test_input.py index 585d6e25..89418fdb 100644 --- a/test/plovasp/inpconf/test_input.py +++ b/test/plovasp/inpconf/test_input.py @@ -7,7 +7,7 @@ _rpath = os.path.dirname(rpath.__file__) + '/' import arraytest import numpy as np -from applications.dft.converters.plovasp.inpconf import ConfigParameters +from pytriqs.applications.dft.converters.plovasp.inpconf import ConfigParameters ################################################################################ # diff --git a/test/plovasp/inpconf/test_parameter_set.py b/test/plovasp/inpconf/test_parameter_set.py index 674cd6cf..36590dc6 100644 --- a/test/plovasp/inpconf/test_parameter_set.py +++ b/test/plovasp/inpconf/test_parameter_set.py @@ -7,7 +7,7 @@ _rpath = os.path.dirname(rpath.__file__) + '/' import arraytest import numpy as np -from applications.dft.converters.plovasp.inpconf import ConfigParameters +from pytriqs.applications.dft.converters.plovasp.inpconf import ConfigParameters ################################################################################ # diff --git a/test/plovasp/inpconf/test_shells.py b/test/plovasp/inpconf/test_shells.py index 90d9c8e4..8d488481 100644 --- a/test/plovasp/inpconf/test_shells.py +++ b/test/plovasp/inpconf/test_shells.py @@ -7,7 +7,7 @@ _rpath = os.path.dirname(rpath.__file__) + '/' import arraytest import numpy as np -from applications.dft.converters.plovasp.inpconf import ConfigParameters +from pytriqs.applications.dft.converters.plovasp.inpconf import ConfigParameters ################################################################################ # diff --git a/test/plovasp/inpconf/test_special_parsers.py b/test/plovasp/inpconf/test_special_parsers.py index 2631e51c..9e8dab57 100644 --- a/test/plovasp/inpconf/test_special_parsers.py +++ b/test/plovasp/inpconf/test_special_parsers.py @@ -7,7 +7,7 @@ _rpath = os.path.dirname(rpath.__file__) + '/' import arraytest import numpy as np -from applications.dft.converters.plovasp.inpconf import ConfigParameters +from pytriqs.applications.dft.converters.plovasp.inpconf import ConfigParameters ################################################################################ # diff --git a/test/plovasp/plotools/test_consistency.py b/test/plovasp/plotools/test_consistency.py index 52b94f13..9add6920 100644 --- a/test/plovasp/plotools/test_consistency.py +++ b/test/plovasp/plotools/test_consistency.py @@ -1,8 +1,8 @@ -import applications.dft.converters.plovasp.vaspio -from applications.dft.converters.plovasp.inpconf import ConfigParameters -from applications.dft.converters.plovasp.plotools import check_data_consistency -from applications.dft.converters.plovasp.elstruct import ElectronicStructure +import pytriqs.applications.dft.converters.plovasp.vaspio +from pytriqs.applications.dft.converters.plovasp.inpconf import ConfigParameters +from pytriqs.applications.dft.converters.plovasp.plotools import check_data_consistency +from pytriqs.applications.dft.converters.plovasp.elstruct import ElectronicStructure import mytest ################################################################################ diff --git a/test/plovasp/proj_group/test_block_map.py b/test/plovasp/proj_group/test_block_map.py index 24df5606..55350f34 100644 --- a/test/plovasp/proj_group/test_block_map.py +++ b/test/plovasp/proj_group/test_block_map.py @@ -4,11 +4,11 @@ import rpath _rpath = os.path.dirname(rpath.__file__) + '/' import numpy as np -import applications.dft.converters.plovasp.vaspio as vaspio -import applications.dft.converters.plovasp.elstruct as elstruct -from applications.dft.converters.plovasp.inpconf import ConfigParameters -from applications.dft.converters.plovasp.proj_shell import ProjectorShell -from applications.dft.converters.plovasp.proj_group import ProjectorGroup +import pytriqs.applications.dft.converters.plovasp.vaspio as vaspio +import pytriqs.applications.dft.converters.plovasp.elstruct as elstruct +from pytriqs.applications.dft.converters.plovasp.inpconf import ConfigParameters +from pytriqs.applications.dft.converters.plovasp.proj_shell import ProjectorShell +from pytriqs.applications.dft.converters.plovasp.proj_group import ProjectorGroup import mytest ################################################################################ diff --git a/test/plovasp/proj_group/test_one_site.py b/test/plovasp/proj_group/test_one_site.py index a88ad076..0ed15b57 100644 --- a/test/plovasp/proj_group/test_one_site.py +++ b/test/plovasp/proj_group/test_one_site.py @@ -4,11 +4,11 @@ import rpath _rpath = os.path.dirname(rpath.__file__) + '/' import numpy as np -import applications.dft.converters.plovasp.vaspio as vaspio -import applications.dft.converters.plovasp.elstruct as elstruct -from applications.dft.converters.plovasp.inpconf import ConfigParameters -from applications.dft.converters.plovasp.proj_shell import ProjectorShell -from applications.dft.converters.plovasp.proj_group import ProjectorGroup +import pytriqs.applications.dft.converters.plovasp.vaspio as vaspio +import pytriqs.applications.dft.converters.plovasp.elstruct as elstruct +from pytriqs.applications.dft.converters.plovasp.inpconf import ConfigParameters +from pytriqs.applications.dft.converters.plovasp.proj_shell import ProjectorShell +from pytriqs.applications.dft.converters.plovasp.proj_group import ProjectorGroup import mytest ################################################################################ diff --git a/test/plovasp/proj_group/test_select_bands.py b/test/plovasp/proj_group/test_select_bands.py index 0a90ef71..23e56864 100644 --- a/test/plovasp/proj_group/test_select_bands.py +++ b/test/plovasp/proj_group/test_select_bands.py @@ -4,11 +4,11 @@ import rpath _rpath = os.path.dirname(rpath.__file__) + '/' import numpy as np -import applications.dft.converters.plovasp.vaspio as vaspio -import applications.dft.converters.plovasp.elstruct as elstruct -from applications.dft.converters.plovasp.inpconf import ConfigParameters -from applications.dft.converters.plovasp.proj_shell import ProjectorShell -from applications.dft.converters.plovasp.proj_group import ProjectorGroup +import pytriqs.applications.dft.converters.plovasp.vaspio as vaspio +import pytriqs.applications.dft.converters.plovasp.elstruct as elstruct +from pytriqs.applications.dft.converters.plovasp.inpconf import ConfigParameters +from pytriqs.applications.dft.converters.plovasp.proj_shell import ProjectorShell +from pytriqs.applications.dft.converters.plovasp.proj_group import ProjectorGroup import mytest ################################################################################ diff --git a/test/plovasp/proj_group/test_two_site.py b/test/plovasp/proj_group/test_two_site.py index ed27e3ce..a897fbaf 100644 --- a/test/plovasp/proj_group/test_two_site.py +++ b/test/plovasp/proj_group/test_two_site.py @@ -4,11 +4,11 @@ import rpath _rpath = os.path.dirname(rpath.__file__) + '/' import numpy as np -import applications.dft.converters.plovasp.vaspio as vaspio -import applications.dft.converters.plovasp.elstruct as elstruct -from applications.dft.converters.plovasp.inpconf import ConfigParameters -from applications.dft.converters.plovasp.proj_shell import ProjectorShell -from applications.dft.converters.plovasp.proj_group import ProjectorGroup +import pytriqs.applications.dft.converters.plovasp.vaspio as vaspio +import pytriqs.applications.dft.converters.plovasp.elstruct as elstruct +from pytriqs.applications.dft.converters.plovasp.inpconf import ConfigParameters +from pytriqs.applications.dft.converters.plovasp.proj_shell import ProjectorShell +from pytriqs.applications.dft.converters.plovasp.proj_group import ProjectorGroup import mytest ################################################################################ diff --git a/test/plovasp/proj_shell/test_projshells.py b/test/plovasp/proj_shell/test_projshells.py index bcdd7c7e..977dc0e3 100644 --- a/test/plovasp/proj_shell/test_projshells.py +++ b/test/plovasp/proj_shell/test_projshells.py @@ -4,11 +4,11 @@ import rpath _rpath = os.path.dirname(rpath.__file__) + '/' import numpy as np -import applications.dft.converters.plovasp.vaspio as vaspio -import applications.dft.converters.plovasp.elstruct as elstruct -from applications.dft.converters.plovasp.inpconf import ConfigParameters -from applications.dft.converters.plovasp.proj_shell import ProjectorShell -from applications.dft.converters.plovasp.proj_group import ProjectorGroup +import pytriqs.applications.dft.converters.plovasp.vaspio as vaspio +import pytriqs.applications.dft.converters.plovasp.elstruct as elstruct +from pytriqs.applications.dft.converters.plovasp.inpconf import ConfigParameters +from pytriqs.applications.dft.converters.plovasp.proj_shell import ProjectorShell +from pytriqs.applications.dft.converters.plovasp.proj_group import ProjectorGroup import mytest ################################################################################ diff --git a/test/plovasp/vaspio/test_doscar.py b/test/plovasp/vaspio/test_doscar.py index 005ad7f3..2b22a5df 100644 --- a/test/plovasp/vaspio/test_doscar.py +++ b/test/plovasp/vaspio/test_doscar.py @@ -7,7 +7,7 @@ _rpath = os.path.dirname(rpath.__file__) + '/' import mytest import numpy as np -from applications.dft.converters.plovasp.vaspio import Doscar +from pytriqs.applications.dft.converters.plovasp.vaspio import Doscar ################################################################################ # diff --git a/test/plovasp/vaspio/test_eigenval.py b/test/plovasp/vaspio/test_eigenval.py index 270ddf15..8a4a17a9 100644 --- a/test/plovasp/vaspio/test_eigenval.py +++ b/test/plovasp/vaspio/test_eigenval.py @@ -7,7 +7,7 @@ _rpath = os.path.dirname(rpath.__file__) + '/' import mytest import numpy as np -from applications.dft.converters.plovasp.vaspio import Eigenval +from pytriqs.applications.dft.converters.plovasp.vaspio import Eigenval ################################################################################ # diff --git a/test/plovasp/vaspio/test_kpoints.py b/test/plovasp/vaspio/test_kpoints.py index 81e6b31c..4a70338b 100644 --- a/test/plovasp/vaspio/test_kpoints.py +++ b/test/plovasp/vaspio/test_kpoints.py @@ -7,7 +7,7 @@ _rpath = os.path.dirname(rpath.__file__) + '/' import mytest import numpy as np -from applications.dft.converters.plovasp.vaspio import Kpoints +from pytriqs.applications.dft.converters.plovasp.vaspio import Kpoints ################################################################################ # diff --git a/test/plovasp/vaspio/test_poscar.py b/test/plovasp/vaspio/test_poscar.py index 67fbad3f..c0047b0e 100644 --- a/test/plovasp/vaspio/test_poscar.py +++ b/test/plovasp/vaspio/test_poscar.py @@ -7,7 +7,7 @@ _rpath = os.path.dirname(rpath.__file__) + '/' import mytest import numpy as np -from applications.dft.converters.plovasp.vaspio import Poscar +from pytriqs.applications.dft.converters.plovasp.vaspio import Poscar ################################################################################ #