mirror of
https://github.com/triqs/dft_tools
synced 2024-12-21 11:53:41 +01:00
Fixed module and library paths
In version 1.4 all python applications moved from the root python library to `pytriqs/` subdirectory.
This commit is contained in:
parent
edf5038140
commit
ea87d5bf11
@ -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)
|
set_target_properties(atm_c PROPERTIES LINKER_LANGUAGE CXX)
|
||||||
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/c++/plovasp/atm ${TRIQS_INCLUDE_ALL})
|
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)
|
install(TARGETS atm_c DESTINATION lib)
|
||||||
|
|
||||||
add_subdirectory(test)
|
add_subdirectory(test)
|
||||||
|
@ -12,10 +12,10 @@ FOREACH( TestName1 ${TestList} )
|
|||||||
add_executable( ${TestName} ${CMAKE_CURRENT_SOURCE_DIR}/${TestName}.cpp )
|
add_executable( ${TestName} ${CMAKE_CURRENT_SOURCE_DIR}/${TestName}.cpp )
|
||||||
target_link_libraries( ${TestName} atm_c ${TRIQS_LIBRARY_ALL} )
|
target_link_libraries( ${TestName} atm_c ${TRIQS_LIBRARY_ALL} )
|
||||||
triqs_set_rpath_for_target( ${TestName} )
|
triqs_set_rpath_for_target( ${TestName} )
|
||||||
triqs_add_cpp_test( ${TestName} )
|
triqs_add_cpp_test( ${TestName} )
|
||||||
# if (TESTS_C_WITH_VALGRIND)
|
if (TESTS_C_WITH_VALGRIND)
|
||||||
# add_test ( ${TestName}_valgrind valgrind --error-exitcode=1 ${CMAKE_CURRENT_BINARY_DIR}/${TestName})
|
add_test ( ${TestName}_valgrind valgrind --error-exitcode=1 ${CMAKE_CURRENT_BINARY_DIR}/${TestName})
|
||||||
# endif()
|
endif()
|
||||||
ENDFOREACH( TestName1 ${TestList} )
|
ENDFOREACH( TestName1 ${TestList} )
|
||||||
|
|
||||||
#add_executable(test_atm test2py.cpp)
|
#add_executable(test_atm test2py.cpp)
|
||||||
|
@ -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})
|
include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${TRIQS_INCLUDE_ALL})
|
||||||
triqs_python_extension(atm ${python_destination})
|
triqs_python_extension(atm ${python_destination})
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
pytriqs -m applications.dft.converters.plovasp.converter $@
|
pytriqs -m pytriqs.applications.dft.converters.plovasp.converter $@
|
||||||
|
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
import os
|
import os
|
||||||
|
|
||||||
import numpy as np
|
import numpy as np
|
||||||
import applications.dft.converters.plovasp.atm as atm
|
import pytriqs.applications.dft.converters.plovasp.atm as atm
|
||||||
import mytest
|
import mytest
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
|
@ -7,7 +7,7 @@ _rpath = os.path.dirname(rpath.__file__) + '/'
|
|||||||
|
|
||||||
import arraytest
|
import arraytest
|
||||||
import numpy as np
|
import numpy as np
|
||||||
from applications.dft.converters.plovasp.inpconf import ConfigParameters
|
from pytriqs.applications.dft.converters.plovasp.inpconf import ConfigParameters
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
#
|
#
|
||||||
|
@ -7,7 +7,7 @@ _rpath = os.path.dirname(rpath.__file__) + '/'
|
|||||||
|
|
||||||
import arraytest
|
import arraytest
|
||||||
import numpy as np
|
import numpy as np
|
||||||
from applications.dft.converters.plovasp.inpconf import ConfigParameters
|
from pytriqs.applications.dft.converters.plovasp.inpconf import ConfigParameters
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
#
|
#
|
||||||
|
@ -7,7 +7,7 @@ _rpath = os.path.dirname(rpath.__file__) + '/'
|
|||||||
|
|
||||||
import arraytest
|
import arraytest
|
||||||
import numpy as np
|
import numpy as np
|
||||||
from applications.dft.converters.plovasp.inpconf import ConfigParameters
|
from pytriqs.applications.dft.converters.plovasp.inpconf import ConfigParameters
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
#
|
#
|
||||||
|
@ -7,7 +7,7 @@ _rpath = os.path.dirname(rpath.__file__) + '/'
|
|||||||
|
|
||||||
import arraytest
|
import arraytest
|
||||||
import numpy as np
|
import numpy as np
|
||||||
from applications.dft.converters.plovasp.inpconf import ConfigParameters
|
from pytriqs.applications.dft.converters.plovasp.inpconf import ConfigParameters
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
#
|
#
|
||||||
|
@ -7,7 +7,7 @@ _rpath = os.path.dirname(rpath.__file__) + '/'
|
|||||||
|
|
||||||
import arraytest
|
import arraytest
|
||||||
import numpy as np
|
import numpy as np
|
||||||
from applications.dft.converters.plovasp.inpconf import ConfigParameters
|
from pytriqs.applications.dft.converters.plovasp.inpconf import ConfigParameters
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
#
|
#
|
||||||
|
@ -7,7 +7,7 @@ _rpath = os.path.dirname(rpath.__file__) + '/'
|
|||||||
|
|
||||||
import arraytest
|
import arraytest
|
||||||
import numpy as np
|
import numpy as np
|
||||||
from applications.dft.converters.plovasp.inpconf import ConfigParameters
|
from pytriqs.applications.dft.converters.plovasp.inpconf import ConfigParameters
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
#
|
#
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
|
|
||||||
import applications.dft.converters.plovasp.vaspio
|
import pytriqs.applications.dft.converters.plovasp.vaspio
|
||||||
from applications.dft.converters.plovasp.inpconf import ConfigParameters
|
from pytriqs.applications.dft.converters.plovasp.inpconf import ConfigParameters
|
||||||
from applications.dft.converters.plovasp.plotools import check_data_consistency
|
from pytriqs.applications.dft.converters.plovasp.plotools import check_data_consistency
|
||||||
from applications.dft.converters.plovasp.elstruct import ElectronicStructure
|
from pytriqs.applications.dft.converters.plovasp.elstruct import ElectronicStructure
|
||||||
import mytest
|
import mytest
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
|
@ -4,11 +4,11 @@ import rpath
|
|||||||
_rpath = os.path.dirname(rpath.__file__) + '/'
|
_rpath = os.path.dirname(rpath.__file__) + '/'
|
||||||
|
|
||||||
import numpy as np
|
import numpy as np
|
||||||
import applications.dft.converters.plovasp.vaspio as vaspio
|
import pytriqs.applications.dft.converters.plovasp.vaspio as vaspio
|
||||||
import applications.dft.converters.plovasp.elstruct as elstruct
|
import pytriqs.applications.dft.converters.plovasp.elstruct as elstruct
|
||||||
from applications.dft.converters.plovasp.inpconf import ConfigParameters
|
from pytriqs.applications.dft.converters.plovasp.inpconf import ConfigParameters
|
||||||
from applications.dft.converters.plovasp.proj_shell import ProjectorShell
|
from pytriqs.applications.dft.converters.plovasp.proj_shell import ProjectorShell
|
||||||
from applications.dft.converters.plovasp.proj_group import ProjectorGroup
|
from pytriqs.applications.dft.converters.plovasp.proj_group import ProjectorGroup
|
||||||
import mytest
|
import mytest
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
|
@ -4,11 +4,11 @@ import rpath
|
|||||||
_rpath = os.path.dirname(rpath.__file__) + '/'
|
_rpath = os.path.dirname(rpath.__file__) + '/'
|
||||||
|
|
||||||
import numpy as np
|
import numpy as np
|
||||||
import applications.dft.converters.plovasp.vaspio as vaspio
|
import pytriqs.applications.dft.converters.plovasp.vaspio as vaspio
|
||||||
import applications.dft.converters.plovasp.elstruct as elstruct
|
import pytriqs.applications.dft.converters.plovasp.elstruct as elstruct
|
||||||
from applications.dft.converters.plovasp.inpconf import ConfigParameters
|
from pytriqs.applications.dft.converters.plovasp.inpconf import ConfigParameters
|
||||||
from applications.dft.converters.plovasp.proj_shell import ProjectorShell
|
from pytriqs.applications.dft.converters.plovasp.proj_shell import ProjectorShell
|
||||||
from applications.dft.converters.plovasp.proj_group import ProjectorGroup
|
from pytriqs.applications.dft.converters.plovasp.proj_group import ProjectorGroup
|
||||||
import mytest
|
import mytest
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
|
@ -4,11 +4,11 @@ import rpath
|
|||||||
_rpath = os.path.dirname(rpath.__file__) + '/'
|
_rpath = os.path.dirname(rpath.__file__) + '/'
|
||||||
|
|
||||||
import numpy as np
|
import numpy as np
|
||||||
import applications.dft.converters.plovasp.vaspio as vaspio
|
import pytriqs.applications.dft.converters.plovasp.vaspio as vaspio
|
||||||
import applications.dft.converters.plovasp.elstruct as elstruct
|
import pytriqs.applications.dft.converters.plovasp.elstruct as elstruct
|
||||||
from applications.dft.converters.plovasp.inpconf import ConfigParameters
|
from pytriqs.applications.dft.converters.plovasp.inpconf import ConfigParameters
|
||||||
from applications.dft.converters.plovasp.proj_shell import ProjectorShell
|
from pytriqs.applications.dft.converters.plovasp.proj_shell import ProjectorShell
|
||||||
from applications.dft.converters.plovasp.proj_group import ProjectorGroup
|
from pytriqs.applications.dft.converters.plovasp.proj_group import ProjectorGroup
|
||||||
import mytest
|
import mytest
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
|
@ -4,11 +4,11 @@ import rpath
|
|||||||
_rpath = os.path.dirname(rpath.__file__) + '/'
|
_rpath = os.path.dirname(rpath.__file__) + '/'
|
||||||
|
|
||||||
import numpy as np
|
import numpy as np
|
||||||
import applications.dft.converters.plovasp.vaspio as vaspio
|
import pytriqs.applications.dft.converters.plovasp.vaspio as vaspio
|
||||||
import applications.dft.converters.plovasp.elstruct as elstruct
|
import pytriqs.applications.dft.converters.plovasp.elstruct as elstruct
|
||||||
from applications.dft.converters.plovasp.inpconf import ConfigParameters
|
from pytriqs.applications.dft.converters.plovasp.inpconf import ConfigParameters
|
||||||
from applications.dft.converters.plovasp.proj_shell import ProjectorShell
|
from pytriqs.applications.dft.converters.plovasp.proj_shell import ProjectorShell
|
||||||
from applications.dft.converters.plovasp.proj_group import ProjectorGroup
|
from pytriqs.applications.dft.converters.plovasp.proj_group import ProjectorGroup
|
||||||
import mytest
|
import mytest
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
|
@ -4,11 +4,11 @@ import rpath
|
|||||||
_rpath = os.path.dirname(rpath.__file__) + '/'
|
_rpath = os.path.dirname(rpath.__file__) + '/'
|
||||||
|
|
||||||
import numpy as np
|
import numpy as np
|
||||||
import applications.dft.converters.plovasp.vaspio as vaspio
|
import pytriqs.applications.dft.converters.plovasp.vaspio as vaspio
|
||||||
import applications.dft.converters.plovasp.elstruct as elstruct
|
import pytriqs.applications.dft.converters.plovasp.elstruct as elstruct
|
||||||
from applications.dft.converters.plovasp.inpconf import ConfigParameters
|
from pytriqs.applications.dft.converters.plovasp.inpconf import ConfigParameters
|
||||||
from applications.dft.converters.plovasp.proj_shell import ProjectorShell
|
from pytriqs.applications.dft.converters.plovasp.proj_shell import ProjectorShell
|
||||||
from applications.dft.converters.plovasp.proj_group import ProjectorGroup
|
from pytriqs.applications.dft.converters.plovasp.proj_group import ProjectorGroup
|
||||||
import mytest
|
import mytest
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
|
@ -7,7 +7,7 @@ _rpath = os.path.dirname(rpath.__file__) + '/'
|
|||||||
|
|
||||||
import mytest
|
import mytest
|
||||||
import numpy as np
|
import numpy as np
|
||||||
from applications.dft.converters.plovasp.vaspio import Doscar
|
from pytriqs.applications.dft.converters.plovasp.vaspio import Doscar
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
#
|
#
|
||||||
|
@ -7,7 +7,7 @@ _rpath = os.path.dirname(rpath.__file__) + '/'
|
|||||||
|
|
||||||
import mytest
|
import mytest
|
||||||
import numpy as np
|
import numpy as np
|
||||||
from applications.dft.converters.plovasp.vaspio import Eigenval
|
from pytriqs.applications.dft.converters.plovasp.vaspio import Eigenval
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
#
|
#
|
||||||
|
@ -7,7 +7,7 @@ _rpath = os.path.dirname(rpath.__file__) + '/'
|
|||||||
|
|
||||||
import mytest
|
import mytest
|
||||||
import numpy as np
|
import numpy as np
|
||||||
from applications.dft.converters.plovasp.vaspio import Kpoints
|
from pytriqs.applications.dft.converters.plovasp.vaspio import Kpoints
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
#
|
#
|
||||||
|
@ -7,7 +7,7 @@ _rpath = os.path.dirname(rpath.__file__) + '/'
|
|||||||
|
|
||||||
import mytest
|
import mytest
|
||||||
import numpy as np
|
import numpy as np
|
||||||
from applications.dft.converters.plovasp.vaspio import Poscar
|
from pytriqs.applications.dft.converters.plovasp.vaspio import Poscar
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
#
|
#
|
||||||
|
Loading…
Reference in New Issue
Block a user