Update python install + build-tree setup (#128)
- When one python version is used, install to proper lib/pythonX.Y/site-packages
- config files, etc. in build tree resemble the install-tree
[ROCm/rocprofiler-systems commit: 95913c7135]
Этот коммит содержится в:
Jonathan R. Madsen
коммит произвёл
GitHub
GitHub
родитель
6ac0656a87
Коммит
3145b0dad4
@@ -260,32 +260,31 @@ add_subdirectory(source)
|
||||
#
|
||||
# ------------------------------------------------------------------------------#
|
||||
|
||||
configure_file(${PROJECT_SOURCE_DIR}/cmake/Templates/setup-env.sh.in
|
||||
${PROJECT_BINARY_DIR}/install-tree/setup-env.sh @ONLY)
|
||||
configure_file(
|
||||
${PROJECT_SOURCE_DIR}/omnitrace.cfg
|
||||
${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/omnitrace.cfg
|
||||
COPYONLY)
|
||||
|
||||
configure_file(
|
||||
${PROJECT_SOURCE_DIR}/cmake/Templates/setup-env.sh.in
|
||||
${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/setup-env.sh @ONLY)
|
||||
|
||||
configure_file(
|
||||
${PROJECT_SOURCE_DIR}/cmake/Templates/modulefile.in
|
||||
${PROJECT_BINARY_DIR}/install-tree/modulefiles/${PROJECT_NAME}/${OMNITRACE_VERSION}
|
||||
${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/modulefiles/${PROJECT_NAME}/${OMNITRACE_VERSION}
|
||||
@ONLY)
|
||||
|
||||
install(
|
||||
FILES ${PROJECT_SOURCE_DIR}/omnitrace.cfg
|
||||
FILES ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/setup-env.sh
|
||||
${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/omnitrace.cfg
|
||||
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}
|
||||
COMPONENT setup
|
||||
OPTIONAL)
|
||||
|
||||
install(
|
||||
FILES ${PROJECT_BINARY_DIR}/install-tree/setup-env.sh
|
||||
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}
|
||||
COMPONENT setup
|
||||
OPTIONAL)
|
||||
COMPONENT setup)
|
||||
|
||||
install(
|
||||
FILES
|
||||
${PROJECT_BINARY_DIR}/install-tree/modulefiles/${PROJECT_NAME}/${OMNITRACE_VERSION}
|
||||
${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/modulefiles/${PROJECT_NAME}/${OMNITRACE_VERSION}
|
||||
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/modulefiles/${PROJECT_NAME}
|
||||
COMPONENT setup
|
||||
OPTIONAL)
|
||||
COMPONENT setup)
|
||||
|
||||
# ------------------------------------------------------------------------------#
|
||||
#
|
||||
|
||||
@@ -21,19 +21,20 @@ set(PROJECT_BUILD_TARGETS user dl)
|
||||
|
||||
configure_package_config_file(
|
||||
${PROJECT_SOURCE_DIR}/cmake/Templates/${PROJECT_NAME}-config.cmake.in
|
||||
${PROJECT_BINARY_DIR}/install-tree/${PROJECT_NAME}-config.cmake
|
||||
${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/cmake/${PROJECT_NAME}/${PROJECT_NAME}-config.cmake
|
||||
INSTALL_DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/cmake/omnitrace
|
||||
INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}
|
||||
PATH_VARS PROJECT_INSTALL_DIR INCLUDE_INSTALL_DIR LIB_INSTALL_DIR)
|
||||
|
||||
write_basic_package_version_file(
|
||||
${PROJECT_BINARY_DIR}/install-tree/${PROJECT_NAME}-version.cmake
|
||||
${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/cmake/${PROJECT_NAME}/${PROJECT_NAME}-version.cmake
|
||||
VERSION ${PROJECT_VERSION}
|
||||
COMPATIBILITY SameMajorVersion)
|
||||
COMPATIBILITY SameMinorVersion)
|
||||
|
||||
install(
|
||||
FILES ${PROJECT_BINARY_DIR}/install-tree/${PROJECT_NAME}-config.cmake
|
||||
${PROJECT_BINARY_DIR}/install-tree/${PROJECT_NAME}-version.cmake
|
||||
FILES
|
||||
${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/cmake/${PROJECT_NAME}/${PROJECT_NAME}-config.cmake
|
||||
${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/cmake/${PROJECT_NAME}/${PROJECT_NAME}-version.cmake
|
||||
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/cmake/${PROJECT_NAME}
|
||||
OPTIONAL)
|
||||
|
||||
|
||||
@@ -736,19 +736,115 @@ omnitrace_add_feature(CMAKE_CXX_FLAGS "C++ compiler flags")
|
||||
#
|
||||
# ----------------------------------------------------------------------------------------#
|
||||
|
||||
set(OMNITRACE_INSTALL_PYTHONDIR
|
||||
"${CMAKE_INSTALL_LIBDIR}/python/site-packages"
|
||||
CACHE STRING "Installation prefix for python")
|
||||
set(CMAKE_INSTALL_PYTHONDIR ${OMNITRACE_INSTALL_PYTHONDIR})
|
||||
|
||||
if(OMNITRACE_USE_PYTHON)
|
||||
if(OMNITRACE_USE_PYTHON AND NOT OMNITRACE_BUILD_PYTHON)
|
||||
find_package(pybind11 REQUIRED)
|
||||
endif()
|
||||
|
||||
include(ConfigPython)
|
||||
include(PyBind11Tools)
|
||||
|
||||
omnitrace_watch_for_change(OMNITRACE_PYTHON_ROOT_DIRS _PYTHON_DIRS_CHANGED)
|
||||
|
||||
if(_PYTHON_DIRS_CHANGED)
|
||||
unset(OMNITRACE_PYTHON_VERSION CACHE)
|
||||
unset(OMNITRACE_PYTHON_VERSIONS CACHE)
|
||||
unset(OMNITRACE_INSTALL_PYTHONDIR CACHE)
|
||||
else()
|
||||
foreach(_VAR PREFIX ENVS)
|
||||
omnitrace_watch_for_change(OMNITRACE_PYTHON_${_VAR} _CHANGED)
|
||||
|
||||
if(_CHANGED)
|
||||
unset(OMNITRACE_PYTHON_ROOT_DIRS CACHE)
|
||||
unset(OMNITRACE_PYTHON_VERSIONS CACHE)
|
||||
unset(OMNITRACE_INSTALL_PYTHONDIR CACHE)
|
||||
break()
|
||||
endif()
|
||||
endforeach()
|
||||
endif()
|
||||
|
||||
if(OMNITRACE_PYTHON_PREFIX AND OMNITRACE_PYTHON_ENVS)
|
||||
omnitrace_directory(
|
||||
FAIL
|
||||
PREFIX ${OMNITRACE_PYTHON_PREFIX}
|
||||
PATHS ${OMNITRACE_PYTHON_ENVS}
|
||||
OUTPUT_VARIABLE _PYTHON_ROOT_DIRS)
|
||||
set(OMNITRACE_PYTHON_ROOT_DIRS
|
||||
"${_PYTHON_ROOT_DIRS}"
|
||||
CACHE INTERNAL "Root directories for python")
|
||||
endif()
|
||||
|
||||
if(NOT OMNITRACE_PYTHON_VERSIONS AND OMNITRACE_PYTHON_VERSION)
|
||||
set(OMNITRACE_PYTHON_VERSIONS "${OMNITRACE_PYTHON_VERSION}")
|
||||
|
||||
if(NOT OMNITRACE_PYTHON_ROOT_DIRS)
|
||||
omnitrace_find_python(_PY VERSION ${OMNITRACE_PYTHON_VERSION})
|
||||
set(OMNITRACE_PYTHON_ROOT_DIRS
|
||||
"${_PY_ROOT_DIR}"
|
||||
CACHE INTERNAL "" FORCE)
|
||||
endif()
|
||||
|
||||
unset(OMNITRACE_PYTHON_VERSION CACHE)
|
||||
unset(OMNITRACE_INSTALL_PYTHONDIR CACHE)
|
||||
elseif(
|
||||
NOT OMNITRACE_PYTHON_VERSIONS
|
||||
AND NOT OMNITRACE_PYTHON_VERSION
|
||||
AND OMNITRACE_PYTHON_ROOT_DIRS)
|
||||
set(_PY_VERSIONS)
|
||||
|
||||
foreach(_DIR ${OMNITRACE_PYTHON_ROOT_DIRS})
|
||||
omnitrace_find_python(_PY ROOT_DIR ${_DIR})
|
||||
|
||||
if(NOT _PY_FOUND)
|
||||
continue()
|
||||
endif()
|
||||
|
||||
if(NOT "${_PY_VERSION}" IN_LIST _PY_VERSIONS)
|
||||
list(APPEND _PY_VERSIONS "${_PY_VERSION}")
|
||||
endif()
|
||||
endforeach()
|
||||
|
||||
set(OMNITRACE_PYTHON_VERSIONS
|
||||
"${_PY_VERSIONS}"
|
||||
CACHE INTERNAL "" FORCE)
|
||||
elseif(
|
||||
NOT OMNITRACE_PYTHON_VERSIONS
|
||||
AND NOT OMNITRACE_PYTHON_VERSION
|
||||
AND NOT OMNITRACE_PYTHON_ROOT_DIRS)
|
||||
omnitrace_find_python(_PY REQUIRED)
|
||||
set(OMNITRACE_PYTHON_ROOT_DIRS
|
||||
"${_PY_ROOT_DIR}"
|
||||
CACHE INTERNAL "" FORCE)
|
||||
set(OMNITRACE_PYTHON_VERSIONS
|
||||
"${_PY_VERSION}"
|
||||
CACHE INTERNAL "" FORCE)
|
||||
endif()
|
||||
|
||||
omnitrace_watch_for_change(OMNITRACE_PYTHON_ROOT_DIRS)
|
||||
omnitrace_watch_for_change(OMNITRACE_PYTHON_VERSIONS)
|
||||
|
||||
omnitrace_check_python_dirs_and_versions(FAIL)
|
||||
|
||||
list(LENGTH OMNITRACE_PYTHON_VERSIONS _NUM_PYTHON_VERSIONS)
|
||||
|
||||
if(_NUM_PYTHON_VERSIONS GREATER 1)
|
||||
set(OMNITRACE_INSTALL_PYTHONDIR
|
||||
"${CMAKE_INSTALL_LIBDIR}/python/site-packages"
|
||||
CACHE STRING "Installation prefix for python")
|
||||
else()
|
||||
set(OMNITRACE_INSTALL_PYTHONDIR
|
||||
"${CMAKE_INSTALL_LIBDIR}/python${OMNITRACE_PYTHON_VERSIONS}/site-packages"
|
||||
CACHE STRING "Installation prefix for python")
|
||||
endif()
|
||||
else()
|
||||
set(OMNITRACE_INSTALL_PYTHONDIR
|
||||
"${CMAKE_INSTALL_LIBDIR}/python/site-packages"
|
||||
CACHE STRING "Installation prefix for python")
|
||||
endif()
|
||||
|
||||
omnitrace_watch_for_change(OMNITRACE_INSTALL_PYTHONDIR)
|
||||
set(CMAKE_INSTALL_PYTHONDIR ${OMNITRACE_INSTALL_PYTHONDIR})
|
||||
|
||||
# ----------------------------------------------------------------------------------------#
|
||||
#
|
||||
# Compile definitions
|
||||
|
||||
@@ -28,13 +28,13 @@ function(OMNITRACE_CONFIGURE_PYTARGET _TARGET _VERSION)
|
||||
PROPERTIES PREFIX ""
|
||||
OUTPUT_NAME libpyomnitrace
|
||||
LIBRARY_OUTPUT_DIRECTORY
|
||||
${PROJECT_BINARY_DIR}/lib/python/site-packages/omnitrace
|
||||
${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_PYTHONDIR}/omnitrace
|
||||
ARCHIVE_OUTPUT_DIRECTORY
|
||||
${PROJECT_BINARY_DIR}/lib/python/site-packages/omnitrace
|
||||
${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_PYTHONDIR}/omnitrace
|
||||
RUNTIME_OUTPUT_DIRECTORY
|
||||
${PROJECT_BINARY_DIR}/lib/python/site-packages/omnitrace
|
||||
${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_PYTHONDIR}/omnitrace
|
||||
PDB_OUTPUT_DIRECTORY
|
||||
${PROJECT_BINARY_DIR}/lib/python/site-packages/omnitrace
|
||||
${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_PYTHONDIR}/omnitrace
|
||||
${EXTRA_PROPERTIES})
|
||||
|
||||
set(_PYLIB ${CMAKE_INSTALL_PYTHONDIR}/omnitrace)
|
||||
@@ -43,7 +43,7 @@ function(OMNITRACE_CONFIGURE_PYTARGET _TARGET _VERSION)
|
||||
endif()
|
||||
|
||||
if(SKBUILD)
|
||||
set(LIB_RELPATH ../../../..)
|
||||
set(LIB_RELPATH ../../..)
|
||||
else()
|
||||
file(RELATIVE_PATH LIB_RELPATH "${_PYLIB}"
|
||||
"${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
|
||||
@@ -92,84 +92,12 @@ target_link_libraries(
|
||||
omnitrace_target_compile_definitions(libpyomnitrace-interface
|
||||
INTERFACE OMNITRACE_PYBIND11_SOURCE)
|
||||
|
||||
include(PyBind11Tools)
|
||||
|
||||
omnitrace_watch_for_change(OMNITRACE_PYTHON_ROOT_DIRS _PYTHON_DIRS_CHANGED)
|
||||
if(_PYTHON_DIRS_CHANGED)
|
||||
unset(OMNITRACE_PYTHON_VERSION CACHE)
|
||||
unset(OMNITRACE_PYTHON_VERSIONS CACHE)
|
||||
else()
|
||||
foreach(_VAR PREFIX ENVS)
|
||||
omnitrace_watch_for_change(OMNITRACE_PYTHON_${_VAR} _CHANGED)
|
||||
if(_CHANGED)
|
||||
unset(OMNITRACE_PYTHON_ROOT_DIRS CACHE)
|
||||
unset(OMNITRACE_PYTHON_VERSIONS CACHE)
|
||||
break()
|
||||
endif()
|
||||
endforeach()
|
||||
endif()
|
||||
|
||||
if(OMNITRACE_PYTHON_PREFIX AND OMNITRACE_PYTHON_ENVS)
|
||||
omnitrace_directory(
|
||||
FAIL
|
||||
PREFIX ${OMNITRACE_PYTHON_PREFIX}
|
||||
PATHS ${OMNITRACE_PYTHON_ENVS}
|
||||
OUTPUT_VARIABLE _PYTHON_ROOT_DIRS)
|
||||
set(OMNITRACE_PYTHON_ROOT_DIRS
|
||||
"${_PYTHON_ROOT_DIRS}"
|
||||
CACHE INTERNAL "Root directories for python")
|
||||
endif()
|
||||
|
||||
if(NOT OMNITRACE_PYTHON_VERSIONS AND OMNITRACE_PYTHON_VERSION)
|
||||
set(OMNITRACE_PYTHON_VERSIONS "${OMNITRACE_PYTHON_VERSION}")
|
||||
if(NOT OMNITRACE_PYTHON_ROOT_DIRS)
|
||||
omnitrace_find_python(_PY VERSION ${OMNITRACE_PYTHON_VERSION})
|
||||
set(OMNITRACE_PYTHON_ROOT_DIRS
|
||||
"${_PY_ROOT_DIR}"
|
||||
CACHE INTERNAL "" FORCE)
|
||||
endif()
|
||||
unset(OMNITRACE_PYTHON_VERSION CACHE)
|
||||
elseif(
|
||||
NOT OMNITRACE_PYTHON_VERSIONS
|
||||
AND NOT OMNITRACE_PYTHON_VERSION
|
||||
AND OMNITRACE_PYTHON_ROOT_DIRS)
|
||||
set(_PY_VERSIONS)
|
||||
foreach(_DIR ${OMNITRACE_PYTHON_ROOT_DIRS})
|
||||
omnitrace_find_python(_PY ROOT_DIR ${_DIR})
|
||||
if(NOT _PY_FOUND)
|
||||
continue()
|
||||
endif()
|
||||
if(NOT "${_PY_VERSION}" IN_LIST _PY_VERSIONS)
|
||||
list(APPEND _PY_VERSIONS "${_PY_VERSION}")
|
||||
endif()
|
||||
endforeach()
|
||||
set(OMNITRACE_PYTHON_VERSIONS
|
||||
"${_PY_VERSIONS}"
|
||||
CACHE INTERNAL "" FORCE)
|
||||
elseif(
|
||||
NOT OMNITRACE_PYTHON_VERSIONS
|
||||
AND NOT OMNITRACE_PYTHON_VERSION
|
||||
AND NOT OMNITRACE_PYTHON_ROOT_DIRS)
|
||||
omnitrace_find_python(_PY REQUIRED)
|
||||
set(OMNITRACE_PYTHON_ROOT_DIRS
|
||||
"${_PY_ROOT_DIR}"
|
||||
CACHE INTERNAL "" FORCE)
|
||||
set(OMNITRACE_PYTHON_VERSIONS
|
||||
"${_PY_VERSION}"
|
||||
CACHE INTERNAL "" FORCE)
|
||||
endif()
|
||||
|
||||
omnitrace_watch_for_change(OMNITRACE_PYTHON_ROOT_DIRS)
|
||||
omnitrace_watch_for_change(OMNITRACE_PYTHON_VERSIONS)
|
||||
|
||||
omnitrace_check_python_dirs_and_versions(FAIL)
|
||||
|
||||
add_custom_target(libpyomnitrace)
|
||||
|
||||
file(GLOB_RECURSE PYTHON_FILES ${CMAKE_CURRENT_SOURCE_DIR}/omnitrace/*.py)
|
||||
foreach(_IN ${PYTHON_FILES})
|
||||
string(REPLACE "${CMAKE_CURRENT_SOURCE_DIR}/omnitrace"
|
||||
"${PROJECT_BINARY_DIR}/lib/python/site-packages/omnitrace" _OUT
|
||||
"${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_PYTHONDIR}/omnitrace" _OUT
|
||||
"${_IN}")
|
||||
configure_file(${_IN} ${_OUT} @ONLY)
|
||||
install(
|
||||
@@ -200,8 +128,8 @@ foreach(_VERSION ${OMNITRACE_PYTHON_VERSIONS})
|
||||
endforeach()
|
||||
|
||||
configure_file(${CMAKE_CURRENT_LIST_DIR}/setup.py.in
|
||||
${PROJECT_BINARY_DIR}/lib/python/site-packages/setup.py @ONLY)
|
||||
${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_PYTHONDIR}/setup.py @ONLY)
|
||||
configure_file(${CMAKE_CURRENT_LIST_DIR}/setup.cfg.in
|
||||
${PROJECT_BINARY_DIR}/lib/python/site-packages/setup.cfg @ONLY)
|
||||
${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_PYTHONDIR}/setup.cfg @ONLY)
|
||||
configure_file(${CMAKE_CURRENT_LIST_DIR}/pyproject.toml
|
||||
${PROJECT_BINARY_DIR}/lib/python/site-packages/pyproject.toml COPYONLY)
|
||||
${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_PYTHONDIR}/pyproject.toml COPYONLY)
|
||||
|
||||
@@ -106,7 +106,7 @@ set(_python_environment
|
||||
"OMNITRACE_USE_PID=OFF"
|
||||
"OMNITRACE_TIMEMORY_COMPONENTS=wall_clock,trip_count"
|
||||
"${_test_library_path}"
|
||||
"PYTHONPATH=${PROJECT_BINARY_DIR}/lib/python/site-packages")
|
||||
"PYTHONPATH=${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_PYTHONDIR}")
|
||||
|
||||
set(_attach_environment
|
||||
"OMNITRACE_USE_PERFETTO=ON"
|
||||
|
||||
Ссылка в новой задаче
Block a user